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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 2b00660045a9a27b0ff77197a100a7264adf01c5
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 07:06:51 2011 +0000

    Unreviewed.
    
    Fix Qt build after r77339.
    
    * UIProcess/API/qt/qwkpage.cpp:
    (QWKPagePrivate::enterAcceleratedCompositingMode):
    (QWKPagePrivate::exitAcceleratedCompositingMode):
    * UIProcess/API/qt/qwkpage_p.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77365 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 6174149..3c9b1d5 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-01  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed.
+
+        Fix Qt build after r77339.
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::enterAcceleratedCompositingMode):
+        (QWKPagePrivate::exitAcceleratedCompositingMode):
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2011-02-01  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 42d20bd..69bd57d 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -185,6 +185,16 @@ bool QWKPagePrivate::isViewInWindow()
     return true;
 }
 
+void QWKPagePrivate::enterAcceleratedCompositingMode(const LayerTreeContext&)
+{
+    // FIXME: Implement.
+}
+
+void QWKPagePrivate::exitAcceleratedCompositingMode()
+{
+    // FIXME: Implement.
+}
+
 void QWKPagePrivate::pageDidRequestScroll(const IntSize& delta)
 {
     emit q->scrollRequested(delta.width(), delta.height());
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h b/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
index d145885..47012d2 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -22,6 +22,7 @@
 #define qwkpage_p_h
 
 #include "DrawingAreaProxy.h"
+#include "LayerTreeContext.h"
 #include "PageClient.h"
 #include "qwkpage.h"
 #include "qgraphicswkview.h"
@@ -35,6 +36,8 @@
 class QGraphicsWKView;
 class QWKPreferences;
 
+using namespace WebKit;
+
 class QWKPagePrivate : WebKit::PageClient {
 public:
     QWKPagePrivate(QWKPage*, QWKContext*);
@@ -57,6 +60,8 @@ public:
     virtual bool isViewInWindow();
 
 #if USE(ACCELERATED_COMPOSITING)
+    virtual void enterAcceleratedCompositingMode(const LayerTreeContext&);
+    virtual void exitAcceleratedCompositingMode();
     void pageDidEnterAcceleratedCompositing() { }
     void pageDidLeaveAcceleratedCompositing() { }
 #endif // USE(ACCELERATED_COMPOSITING)

-- 
WebKit Debian packaging