2011-02-01 Anders Carlsson <andersca@apple.com>
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Feb 2011 21:34:41 +0000 (21:34 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Feb 2011 21:34:41 +0000 (21:34 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@77282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp
Source/WebKit2/WebProcess/WebPage/LayerTreeHost.h
Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.h
Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm

index 030e733..0dd34ca 100644 (file)
@@ -1,3 +1,18 @@
+2011-02-01  Anders Carlsson  <andersca@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@apple.com>
 
         Reviewed by Sam Weinig.
index a511ff9..7c1a12f 100644 (file)
 #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
index f971982..9a2b544 100644 (file)
@@ -52,10 +52,6 @@ public:
 
 protected:
     explicit LayerTreeHost(WebPage*);
-    bool flushPendingLayerChanges();
-
-private:
-    void platformInvalidate();
 
     WebPage* m_webPage;
 };
index 23f7ef2..96623c8 100644 (file)
@@ -43,7 +43,8 @@ private:
 
     static void flushPendingLayerChangesRunLoopObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity, void*);
     void flushPendingLayerChangesRunLoopObserverCallback();
-    
+    bool flushPendingLayerChanges();
+
     RetainPtr<CFRunLoopObserverRef> m_flushPendingLayerChangesRunLoopObserver;
 };
 
index a0c7468..9a34673 100644 (file)
 #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