[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit f16aa712a53f312005a8f16fee47d2ff76595fdd
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 21:34:41 2011 +0000

    2011-02-01  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Adam Roben.
    
            Move flushPendingLayerChanges to LayerTreeHostMac
            https://bugs.webkit.org/show_bug.cgi?id=53525
    
            In preparation for adding more Mac specific code to flushPendingLayerChanges.
    
            * WebProcess/WebPage/LayerTreeHost.cpp:
            * WebProcess/WebPage/LayerTreeHost.h:
            * WebProcess/WebPage/mac/LayerTreeHostMac.h:
            * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
            (WebKit::LayerTreeHostMac::flushPendingLayerChanges):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 030e733..0dd34ca 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-02-01  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Move flushPendingLayerChanges to LayerTreeHostMac
+        https://bugs.webkit.org/show_bug.cgi?id=53525
+
+        In preparation for adding more Mac specific code to flushPendingLayerChanges.
+
+        * WebProcess/WebPage/LayerTreeHost.cpp:
+        * WebProcess/WebPage/LayerTreeHost.h:
+        * WebProcess/WebPage/mac/LayerTreeHostMac.h:
+        * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
+        (WebKit::LayerTreeHostMac::flushPendingLayerChanges):
+
 2011-02-01  Beth Dakin  <bdakin at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
index a511ff9..7c1a12f 100644
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
@@ -26,11 +26,6 @@
 #include "config.h"
 #include "LayerTreeHost.h"
 
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/Page.h>
-#include "WebPage.h"
-
 #if PLATFORM(MAC)
 #include "LayerTreeHostMac.h"
 #else
@@ -59,9 +54,4 @@ LayerTreeHost::~LayerTreeHost()
 {
 }
 
-bool LayerTreeHost::flushPendingLayerChanges()
-{
-    return m_webPage->corePage()->mainFrame()->view()->syncCompositingStateIncludingSubframes();
-}
-
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
index f971982..9a2b544 100644
--- a/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
+++ b/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
@@ -52,10 +52,6 @@ public:
 
 protected:
     explicit LayerTreeHost(WebPage*);
-    bool flushPendingLayerChanges();
-
-private:
-    void platformInvalidate();
 
     WebPage* m_webPage;
 };
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h
index 23f7ef2..96623c8 100644
--- a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h
+++ b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h
@@ -43,7 +43,8 @@ private:
 
     static void flushPendingLayerChangesRunLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void*);
     void flushPendingLayerChangesRunLoopObserverCallback();
-    
+    bool flushPendingLayerChanges();
+
     RetainPtr<CFRunLoopObserverRef> m_flushPendingLayerChangesRunLoopObserver;
 };
 
diff --git a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
index a0c7468..9a34673 100644
--- a/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
+++ b/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
@@ -26,6 +26,11 @@
 #import "config.h"
 #import "LayerTreeHostMac.h"
 
+#import <WebCore/Frame.h>
+#import <WebCore/FrameView.h>
+#import <WebCore/Page.h>
+#import "WebPage.h"
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -75,4 +80,10 @@ void LayerTreeHostMac::flushPendingLayerChangesRunLoopObserverCallback()
     m_flushPendingLayerChangesRunLoopObserver = 0;
 }
 
+bool LayerTreeHostMac::flushPendingLayerChanges()
+{
+    return m_webPage->corePage()->mainFrame()->view()->syncCompositingStateIncludingSubframes();
+}
+
+    
 } // namespace WebKit

-- 
WebKit Debian packaging