⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 96879 in webkit


Ignore:
Timestamp:
Oct 6, 2011, 5:17:49 PM (15 years ago)
Author:
jamesr@google.com
Message:

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

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:

Updated CCLayerTreeHostTest::onEndTest() to pump all pending messages
after posting the Quit task and before tearing down any test
infrastructure.

  • features.gypi:
  • src/WebViewImpl.h:
  • tests/CCLayerTreeHostTest.cpp:

(WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r96877 r96879  
     12011-10-06  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove USE(THREADED_COMPOSITING) from the tree
     4        https://bugs.webkit.org/show_bug.cgi?id=69489
     5
     6        Reviewed by Darin Fisher.
     7
     8        This macro isn't needed any more since the logic it guarded is guarded by a runtime switch.
     9
     10        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
     11
    1122011-10-06  David Grogan  <dgrogan@chromium.org>
    213

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h

    r96813 r96879  
    5555    virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
    5656    virtual void didRecreateGraphicsContext(bool success) = 0;
    57 #if !USE(THREADED_COMPOSITING)
     57
     58    // Used in the non-threaded path
    5859    virtual void scheduleComposite() = 0;
    59 #endif
     60
    6061protected:
    6162    virtual ~CCLayerTreeHostClient() { }

  • trunk/Source/WebKit/chromium/ChangeLog

    r96878 r96879  
     12011-10-06  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Remove USE(THREADED_COMPOSITING) from the tree
     4        https://bugs.webkit.org/show_bug.cgi?id=69489
     5
     6        Reviewed by Darin Fisher.
     7
     8        Updated CCLayerTreeHostTest::onEndTest() to pump all pending messages
     9        after posting the Quit task and before tearing down any test
     10        infrastructure.
     11
     12        * features.gypi:
     13        * src/WebViewImpl.h:
     14        * tests/CCLayerTreeHostTest.cpp:
     15        (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
     16
    1172011-10-06  James Robinson  <jamesr@chromium.org>
    218

  • trunk/Source/WebKit/chromium/features.gypi

    r96867 r96879  
    108108    'variables': {
    109109      'use_accelerated_compositing%': 1,
    110       'use_threaded_compositing%': 0,
    111110      'enable_svg%': 1,
    112111      'enable_touch_events%': 1,
    … …  
    117116    },
    118117    'use_accelerated_compositing%': '<(use_accelerated_compositing)',
    119     'use_threaded_compositing%': '<(use_threaded_compositing)',
    120118    'enable_svg%': '<(enable_svg)',
    121119    'enable_touch_events%': '<(enable_touch_events)',
    … …  
    140138        'feature_defines': [
    141139          'ENABLE_ACCELERATED_2D_CANVAS=1',
    142         ],
    143       }],
    144       ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
    145         'feature_defines': [
    146           'WTF_USE_THREADED_COMPOSITING=1',
    147140        ],
    148141      }],

  • trunk/Source/WebKit/chromium/src/WebViewImpl.h

    r96813 r96879  
    224224    virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
    225225    virtual void didRecreateGraphicsContext(bool success);
    226 #if !USE(THREADED_COMPOSITING)
     226
    227227    virtual void scheduleComposite();
    228 #endif
    229228
    230229    // WebViewImpl
    … …  
    453452#if USE(ACCELERATED_COMPOSITING)
    454453    void setIsAcceleratedCompositingActive(bool);
    455 #if !USE(THREADED_COMPOSITING)
    456     void doComposite();
    457 #endif
    458454    void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
    459455    void reallocateRenderer();

  • trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp

    r96813 r96879  
    2525#include "config.h"
    2626
    27 #if USE(THREADED_COMPOSITING)
    28 
    2927#include "cc/CCLayerTreeHost.h"
    3028
    … …  
    171169    }
    172170
    173 #if !USE(THREADED_COMPOSITING)
    174171    virtual void scheduleComposite() { }
    175 #endif
    176172
    177173private:
    … …  
    217213        m_webThread = adoptPtr(webKitPlatformSupport()->createThread("CCLayerTreeHostTest"));
    218214        WebCompositor::setThread(m_webThread.get());
    219 #if USE(THREADED_COMPOSITING)
    220215        m_settings.enableCompositorThread = true;
    221 #else
    222         m_settings.enableCompositorThread = false;
    223 #endif
    224216    }
    225217
    … …  
    234226    {
    235227        ASSERT(isMainThread());
     228        // webkit_support::QuitMessageLoop() simply posts a task on the loop to quit. Any pending messages enqueued
     229        // before the Quit task will still run. For this test scenario we want to run all pending messages before
     230        // tearing down m_layerTreeHost, so we spin the loop after posting the Quit task.
    236231        webkit_support::QuitMessageLoop();
     232        webkit_support::RunAllPendingMessages();
    237233        CCLayerTreeHostTest* test = static_cast<CCLayerTreeHostTest*>(self);
    238234        ASSERT(test);
    … …  
    717713
    718714} // namespace
    719 
    720 #endif
Note: See TracChangeset for help on using the changeset viewer.