[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit bf05a27621bb3e61721708766cb174ab89d010d3
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 20:46:49 2011 +0000

    Remove some dead code from WKCACFLayerRenderer
    
    Fixes <http://webkit.org/b/51954> WKCACFLayerRenderer has dead and
    redundant code for reacting to changes to the layer tree
    
    Reviewed by Sam Weinig.
    
    * platform/graphics/win/WKCACFLayerRenderer.cpp:
    * platform/graphics/win/WKCACFLayerRenderer.h:
    Removed didFlushContext and the HashMap it depended on. We react to
    changes to the layer tree in layerTreeDidChange instead.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1aa76a6..1874f55 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-05  Adam Roben  <aroben at apple.com>
+
+        Remove some dead code from WKCACFLayerRenderer
+
+        Fixes <http://webkit.org/b/51954> WKCACFLayerRenderer has dead and
+        redundant code for reacting to changes to the layer tree
+
+        Reviewed by Sam Weinig.
+
+        * platform/graphics/win/WKCACFLayerRenderer.cpp:
+        * platform/graphics/win/WKCACFLayerRenderer.h:
+        Removed didFlushContext and the HashMap it depended on. We react to
+        changes to the layer tree in layerTreeDidChange instead.
+
 2011-01-06  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
index 73cb794..870c53a 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.cpp
@@ -106,14 +106,6 @@ private:
     WKCACFLayerRenderer* m_renderer;
 };
 
-typedef HashMap<WKCACFContext*, WKCACFLayerRenderer*> ContextToWindowMap;
-
-static ContextToWindowMap& windowsForContexts()
-{
-    DEFINE_STATIC_LOCAL(ContextToWindowMap, map, ());
-    return map;
-}
-
 static D3DPRESENT_PARAMETERS initialPresentationParameters()
 {
     D3DPRESENT_PARAMETERS parameters = {0};
@@ -204,15 +196,6 @@ bool WKCACFLayerRenderer::acceleratedCompositingAvailable()
     return available;
 }
 
-void WKCACFLayerRenderer::didFlushContext(WKCACFContext* context)
-{
-    WKCACFLayerRenderer* window = windowsForContexts().get(context);
-    if (!window)
-        return;
-
-    window->renderSoon();
-}
-
 PassOwnPtr<WKCACFLayerRenderer> WKCACFLayerRenderer::create(WKCACFLayerRendererClient* client)
 {
     if (!acceleratedCompositingAvailable())
@@ -230,8 +213,6 @@ WKCACFLayerRenderer::WKCACFLayerRenderer(WKCACFLayerRendererClient* client)
     , m_backingStoreDirty(false)
     , m_mustResetLostDeviceBeforeRendering(false)
 {
-    windowsForContexts().set(m_context, this);
-
     // Under the root layer, we have a clipping layer to clip the content,
     // that contains a scroll layer that we use for scrolling the content.
     // The root layer is the size of the client area of the window.
@@ -380,10 +361,8 @@ bool WKCACFLayerRenderer::createRenderer()
 
 void WKCACFLayerRenderer::destroyRenderer()
 {
-    if (m_context) {
-        windowsForContexts().remove(m_context);
+    if (m_context)
         WKCACFContextFlusher::shared().removeContext(m_context);
-    }
 
     m_d3dDevice = 0;
     if (s_d3d)
diff --git a/WebCore/platform/graphics/win/WKCACFLayerRenderer.h b/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
index 763fffa..fae853c 100644
--- a/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
+++ b/WebCore/platform/graphics/win/WKCACFLayerRenderer.h
@@ -62,7 +62,6 @@ public:
     ~WKCACFLayerRenderer();
 
     static bool acceleratedCompositingAvailable();
-    static void didFlushContext(WKCACFContext*);
 
     void setRootContents(CGImageRef);
     void setRootContentsAndDisplay(CGImageRef);

-- 
WebKit Debian packaging