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

Source/WebCore/platform/graphics/chromium/LayerChromium.cpp

Index: Source/WebCore/platform/graphics/chromium/LayerChromium.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/LayerChromium.cpp	(revision 114754)
+++ Source/WebCore/platform/graphics/chromium/LayerChromium.cpp	(working copy)
@@ -66,7 +66,6 @@
     , m_nonFastScrollableRegionChanged(false)
     , m_anchorPoint(0.5, 0.5)
     , m_backgroundColor(0, 0, 0, 0)
-    , m_backgroundCoversViewport(false)
     , m_debugBorderWidth(0)
     , m_opacity(1.0)
     , m_anchorPointZ(0)
@@ -270,14 +269,6 @@
     setNeedsCommit();
 }
 
-void LayerChromium::setBackgroundCoversViewport(bool backgroundCoversViewport)
-{
-    if (m_backgroundCoversViewport == backgroundCoversViewport)
-        return;
-    m_backgroundCoversViewport = backgroundCoversViewport;
-    setNeedsCommit();
-}
-
 void LayerChromium::setMasksToBounds(bool masksToBounds)
 {
     if (m_masksToBounds == masksToBounds)
@@ -453,7 +444,6 @@
     layer->setAnchorPoint(m_anchorPoint);
     layer->setAnchorPointZ(m_anchorPointZ);
     layer->setBackgroundColor(m_backgroundColor);
-    layer->setBackgroundCoversViewport(m_backgroundCoversViewport);
     layer->setBounds(m_bounds);
     layer->setContentBounds(contentBounds());
     layer->setDebugBorderColor(m_debugBorderColor);
@@ -631,6 +621,13 @@
     m_layerAnimationDelegate->notifyAnimationStarted(wallClockTime);
 }
 
+Region LayerChromium::visibleContentOpaqueRegion() const
+{
+    if (opaque())
+        return visibleLayerRect();
+    return Region();
+}
+
 void sortLayers(Vector<RefPtr<LayerChromium> >::iterator, Vector<RefPtr<LayerChromium> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort LayerChromiums.