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

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

Issue 10690121: Merge 121076 - [chromium] LayerRendererChromium is not getting visibility messages in single thread… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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 122257)
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (working copy)
@@ -169,7 +169,7 @@
virtual void acquireLayerTextures();
// Returns false if we should abort this frame due to initialization failure.
bool initializeLayerRendererIfNeeded();
- void updateLayers(CCTextureUpdater&);
+ void updateLayers(CCTextureUpdater&, size_t contentsMemoryLimitBytes);
CCLayerTreeHostClient* client() { return m_client; }
@@ -200,7 +200,6 @@
void setNeedsAnimate();
// virtual for testing
virtual void setNeedsCommit();
- void setNeedsForcedCommit();
void setNeedsRedraw();
bool commitRequested() const;
@@ -226,8 +225,13 @@
void setHasTransparentBackground(bool transparent) { m_hasTransparentBackground = transparent; }
TextureManager* contentsTextureManager() const;
- void setContentsMemoryAllocationLimitBytes(size_t);
+ // This will cause contents texture manager to evict all textures, but
+ // without deleting them. This happens after all content textures have
+ // already been deleted on impl, after getting a 0 allocation limit.
+ // Set during a commit, but before updateLayers.
+ void evictAllContentTextures();
+
bool visible() const { return m_visible; }
void setVisible(bool);
@@ -279,7 +283,6 @@
CCLayerTreeHostClient* m_client;
int m_frameNumber;
- bool m_frameIsForDisplay;
OwnPtr<CCProxy> m_proxy;
bool m_layerRendererInitialized;
@@ -298,9 +301,6 @@
bool m_visible;
- size_t m_memoryAllocationBytes;
- bool m_memoryAllocationIsForDisplay;
-
typedef HashMap<WebKit::WebGraphicsContext3D*, RefPtr<RateLimiter> > RateLimiterMap;
RateLimiterMap m_rateLimiters;

Powered by Google App Engine
This is Rietveld 408576698