Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 4 insertions, 6 deletions

diff --git a/Source/WebCore/platform/graphics/chromium/LayerChromium.h b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
index 428ce61..5564f91 100644
--- a/Source/WebCore/platform/graphics/chromium/LayerChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/LayerChromium.h
@@ -50,11 +50,6 @@
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
-
-namespace skia {
-class PlatformCanvas;
-}
-
 namespace WebCore {
 
 class CCLayerImpl;
@@ -113,6 +108,7 @@ public:
 
     void setNeedsDisplay(const FloatRect& dirtyRect);
     void setNeedsDisplay();
+    virtual void invalidateRect(const FloatRect& dirtyRect) {}
     const FloatRect& dirtyRect() const { return m_dirtyRect; }
     void resetNeedsDisplay();
 
@@ -156,11 +152,13 @@ public:
 
     // These methods typically need to be overwritten by derived classes.
     virtual bool drawsContent() const { return false; }
+    virtual void paintContentsIfDirty(const IntRect&) { }
     virtual void paintContentsIfDirty() { }
     virtual void updateCompositorResources() { }
+    virtual void setIsMask(bool) {}
     virtual void unreserveContentsTexture() { }
     virtual void bindContentsTexture() { }
-    virtual void draw() { }
+    virtual void draw(const IntRect&) { }
 
     // These exists just for debugging (via drawDebugBorder()).
     void setBorderColor(const Color&);