Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / svg / RenderSVGResourceClipper.h

diff --git a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h
index f2138a0..c7c7c4f 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h
+++ b/src/third_party/WebKit/Source/core/rendering/svg/RenderSVGResourceClipper.h
@@ -27,7 +27,7 @@ namespace blink {
 
 class DisplayList;
 
-class RenderSVGResourceClipper FINAL : public RenderSVGResourceContainer {
+class RenderSVGResourceClipper final : public RenderSVGResourceContainer {
 public:
     enum ClipperState {
         ClipperNotApplied,
@@ -38,13 +38,10 @@ public:
     explicit RenderSVGResourceClipper(SVGClipPathElement*);
     virtual ~RenderSVGResourceClipper();
 
-    virtual const char* renderName() const OVERRIDE { return "RenderSVGResourceClipper"; }
+    virtual const char* renderName() const override { return "RenderSVGResourceClipper"; }
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true) OVERRIDE;
-    virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) OVERRIDE;
-
-    virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE;
-    virtual void postApplyResource(RenderObject*, GraphicsContext*&) OVERRIDE;
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) override;
 
     // FIXME: Filters are also stateful resources that could benefit from having their state managed
     //        on the caller stack instead of the current hashmap. We should look at refactoring these
@@ -59,17 +56,17 @@ public:
 
     FloatRect resourceBoundingBox(const RenderObject*);
 
-    virtual RenderSVGResourceType resourceType() const OVERRIDE { return s_resourceType; }
+    static const RenderSVGResourceType s_resourceType = ClipperResourceType;
+    virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
 
     bool hitTestClipContent(const FloatRect&, const FloatPoint&);
 
     SVGUnitTypes::SVGUnitType clipPathUnits() const { return toSVGClipPathElement(element())->clipPathUnits()->currentValue()->enumValue(); }
 
-    static const RenderSVGResourceType s_resourceType;
 private:
     bool tryPathOnlyClipping(GraphicsContext*, const AffineTransform&, const FloatRect&);
     void drawClipMaskContent(GraphicsContext*, const FloatRect& targetBoundingBox);
-    void createDisplayList(GraphicsContext*, const AffineTransform&);
+    void createDisplayList(GraphicsContext*);
     void calculateClipContentPaintInvalidationRect();
 
     RefPtr<DisplayList> m_clipContentDisplayList;