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

[abecsi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5447760cd97937b2f3c4ebbce9d6892f2f87c282
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 22 18:08:17 2010 +0000

    Unreviewed trivial build fix.
    
    [Qt] Mend remaining issues to fix the WebKit2 build.
    
    * Shared/qt/UpdateChunk.h: add missing function
    (WebKit::UpdateChunk::isEmpty):
    * UIProcess/API/qt/qwkpage_p.h: Add stub implementation
    (QWKPagePrivate::pageDidEnterAcceleratedCompositing):
    (QWKPagePrivate::pageDidLeaveAcceleratedCompositing):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9a0637f..45b7f50 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,17 @@
 2010-07-22  Andras Becsi  <abecsi at webkit.org>
 
+        Unreviewed trivial build fix.
+
+        [Qt] Mend remaining issues to fix the WebKit2 build.
+
+        * Shared/qt/UpdateChunk.h: add missing function
+        (WebKit::UpdateChunk::isEmpty):
+        * UIProcess/API/qt/qwkpage_p.h: Add stub implementation
+        (QWKPagePrivate::pageDidEnterAcceleratedCompositing):
+        (QWKPagePrivate::pageDidLeaveAcceleratedCompositing):
+
+2010-07-22  Andras Becsi  <abecsi at webkit.org>
+
         Reviewed by Antonio Gomes.
 
         [Qt] Implement WebContext::applicationCacheDirectory() for the Qt port of WebKit2.
diff --git a/WebKit2/Shared/qt/UpdateChunk.h b/WebKit2/Shared/qt/UpdateChunk.h
index d14f690..d962ded 100644
--- a/WebKit2/Shared/qt/UpdateChunk.h
+++ b/WebKit2/Shared/qt/UpdateChunk.h
@@ -47,6 +47,7 @@ public:
 
     uint8_t* data();
     const WebCore::IntRect& rect() const { return m_rect; }
+    bool isEmpty() const { return m_rect.isEmpty(); }
 
     void encode(CoreIPC::ArgumentEncoder&) const;
     static bool decode(CoreIPC::ArgumentDecoder&, UpdateChunk&);
diff --git a/WebKit2/UIProcess/API/qt/qwkpage_p.h b/WebKit2/UIProcess/API/qt/qwkpage_p.h
index 6409a5f..3e676ef 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage_p.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage_p.h
@@ -40,6 +40,10 @@ public:
 
     void init(const QSize& viewportSize, WebKit::DrawingAreaProxy*);
 
+#if USE(ACCELERATED_COMPOSITING)
+    void pageDidEnterAcceleratedCompositing() {}
+    void pageDidLeaveAcceleratedCompositing() {}
+#endif // USE(ACCELERATED_COMPOSITING)
     virtual void processDidExit() {}
     virtual void processDidRevive() {}
     virtual void setCursor(const WebCore::Cursor&) {}

-- 
WebKit Debian packaging