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

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
     : m_needsDisplay(false)
     , m_layerId(s_nextLayerId++)
     , m_parent(0)
     , m_layerAnimationController(CCLayerAnimationController::create(this))
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , 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)
     , m_isDrawable(false)
     , m_masksToBounds(false)
     , m_opaque(false)
     , m_doubleSided(true)
     , m_usesLayerClipping(false)
     , m_isNonCompositedContent(false)
     , m_preserves3D(false)
@@ skipping 183 matching lines @@
 }
 
 void LayerChromium::setBackgroundColor(const Color& backgroundColor)
 {
     if (m_backgroundColor == backgroundColor)
         return;
     m_backgroundColor = backgroundColor;
     setNeedsCommit();
 }
 
-void LayerChromium::setBackgroundCoversViewport(bool backgroundCoversViewport)
-{
-    if (m_backgroundCoversViewport == backgroundCoversViewport)
-        return;
-    m_backgroundCoversViewport = backgroundCoversViewport;
-    setNeedsCommit();
-}
-
 void LayerChromium::setMasksToBounds(bool masksToBounds)
 {
     if (m_masksToBounds == masksToBounds)
         return;
     m_masksToBounds = masksToBounds;
     setNeedsCommit();
 }
 
 void LayerChromium::setMaskLayer(LayerChromium* maskLayer)
 {
@@ skipping 155 matching lines @@
         m_needsDisplay = true;
 
     setNeedsCommit();
 }
 
 void LayerChromium::pushPropertiesTo(CCLayerImpl* layer)
 {
     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);
     layer->setDebugBorderWidth(m_debugBorderWidth);
     layer->setDebugName(m_debugName.isolatedCopy()); // We have to use isolatedCopy() here to safely pass ownership to another thread.
     layer->setDoubleSided(m_doubleSided);
     layer->setDrawsContent(drawsContent());
     if (CCProxy::hasImplThread()) {
         // Since FilterOperations contains a vector of RefPtrs, we must deep copy the filters.
         FilterOperations filtersCopy;
@@ skipping 157 matching lines @@
 {
     return m_layerAnimationController->hasActiveAnimation();
 }
 
 void LayerChromium::notifyAnimationStarted(const CCAnimationStartedEvent& event, double wallClockTime)
 {
     m_layerAnimationController->notifyAnimationStarted(event);
     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.
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)