Changeset 106951 in webkit


Ignore:
Timestamp:
Feb 7, 2012 8:43:23 AM (12 years ago)
Author:
tonyg@chromium.org
Message:

Unreviewed, rolling out r106935.
​http://trac.webkit.org/changeset/106935
​https://bugs.webkit.org/show_bug.cgi?id=77994

"Crashes runMultiThread webkit_unit_test" (Requested by tonyg-
cr on #webkit).

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

Source/WebCore:

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

(WebCore::CCLayerTreeHost::setNeedsRedraw):

  • platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:

(WebCore::CCSingleThreadProxy::setNeedsRedraw):

  • platform/graphics/chromium/cc/CCThreadProxy.cpp:

(WebCore::CCThreadProxy::setNeedsRedraw):

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

(CCThreadProxy):

Source/WebKit/chromium:

  • public/WebWidget.h:

(WebWidget):

  • src/WebViewImpl.cpp:
  • src/WebViewImpl.h:

(WebViewImpl):

Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r106947 r106951  
     12012-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106935.
     4        http://trac.webkit.org/changeset/106935
     5        https://bugs.webkit.org/show_bug.cgi?id=77994
     6
     7        "Crashes runMultiThread webkit_unit_test" (Requested by tonyg-
     8        cr on #webkit).
     9
     10        * platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
     11        (WebCore::CCLayerTreeHost::setNeedsRedraw):
     12        * platform/graphics/chromium/cc/CCSingleThreadProxy.cpp:
     13        (WebCore::CCSingleThreadProxy::setNeedsRedraw):
     14        * platform/graphics/chromium/cc/CCThreadProxy.cpp:
     15        (WebCore::CCThreadProxy::setNeedsRedraw):
     16        * platform/graphics/chromium/cc/CCThreadProxy.h:
     17        (CCThreadProxy):
     18
    1192012-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
    220

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

    r106935 r106951  
    252252void CCLayerTreeHost::setNeedsRedraw()
    253253{
    254     m_proxy->setNeedsRedraw();
    255     if (!CCThreadProxy::implThread())
     254    if (CCThreadProxy::implThread())
     255        m_proxy->setNeedsRedraw();
     256    else
    256257        m_client->scheduleComposite();
    257258}

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp

    r106935 r106951  
    3030#include "LayerRendererChromium.h"
    3131#include "TraceEvent.h"
    32 #include "cc/CCDamageTracker.h"
    3332#include "cc/CCLayerTreeHost.h"
    3433#include "cc/CCTextureUpdater.h"
    … …  
    196195void CCSingleThreadProxy::setNeedsRedraw()
    197196{
    198     CCRenderSurface* renderSurface = m_layerTreeHostImpl->rootLayer()->renderSurface();
    199     if (renderSurface)
    200         renderSurface->damageTracker()->forceFullDamageNextUpdate();
    201 
    202197    // FIXME: Once we move render_widget scheduling into this class, we can
    203198    // treat redraw requests more efficiently than commitAndRedraw requests.

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp

    r106935 r106951  
    2929#include "GraphicsContext3D.h"
    3030#include "TraceEvent.h"
    31 #include "cc/CCDamageTracker.h"
    3231#include "cc/CCDelayBasedTimeSource.h"
    3332#include "cc/CCFrameRateController.h"
    … …  
    250249    ASSERT(isMainThread());
    251250    TRACE_EVENT("CCThreadProxy::setNeedsRedraw", this, 0);
    252     CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::resetDamageTrackerOnImplThread));
    253251    CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setNeedsRedrawOnImplThread));
    254252}
    … …  
    275273        m_schedulerOnImplThread->setNeedsRedraw();
    276274    completion->signal();
    277 }
    278 
    279 void CCThreadProxy::resetDamageTrackerOnImplThread()
    280 {
    281     ASSERT(isImplThread());
    282     CCRenderSurface* renderSurface = m_layerTreeHostImpl->rootLayer()->renderSurface();
    283     if (renderSurface)
    284         renderSurface->damageTracker()->forceFullDamageNextUpdate();
    285275}
    286276

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

    r106935 r106951  
    104104    void setVisibleOnImplThread(CCCompletionEvent*, bool visible);
    105105    void layerTreeHostClosedOnImplThread(CCCompletionEvent*);
    106     void resetDamageTrackerOnImplThread();
    107106
    108107    // Accessed on main thread only.

  • trunk/Source/WebKit/chromium/ChangeLog

    r106935 r106951  
     12012-02-07  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r106935.
     4        http://trac.webkit.org/changeset/106935
     5        https://bugs.webkit.org/show_bug.cgi?id=77994
     6
     7        "Crashes runMultiThread webkit_unit_test" (Requested by tonyg-
     8        cr on #webkit).
     9
     10        * public/WebWidget.h:
     11        (WebWidget):
     12        * src/WebViewImpl.cpp:
     13        * src/WebViewImpl.h:
     14        (WebViewImpl):
     15
    1162012-02-07  Jonathan Backer  <backer@chromium.org>
    217

  • trunk/Source/WebKit/chromium/public/WebWidget.h

    r106935 r106951  
    108108    virtual void composite(bool finish) = 0;
    109109
    110     // Temporary method for the embedder to notify the WebWidget that the widget
    111     // has taken damage, e.g. due to a window expose. This method will be
    112     // removed when the WebWidget inversion patch lands --- http://crbug.com/112837
    113     virtual void setNeedsRedraw() { }
    114 
    115110    // Called to inform the WebWidget of a change in theme.
    116111    // Implementors that cache rendered copies of widgets need to re-render

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

    r106935 r106951  
    12721272}
    12731273
    1274 void WebViewImpl::setNeedsRedraw()
    1275 {
    1276 #if USE(ACCELERATED_COMPOSITING)
    1277     if (m_layerTreeHost && isAcceleratedCompositingActive())
    1278         m_layerTreeHost->setNeedsRedraw();
    1279 #endif
    1280 }
    1281 
    12821274void WebViewImpl::loseCompositorContext(int numTimes)
    12831275{

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

    r106935 r106951  
    114114    virtual void themeChanged();
    115115    virtual void composite(bool finish);
    116     virtual void setNeedsRedraw();
    117116    virtual bool handleInputEvent(const WebInputEvent&);
    118117    virtual void mouseCaptureLost();
Note: See TracChangeset for help on using the changeset viewer.