Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: Source/WebKit/chromium/src/NonCompositedContentHost.cpp

Issue 10146014: Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebLayerTreeView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/NonCompositedContentHost.cpp
===================================================================
--- Source/WebKit/chromium/src/NonCompositedContentHost.cpp (revision 114754)
+++ Source/WebKit/chromium/src/NonCompositedContentHost.cpp (working copy)
@@ -46,9 +46,6 @@
#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);
}
@@ -58,10 +55,7 @@
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)
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebLayerTreeView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698