[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 5c0d442786d32f220345db77beef4016a42897a1
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 23:12:35 2010 +0000

    2010-10-04  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed Csaba Osztrogonác.
    
            [Qt] Build fix after r69037.
            Also remove dummy setUpAcceleratedCompositing() from the source file,
            since it has been removed from the header.
    
            * UIProcess/WebProcessProxy.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69049 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4fb9c48..49c3f77 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-04  Andras Becsi  <abecsi at webkit.org>
 
+        Reviewed Csaba Osztrogonác.
+
+        [Qt] Build fix after r69037.
+        Also remove dummy setUpAcceleratedCompositing() from the source file,
+        since it has been removed from the header.
+
+        * UIProcess/WebProcessProxy.cpp:
+
+2010-10-04  Andras Becsi  <abecsi at webkit.org>
+
         Rubber-stamped by Csaba Osztrogonác.
 
         [Qt] Fix the WebKit2 build after r69029.
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index 75cbbed..1755fb7 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -129,12 +129,6 @@ void WebProcessProxy::terminate()
         m_processLauncher->terminateProcess();
 }
 
-#if USE(ACCELERATED_COMPOSITING) && !PLATFORM(MAC)
-void WebProcessProxy::setUpAcceleratedCompositing()
-{
-}
-#endif
-
 WebPageProxy* WebProcessProxy::webPage(uint64_t pageID) const
 {
     return m_pageMap.get(pageID).get();

-- 
WebKit Debian packaging