[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
aroben at apple.com
aroben at apple.com
Sun Feb 20 23:33:10 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 4b7ddcc7b7b3083bf7a5f6231d64ace2cd641f39
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 21 18:31:45 2011 +0000
Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"
This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
opposed to just "layer" because there are cases where we flush changes to CACFLayers that
don't have a corresponding GraphicsLayer.
Fixes <http://webkit.org/b/52894> "Sync compositing state" terminology in
WKCACFLayerRenderer and friends is confusing
Reviewed by Simon Fraser.
Source/WebCore:
* platform/graphics/win/WKCACFLayerRenderer.cpp:
(WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer):
(WebCore::WKCACFLayerRenderer::render):
Updated for renames.
(WebCore::WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon): Renamed from
syncCompositingStateSoon, and updated for other renames.
* platform/graphics/win/WKCACFLayerRenderer.h: Renamed m_syncLayerChanges to
* m_shouldFlushPendingGraphicsLayerChanges.
(WebCore::WKCACFLayerRendererClient::flushPendingGraphicsLayerChanges): Renamed from
syncCompositingState.
Source/WebKit/win:
* WebCoreSupport/WebChromeClient.cpp:
(WebChromeClient::scheduleCompositingLayerSync): Updated for WebView changes.
* WebView.cpp:
(WebView::paint): Updated for rename.
(WebView::flushPendingGraphicsLayerChangesSoon): Renamed from scheduleCompositingLayerSync.
(WebView::notifySyncRequired): Updated for rename.
(WebView::flushPendingGraphicsLayerChanges): Renamed from syncCompositingState.
* WebView.h: Did the renames.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76359 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d240efe..0013f9e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,31 @@
2011-01-21 Adam Roben <aroben at apple.com>
+ Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"
+
+ This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
+ opposed to just "layer" because there are cases where we flush changes to CACFLayers that
+ don't have a corresponding GraphicsLayer.
+
+ Fixes <http://webkit.org/b/52894> "Sync compositing state" terminology in
+ WKCACFLayerRenderer and friends is confusing
+
+ Reviewed by Simon Fraser.
+
+ * platform/graphics/win/WKCACFLayerRenderer.cpp:
+ (WebCore::WKCACFLayerRenderer::WKCACFLayerRenderer):
+ (WebCore::WKCACFLayerRenderer::render):
+ Updated for renames.
+
+ (WebCore::WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon): Renamed from
+ syncCompositingStateSoon, and updated for other renames.
+
+ * platform/graphics/win/WKCACFLayerRenderer.h: Renamed m_syncLayerChanges to
+ * m_shouldFlushPendingGraphicsLayerChanges.
+ (WebCore::WKCACFLayerRendererClient::flushPendingGraphicsLayerChanges): Renamed from
+ syncCompositingState.
+
+2011-01-21 Adam Roben <aroben at apple.com>
+
Clean up PlatformCAAnimationWin
Fixes <http://webkit.org/b/52904> PlatformCAAnimationWin is leaky and inefficient
diff --git a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 74172d6..9ff8e1c 100644
--- a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -187,7 +187,7 @@ WKCACFLayerRenderer::WKCACFLayerRenderer()
, m_hostWindow(0)
, m_renderTimer(this, &WKCACFLayerRenderer::renderTimerFired)
, m_mustResetLostDeviceBeforeRendering(false)
- , m_syncLayerChanges(false)
+ , m_shouldFlushPendingGraphicsLayerChanges(false)
{
// Point the CACFContext to this
wkCACFContextSetUserData(m_context, this);
@@ -430,10 +430,9 @@ void WKCACFLayerRenderer::render(const Vector<CGRect>& windowDirtyRects)
return;
}
- // Sync the layer if needed
- if (m_syncLayerChanges) {
- m_client->syncCompositingState();
- m_syncLayerChanges = false;
+ if (m_shouldFlushPendingGraphicsLayerChanges) {
+ m_client->flushPendingGraphicsLayerChanges();
+ m_shouldFlushPendingGraphicsLayerChanges = false;
}
// Flush the root layer to the render tree.
@@ -524,9 +523,9 @@ void WKCACFLayerRenderer::renderSoon()
m_renderTimer.startOneShot(0);
}
-void WKCACFLayerRenderer::syncCompositingStateSoon()
+void WKCACFLayerRenderer::flushPendingGraphicsLayerChangesSoon()
{
- m_syncLayerChanges = true;
+ m_shouldFlushPendingGraphicsLayerChanges = true;
renderSoon();
}
diff --git a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
index 5308625..149106e 100644
--- a/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
+++ b/Source/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
@@ -53,7 +53,7 @@ class WKCACFLayerRendererClient {
public:
virtual ~WKCACFLayerRendererClient() { }
virtual bool shouldRender() const = 0;
- virtual void syncCompositingState() { }
+ virtual void flushPendingGraphicsLayerChanges() { }
};
// FIXME: Currently there is a WKCACFLayerRenderer for each WebView and each
@@ -75,7 +75,7 @@ public:
void setHostWindow(HWND);
void paint();
void resize();
- void syncCompositingStateSoon();
+ void flushPendingGraphicsLayerChangesSoon();
protected:
PlatformCALayer* rootLayer() const;
@@ -110,7 +110,7 @@ private:
HWND m_hostWindow;
Timer<WKCACFLayerRenderer> m_renderTimer;
bool m_mustResetLostDeviceBeforeRendering;
- bool m_syncLayerChanges;
+ bool m_shouldFlushPendingGraphicsLayerChanges;
HashSet<RefPtr<PlatformCALayer> > m_pendingAnimatedLayers;
#ifndef NDEBUG
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index a5182fa..23f8ee4 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,27 @@
+2011-01-21 Adam Roben <aroben at apple.com>
+
+ Replace some "sync compositing state" terminology with "flush pending GraphicsLayer changes"
+
+ This seems to be the direction in which our code is moving. I chose "GraphicsLayer" as
+ opposed to just "layer" because there are cases where we flush changes to CACFLayers that
+ don't have a corresponding GraphicsLayer.
+
+ Fixes <http://webkit.org/b/52894> "Sync compositing state" terminology in
+ WKCACFLayerRenderer and friends is confusing
+
+ Reviewed by Simon Fraser.
+
+ * WebCoreSupport/WebChromeClient.cpp:
+ (WebChromeClient::scheduleCompositingLayerSync): Updated for WebView changes.
+
+ * WebView.cpp:
+ (WebView::paint): Updated for rename.
+ (WebView::flushPendingGraphicsLayerChangesSoon): Renamed from scheduleCompositingLayerSync.
+ (WebView::notifySyncRequired): Updated for rename.
+ (WebView::flushPendingGraphicsLayerChanges): Renamed from syncCompositingState.
+
+ * WebView.h: Did the renames.
+
2011-01-20 Sam Weinig <sam at webkit.org>
Reviewed by Dave Hyatt.
diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
index 6460b4a..f5cce4e 100644
--- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
@@ -826,7 +826,7 @@ void WebChromeClient::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graph
void WebChromeClient::scheduleCompositingLayerSync()
{
- m_webView->scheduleCompositingLayerSync();
+ m_webView->flushPendingGraphicsLayerChangesSoon();
}
#endif
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
index 9dfff83..9eb0c0e 100644
--- a/Source/WebKit/win/WebView.cpp
+++ b/Source/WebKit/win/WebView.cpp
@@ -990,8 +990,8 @@ void WebView::paint(HDC dc, LPARAM options)
#if USE(ACCELERATED_COMPOSITING)
if (isAcceleratedCompositing()) {
- syncCompositingState();
- // Syncing might have taken us out of compositing mode.
+ flushPendingGraphicsLayerChanges();
+ // Flushing might have taken us out of compositing mode.
if (isAcceleratedCompositing()) {
// FIXME: We need to paint into dc (if provided). <http://webkit.org/b/52578>
m_layerRenderer->paint();
@@ -6272,11 +6272,11 @@ void WebView::setRootChildLayer(GraphicsLayer* layer)
m_backingLayer->addChild(layer);
}
-void WebView::scheduleCompositingLayerSync()
+void WebView::flushPendingGraphicsLayerChangesSoon()
{
if (!m_layerRenderer)
return;
- m_layerRenderer->syncCompositingStateSoon();
+ m_layerRenderer->flushPendingGraphicsLayerChangesSoon();
}
void WebView::setAcceleratedCompositing(bool accelerated)
@@ -6480,7 +6480,7 @@ void WebView::notifyAnimationStarted(const GraphicsLayer*, double)
void WebView::notifySyncRequired(const GraphicsLayer*)
{
- scheduleCompositingLayerSync();
+ flushPendingGraphicsLayerChangesSoon();
}
void WebView::paintContents(const GraphicsLayer*, GraphicsContext& context, GraphicsLayerPaintingPhase, const IntRect& inClip)
@@ -6517,7 +6517,7 @@ bool WebView::shouldRender() const
return !frameView->layoutPending();
}
-void WebView::syncCompositingState()
+void WebView::flushPendingGraphicsLayerChanges()
{
Frame* coreFrame = core(m_mainFrame);
if (!coreFrame)
diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h
index 19433c2..68b02da 100644
--- a/Source/WebKit/win/WebView.h
+++ b/Source/WebKit/win/WebView.h
@@ -905,7 +905,7 @@ public:
void downloadURL(const WebCore::KURL&);
#if USE(ACCELERATED_COMPOSITING)
- void scheduleCompositingLayerSync();
+ void flushPendingGraphicsLayerChangesSoon();
void setRootChildLayer(WebCore::GraphicsLayer*);
#endif
@@ -949,7 +949,7 @@ private:
// WKCACFLayerRendererClient
virtual bool shouldRender() const;
- virtual void syncCompositingState();
+ virtual void flushPendingGraphicsLayerChanges();
#endif
protected:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list