Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac

Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h

Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h	(revision 114754)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h	(working copy)
@@ -84,7 +84,7 @@
 
     PassOwnPtr<CCSharedQuadState> createSharedQuadState() const;
     virtual void willDraw(LayerRendererChromium*) { }
-    virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& usedCheckerboard);
+    virtual void appendQuads(CCQuadCuller&, const CCSharedQuadState*, bool& usedCheckerboard) { }
     virtual void didDraw() { }
     void appendDebugBorderQuad(CCQuadCuller&, const CCSharedQuadState*) const;
 
@@ -107,9 +107,6 @@
     void setBackgroundColor(const Color&);
     Color backgroundColor() const { return m_backgroundColor; }
 
-    void setBackgroundCoversViewport(bool);
-    bool backgroundCoversViewport() const { return m_backgroundCoversViewport; }
-
     void setFilters(const FilterOperations&);
     const FilterOperations& filters() const { return m_filters; }
 
@@ -232,7 +229,7 @@
 
     CCLayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); }
 
-    virtual Region visibleContentOpaqueRegion() const { return Region(); };
+    virtual Region visibleContentOpaqueRegion() const;
 
     // Indicates that the context previously used to render this layer
     // was lost and that a new one has been created. Won't be called
@@ -248,8 +245,6 @@
     // Transformation used to transform quads provided in appendQuads.
     virtual TransformationMatrix quadTransform() const;
 
-    void appendGutterQuads(CCQuadCuller&, const CCSharedQuadState*);
-
 private:
     void setParent(CCLayerImpl* parent) { m_parent = parent; }
     friend class TreeSynchronizer;
@@ -285,7 +280,6 @@
     bool m_haveWheelEventHandlers;
     Region m_nonFastScrollableRegion;
     Color m_backgroundColor;
-    bool m_backgroundCoversViewport;
 
     // Whether the "back" of this layer should draw.
     bool m_doubleSided;