[webkit-changes] [96791] trunk/Source

Thu, 06 Oct 2011 00:11:13 -0700

Title: [96791] trunk/Source
Revision
96791
Author
commit-qu...@webkit.org
Date
2011-10-06 00:12:09 -0700 (Thu, 06 Oct 2011)

Log Message

[chromium] Remove USE(THREADED_COMPOSITING) from the tree
https://bugs.webkit.org/show_bug.cgi?id=69489

Patch by James Robinson <jam...@chromium.org> on 2011-10-06
Reviewed by Darin Fisher.

Source/WebCore:

This macro isn't needed any more since the logic it guarded is guarded by a runtime switch.

* platform/graphics/chromium/cc/CCLayerTreeHost.h:

Source/WebKit/chromium:

* features.gypi:
* src/WebViewImpl.h:
* tests/CCLayerTreeHostTest.cpp:
(WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (96790 => 96791)


--- trunk/Source/WebCore/ChangeLog	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebCore/ChangeLog	2011-10-06 07:12:09 UTC (rev 96791)
@@ -1,3 +1,14 @@
+2011-10-06  James Robinson  <jam...@chromium.org>
+
+        [chromium] Remove USE(THREADED_COMPOSITING) from the tree
+        https://bugs.webkit.org/show_bug.cgi?id=69489
+
+        Reviewed by Darin Fisher.
+
+        This macro isn't needed any more since the logic it guarded is guarded by a runtime switch.
+
+        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+
 2011-10-05  Kentaro Hara  <hara...@chromium.org>
 
         Refactor IDL attributes about constructor

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (96790 => 96791)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h	2011-10-06 07:12:09 UTC (rev 96791)
@@ -54,9 +54,10 @@
     virtual void applyScrollDelta(const IntSize&) = 0;
     virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
     virtual void didRecreateGraphicsContext(bool success) = 0;
-#if !USE(THREADED_COMPOSITING)
+
+    // Used in the non-threaded path
     virtual void scheduleComposite() = 0;
-#endif
+
 protected:
     virtual ~CCLayerTreeHostClient() { }
 };

Modified: trunk/Source/WebKit/chromium/ChangeLog (96790 => 96791)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-10-06 07:12:09 UTC (rev 96791)
@@ -1,3 +1,15 @@
+2011-10-06  James Robinson  <jam...@chromium.org>
+
+        [chromium] Remove USE(THREADED_COMPOSITING) from the tree
+        https://bugs.webkit.org/show_bug.cgi?id=69489
+
+        Reviewed by Darin Fisher.
+
+        * features.gypi:
+        * src/WebViewImpl.h:
+        * tests/CCLayerTreeHostTest.cpp:
+        (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
+
 2011-10-05  Alexei Svitkine  <asvitk...@chromium.org>
 
         Make destructor of WebURLLoaderClient virtual.

Modified: trunk/Source/WebKit/chromium/features.gypi (96790 => 96791)


--- trunk/Source/WebKit/chromium/features.gypi	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebKit/chromium/features.gypi	2011-10-06 07:12:09 UTC (rev 96791)
@@ -107,7 +107,6 @@
     # through GYP_DEFINES.
     'variables': {
       'use_accelerated_compositing%': 1,
-      'use_threaded_compositing%': 0,
       'enable_svg%': 1,
       'enable_touch_events%': 1,
       'use_skia_gpu%': 0,
@@ -116,7 +115,6 @@
       'enable_css3_flexbox%': 0,
     },
     'use_accelerated_compositing%': '<(use_accelerated_compositing)',
-    'use_threaded_compositing%': '<(use_threaded_compositing)',
     'enable_svg%': '<(enable_svg)',
     'enable_touch_events%': '<(enable_touch_events)',
     'use_skia%': '<(use_skia)',
@@ -141,11 +139,6 @@
           'ENABLE_ACCELERATED_2D_CANVAS=1',
         ],
       }],
-      ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
-        'feature_defines': [
-          'WTF_USE_THREADED_COMPOSITING=1',
-        ],
-      }],
       ['touchui==1', {
         'enable_touch_icon_loading': 1,
       }],

Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (96790 => 96791)


--- trunk/Source/WebKit/chromium/src/WebViewImpl.h	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h	2011-10-06 07:12:09 UTC (rev 96791)
@@ -223,9 +223,8 @@
     virtual void applyScrollDelta(const WebCore::IntSize&);
     virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
     virtual void didRecreateGraphicsContext(bool success);
-#if !USE(THREADED_COMPOSITING)
+
     virtual void scheduleComposite();
-#endif
 
     // WebViewImpl
 
@@ -452,9 +451,6 @@
 
 #if USE(ACCELERATED_COMPOSITING)
     void setIsAcceleratedCompositingActive(bool);
-#if !USE(THREADED_COMPOSITING)
-    void doComposite();
-#endif
     void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
     void reallocateRenderer();
     void updateLayerTreeViewport();

Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (96790 => 96791)


--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2011-10-06 06:34:02 UTC (rev 96790)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp	2011-10-06 07:12:09 UTC (rev 96791)
@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#if USE(THREADED_COMPOSITING)
-
 #include "cc/CCLayerTreeHost.h"
 
 #include "cc/CCLayerImpl.h"
@@ -170,9 +168,7 @@
     {
     }
 
-#if !USE(THREADED_COMPOSITING)
     virtual void scheduleComposite() { }
-#endif
 
 private:
     explicit MockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks(testHooks) { }
@@ -216,11 +212,7 @@
     {
         m_webThread = adoptPtr(webKitPlatformSupport()->createThread("CCLayerTreeHostTest"));
         WebCompositor::setThread(m_webThread.get());
-#if USE(THREADED_COMPOSITING)
         m_settings.enableCompositorThread = true;
-#else
-        m_settings.enableCompositorThread = false;
-#endif
     }
 
     void doBeginTest();
@@ -716,5 +708,3 @@
 }
 
 } // namespace
-
-#endif

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to