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

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

 /*
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 437 matching lines @@
                 tile->m_partialUpdate = true;
             else if (tileNeedsBufferedUpdate(tile) && layerTreeHost()) {
                 layerTreeHost()->deleteTextureAfterCommit(tile->managedTexture()->steal());
                 // Sets the dirty rect to a full-sized tile with border texels.
                 tile->m_dirtyRect = m_tiler->tileRect(tile);
             }
 
             if (!tile->managedTexture()->reserve(m_tiler->tileSize(), m_textureFormat)) {
                 m_skipsIdlePaint = true;
                 if (!idle) {
-                    // If the background covers the viewport, always draw this
-                    // layer so that checkerboarded tiles will still draw.
-                    if (!backgroundCoversViewport())
-                        m_skipsDraw = true;
+                    m_skipsDraw = true;
                     m_tiler->reset();
                     m_paintRect = IntRect();
                     m_requestedUpdateTilesRect = IntRect();
                 }
                 return;
             }
 
             dirtyLayerRect.unite(tile->m_dirtyRect);
         }
     }
@@ skipping 103 matching lines @@
             if (!tile->managedTexture()->reserve(m_tiler->tileSize(), m_textureFormat))
                 return;
         }
     }
 }
 
 Region TiledLayerChromium::visibleContentOpaqueRegion() const
 {
     if (m_skipsDraw)
         return Region();
-
+    if (opaque())
+        return visibleLayerRect();
     return m_tiler->opaqueRegionInLayerRect(visibleLayerRect());
 }
 
 void TiledLayerChromium::resetUpdateState()
 {
     // Reset m_updateRect for all tiles.
     CCLayerTilingData::TileMap::const_iterator end = m_tiler->tiles().end();
     for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != end; ++iter) {
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
         tile->m_updateRect = IntRect();
@@ skipping 146 matching lines @@
     // - only reserve idle paint tiles up to a memory reclaim threshold and
     // - insure we play nicely with other layers
     prepaintRect.inflateX(m_tiler->tileSize().width());
     prepaintRect.inflateY(m_tiler->tileSize().height());
     prepaintRect.intersect(IntRect(IntPoint::zero(), contentBounds()));
     return prepaintRect;
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)