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

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

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
Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (revision 114754)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (working copy)
@@ -25,6 +25,7 @@
#ifndef CCLayerTreeHost_h
#define CCLayerTreeHost_h
+#include "Color.h"
#include "GraphicsTypes3D.h"
#include "IntRect.h"
#include "LayerChromium.h"
@@ -201,6 +202,8 @@
void setPageScaleFactorAndLimits(float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor);
+ void setBackgroundColor(const Color& color) { m_backgroundColor = color; }
+
TextureManager* contentsTextureManager() const;
bool visible() const { return m_visible; }
@@ -270,6 +273,7 @@
float m_pageScaleFactor;
float m_minPageScaleFactor, m_maxPageScaleFactor;
bool m_triggerIdlePaints;
+ Color m_backgroundColor;
TextureList m_deleteTextureAfterCommitList;
size_t m_partialTextureUpdateRequests;

Powered by Google App Engine
This is Rietveld 408576698