From 65f03d4f644ce73618e5f4f50dd694b26f55ae12 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 13 May 2011 16:23:25 +0100 Subject: Merge WebKit at r75993: Initial merge by git. Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3 --- Source/WebCore/rendering/RenderLayerCompositor.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderLayerCompositor.h') diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h index 53a0f9a..24e182c 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.h +++ b/Source/WebCore/rendering/RenderLayerCompositor.h @@ -84,7 +84,10 @@ public: void setCompositingConsultsOverlap(bool b) { m_compositingConsultsOverlap = b; } bool compositingConsultsOverlap() const { return m_compositingConsultsOverlap; } - void scheduleSync(); + // GraphicsLayers buffer state, which gets pushed to the underlying platform layers + // at specific times. + void scheduleLayerFlush(); + void flushPendingLayerChanges(); // Rebuild the tree of compositing layers void updateCompositingLayers(CompositingUpdateType = CompositingUpdateAfterLayoutOrStyleChange, RenderLayer* updateRoot = 0); @@ -174,10 +177,12 @@ public: bool compositorShowDebugBorders() const { return m_showDebugBorders; } bool compositorShowRepaintCounter() const { return m_showRepaintCounter; } + void updateContentsScale(float, RenderLayer* = 0); + private: // GraphicsLayerClient Implementation virtual void notifyAnimationStarted(const GraphicsLayer*, double) { } - virtual void notifySyncRequired(const GraphicsLayer*) { scheduleSync(); } + virtual void notifySyncRequired(const GraphicsLayer*) { scheduleLayerFlush(); } virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect&) { } // These calls return false always. They are saying that the layers associated with this client -- cgit v1.1