Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 4 insertions, 12 deletions

diff --git a/WebCore/rendering/RenderSVGResourceMasker.h b/WebCore/rendering/RenderSVGResourceMasker.h
index f6301cb..f2d8cb2 100644
--- a/WebCore/rendering/RenderSVGResourceMasker.h
+++ b/WebCore/rendering/RenderSVGResourceMasker.h
@@ -36,14 +36,7 @@
 namespace WebCore {
 
 struct MaskerData {
-    MaskerData()
-        : emptyMask(false)
-    {
-    }
-
     OwnPtr<ImageBuffer> maskImage;
-    FloatRect maskRect;
-    bool emptyMask;
 };
 
 class RenderSVGResourceMasker : public RenderSVGResourceContainer {
@@ -53,9 +46,8 @@ public:
 
     virtual const char* renderName() const { return "RenderSVGResourceMasker"; }
 
-    virtual void invalidateClients();
-    virtual void invalidateClient(RenderObject*);
-
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
+    virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true);
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode);
     virtual FloatRect resourceBoundingBox(RenderObject*);
 
@@ -66,10 +58,10 @@ public:
     static RenderSVGResourceType s_resourceType;
 
 private:
-    void createMaskImage(MaskerData*, const SVGMaskElement*, RenderObject*);
+    void drawContentIntoMaskImage(const FloatRect& maskRect, MaskerData*, const SVGMaskElement*, RenderObject*);
     void calculateMaskContentRepaintRect();
 
-    FloatRect m_maskBoundaries;
+    FloatRect m_maskContentBoundaries;
     HashMap<RenderObject*, MaskerData*> m_masker;
 };