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

Changeset 96930 in webkit


Ignore:
Timestamp:
Oct 7, 2011, 5:17:00 AM (15 years ago)
Author:
podivilov@chromium.org
Message:

Unreviewed, rolling out r96879.
​http://trac.webkit.org/changeset/96879
​https://bugs.webkit.org/show_bug.cgi?id=69618

Broke CCLayerTreeHostTestShortlived1 on chromium mac.
(Requested by podivilov on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-10-07

Source/WebCore:

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

Source/WebKit/chromium:

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

(WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
(WTF::CCLayerTreeHostTest::onEndTest):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r96929 r96930  
     12011-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96879.
     4        http://trac.webkit.org/changeset/96879
     5        https://bugs.webkit.org/show_bug.cgi?id=69618
     6
     7        Broke CCLayerTreeHostTestShortlived1 on chromium mac.
     8        (Requested by podivilov on #webkit).
     9
     10        * platform/graphics/chromium/cc/CCLayerTreeHost.h:
     11
    1122011-10-07  Pavel Feldman  <pfeldman@google.com>
    213

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

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

  • trunk/Source/WebKit/chromium/ChangeLog

    r96927 r96930  
     12011-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r96879.
     4        http://trac.webkit.org/changeset/96879
     5        https://bugs.webkit.org/show_bug.cgi?id=69618
     6
     7        Broke CCLayerTreeHostTestShortlived1 on chromium mac.
     8        (Requested by podivilov on #webkit).
     9
     10        * features.gypi:
     11        * src/WebViewImpl.h:
     12        * tests/CCLayerTreeHostTest.cpp:
     13        (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
     14        (WTF::CCLayerTreeHostTest::onEndTest):
     15
    1162011-10-07  Sheriff Bot  <webkit.review.bot@gmail.com>
    217

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

    r96923 r96930  
    109109    'variables': {
    110110      'use_accelerated_compositing%': 1,
     111      'use_threaded_compositing%': 0,
    111112      'enable_svg%': 1,
    112113      'enable_touch_events%': 1,
    … …  
    117118    },
    118119    'use_accelerated_compositing%': '<(use_accelerated_compositing)',
     120    'use_threaded_compositing%': '<(use_threaded_compositing)',
    119121    'enable_svg%': '<(enable_svg)',
    120122    'enable_touch_events%': '<(enable_touch_events)',
    … …  
    139141        'feature_defines': [
    140142          'ENABLE_ACCELERATED_2D_CANVAS=1',
     143        ],
     144      }],
     145      ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
     146        'feature_defines': [
     147          'WTF_USE_THREADED_COMPOSITING=1',
    141148        ],
    142149      }],

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

    r96879 r96930  
    224224    virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
    225225    virtual void didRecreateGraphicsContext(bool success);
    226 
     226#if !USE(THREADED_COMPOSITING)
    227227    virtual void scheduleComposite();
     228#endif
    228229
    229230    // WebViewImpl
    … …  
    452453#if USE(ACCELERATED_COMPOSITING)
    453454    void setIsAcceleratedCompositingActive(bool);
     455#if !USE(THREADED_COMPOSITING)
     456    void doComposite();
     457#endif
    454458    void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
    455459    void reallocateRenderer();

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

    r96879 r96930  
    2525#include "config.h"
    2626
     27#if USE(THREADED_COMPOSITING)
     28
    2729#include "cc/CCLayerTreeHost.h"
    2830
    … …  
    169171    }
    170172
     173#if !USE(THREADED_COMPOSITING)
    171174    virtual void scheduleComposite() { }
     175#endif
    172176
    173177private:
    … …  
    213217        m_webThread = adoptPtr(webKitPlatformSupport()->createThread("CCLayerTreeHostTest"));
    214218        WebCompositor::setThread(m_webThread.get());
     219#if USE(THREADED_COMPOSITING)
    215220        m_settings.enableCompositorThread = true;
     221#else
     222        m_settings.enableCompositorThread = false;
     223#endif
    216224    }
    217225
    … …  
    226234    {
    227235        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.
    231236        webkit_support::QuitMessageLoop();
    232         webkit_support::RunAllPendingMessages();
    233237        CCLayerTreeHostTest* test = static_cast<CCLayerTreeHostTest*>(self);
    234238        ASSERT(test);
    … …  
    713717
    714718} // namespace
     719
     720#endif
Note: See TracChangeset for help on using the changeset viewer.