[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ffcdc21e46b10f43377fd86839bef1c5638c7af0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 19:28:06 2010 +0000

    2010-02-17  Alok Priyadarshi  <alokp at chromium.org>
    
            Reviewed by Ariya Hidayat.
    
            Bug 34900: Implement accelerated compositing for chromium.
            https://bugs.webkit.org/show_bug.cgi?id=34900
    
            Do not exclude files needed for accelerated compositing. In fact there is no need to exclude these files.
            These files are already guarded with WTF_USE_ACCELERATED_COMPOSITING flag.
    
            * WebCore.gyp/WebCore.gyp: Removed GraphicsLayer.cpp, RenderLayerBacking.cpp,
            and RenderLayerCompositor.cpp from excluded list.
    2010-02-17  Alok Priyadarshi  <alokp at chromium.org>
    
            Reviewed by Ariya Hidayat.
    
            Bug 34900: Implement accelerated compositing for chromium.
            https://bugs.webkit.org/show_bug.cgi?id=34900
    
            * features.gypi: Added WTF_USE_ACCELERATED_COMPOSITING flag.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d0602ca..3e2f09c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-17  Alok Priyadarshi  <alokp at chromium.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Bug 34900: Implement accelerated compositing for chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=34900
+
+        Do not exclude files needed for accelerated compositing. In fact there is no need to exclude these files.
+        These files are already guarded with WTF_USE_ACCELERATED_COMPOSITING flag.
+
+        * WebCore.gyp/WebCore.gyp: Removed GraphicsLayer.cpp, RenderLayerBacking.cpp,
+        and RenderLayerCompositor.cpp from excluded list.
+
 2010-02-17  Jian Li  <jianli at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index e40da56..54a229e 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -741,9 +741,6 @@
         '../dom/StaticStringList.cpp',
         '../loader/icon/IconFetcher.cpp',
         '../loader/UserStyleSheetLoader.cpp',
-        '../platform/graphics/GraphicsLayer.cpp',
-        '../platform/graphics/RenderLayerBacking.cpp',
-        '../platform/graphics/RenderLayerCompositor.cpp',
 
         # We use a multi-process version from the WebKit API.
         '../dom/default/PlatformMessagePortChannel.cpp',
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7307996..b7bb876 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-17  Alok Priyadarshi  <alokp at chromium.org>
+
+        Reviewed by Ariya Hidayat.
+
+        Bug 34900: Implement accelerated compositing for chromium.
+        https://bugs.webkit.org/show_bug.cgi?id=34900
+
+        * features.gypi: Added WTF_USE_ACCELERATED_COMPOSITING flag.
+
 2010-02-17  Jian Li  <jianli at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/features.gypi b/WebKit/chromium/features.gypi
index 6091b8f..0fc6516 100644
--- a/WebKit/chromium/features.gypi
+++ b/WebKit/chromium/features.gypi
@@ -68,6 +68,7 @@
         'ENABLE_VIDEO=1',
         'ENABLE_WEB_SOCKETS=1',
         'ENABLE_WORKERS=1',
+        'WTF_USE_ACCELERATED_COMPOSITING=0',
       ],
     },
     'feature_defines%': '<(feature_defines)',

-- 
WebKit Debian packaging