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

Source/WebKit/chromium/src/NonCompositedContentHost.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 28 matching lines @@
 NonCompositedContentHost::NonCompositedContentHost(PassOwnPtr<WebCore::LayerPainterChromium> contentPaint)
     : m_contentPaint(contentPaint)
     , m_showDebugBorders(false)
 {
     m_graphicsLayer = WebCore::GraphicsLayer::create(this);
 #ifndef NDEBUG
     m_graphicsLayer->setName("non-composited content");
 #endif
     m_graphicsLayer->setDrawsContent(true);
     m_graphicsLayer->platformLayer()->setIsNonCompositedContent(true);
-#if !ENABLE(RUBBER_BANDING)
-    m_graphicsLayer->platformLayer()->setBackgroundCoversViewport(true);
-#endif
     m_graphicsLayer->platformLayer()->setOpaque(true);
 }
 
 NonCompositedContentHost::~NonCompositedContentHost()
 {
 }
 
 void NonCompositedContentHost::setBackgroundColor(const WebCore::Color& color)
 {
-    if (color.isValid())
-        m_graphicsLayer->platformLayer()->setBackgroundColor(color);
-    else
-        m_graphicsLayer->platformLayer()->setBackgroundColor(WebCore::Color::white);
+    m_graphicsLayer->platformLayer()->setBackgroundColor(color);
 }
 
 void NonCompositedContentHost::setScrollLayer(WebCore::GraphicsLayer* layer)
 {
     m_graphicsLayer->setNeedsDisplay();
 
     if (!layer) {
         m_graphicsLayer->removeFromParent();
         m_graphicsLayer->platformLayer()->setLayerTreeHost(0);
         return;
@@ skipping 104 matching lines @@
 {
     return m_showDebugBorders;
 }
 
 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const
 {
     return false;
 }
 
 } // namespace WebKit