Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h |
=================================================================== |
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (revision 122257) |
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h (working copy) |
@@ -59,7 +59,6 @@ |
virtual void setNeedsRedrawOnImplThread() = 0; |
virtual void setNeedsCommitOnImplThread() = 0; |
virtual void postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime) = 0; |
- virtual void postSetContentsMemoryAllocationLimitBytesToMainThreadOnImplThread(size_t) = 0; |
}; |
// CCLayerTreeHostImpl owns the CCLayerImpl tree as well as associated rendering state |
@@ -110,11 +109,12 @@ |
virtual void didLoseContext() OVERRIDE; |
virtual void onSwapBuffersComplete() OVERRIDE; |
virtual void setFullRootLayerDamage() OVERRIDE; |
- virtual void setContentsMemoryAllocationLimitBytes(size_t) OVERRIDE; |
+ virtual void releaseContentsTextures() OVERRIDE; |
+ virtual void setMemoryAllocationLimitBytes(size_t) OVERRIDE; |
// Implementation |
bool canDraw(); |
- CCGraphicsContext* context(); |
+ CCGraphicsContext* context() const; |
String layerTreeAsText() const; |
void setFontAtlas(PassOwnPtr<CCFontAtlas>); |
@@ -147,8 +147,8 @@ |
int sourceFrameNumber() const { return m_sourceFrameNumber; } |
void setSourceFrameNumber(int frameNumber) { m_sourceFrameNumber = frameNumber; } |
- bool sourceFrameCanBeDrawn() const { return m_sourceFrameCanBeDrawn; } |
- void setSourceFrameCanBeDrawn(bool sourceFrameCanBeDrawn) { m_sourceFrameCanBeDrawn = sourceFrameCanBeDrawn; } |
+ bool contentsTexturesWerePurgedSinceLastCommit() const { return m_contentsTexturesWerePurgedSinceLastCommit; } |
+ size_t memoryAllocationLimitBytes() const { return m_memoryAllocationLimitBytes; } |
const IntSize& viewportSize() const { return m_viewportSize; } |
void setViewportSize(const IntSize&); |
@@ -230,7 +230,8 @@ |
IntSize m_deviceViewportSize; |
float m_deviceScaleFactor; |
bool m_visible; |
- bool m_sourceFrameCanBeDrawn; |
+ bool m_contentsTexturesWerePurgedSinceLastCommit; |
+ size_t m_memoryAllocationLimitBytes; |
OwnPtr<CCHeadsUpDisplay> m_headsUpDisplay; |