[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6255afb56f275ef6bb3ebe6d5484ad65a01e2529
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 21 19:27:29 2010 +0000

    2010-07-21  Simon Fraser  <simon.fraser at apple.com>
    
            Windows build fix.
    
            Need to supply implementations of PageClient::pageDidEnterAcceleratedCompositing()
            and pageDidLeaveAcceleratedCompositing() for WebView on Windows.
    
            * UIProcess/win/WebView.cpp:
            (WebKit::WebView::pageDidEnterAcceleratedCompositing):
            (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
            * UIProcess/win/WebView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9dd23fe..6819e37 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-21  Simon Fraser  <simon.fraser at apple.com>
+
+        Windows build fix.
+
+        Need to supply implementations of PageClient::pageDidEnterAcceleratedCompositing()
+        and pageDidLeaveAcceleratedCompositing() for WebView on Windows.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::pageDidEnterAcceleratedCompositing):
+        (WebKit::WebView::pageDidLeaveAcceleratedCompositing):
+        * UIProcess/win/WebView.h:
+
 2010-07-21  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/win/WebView.cpp b/WebKit2/UIProcess/win/WebView.cpp
index 7d9e85b..2107019 100644
--- a/WebKit2/UIProcess/win/WebView.cpp
+++ b/WebKit2/UIProcess/win/WebView.cpp
@@ -553,6 +553,16 @@ void WebView::setCursor(const WebCore::Cursor& cursor)
     ::SetCursor(platformCursor);
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+void WebView::pageDidEnterAcceleratedCompositing()
+{
+}
+
+void WebView::pageDidLeaveAcceleratedCompositing()
+{
+}
+#endif // USE(ACCELERATED_COMPOSITING)
+
 // WebCore::WindowMessageListener
 
 void WebView::windowReceivedMessage(HWND, UINT message, WPARAM wParam, LPARAM)
diff --git a/WebKit2/UIProcess/win/WebView.h b/WebKit2/UIProcess/win/WebView.h
index 120280d..1e2ef4f 100644
--- a/WebKit2/UIProcess/win/WebView.h
+++ b/WebKit2/UIProcess/win/WebView.h
@@ -95,6 +95,10 @@ private:
     virtual void takeFocus(bool direction);
     virtual void toolTipChanged(const WebCore::String&, const WebCore::String&);
     virtual void setCursor(const WebCore::Cursor&);
+#if USE(ACCELERATED_COMPOSITING)
+    virtual void pageDidEnterAcceleratedCompositing();
+    virtual void pageDidLeaveAcceleratedCompositing();
+#endif
 
     // WebCore::WindowMessageListener
     virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);

-- 
WebKit Debian packaging