Diff
Modified: trunk/Source/WebCore/ChangeLog (106950 => 106951)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 16:43:23 UTC (rev 106951)
@@ -1,5 +1,23 @@
2012-02-07 Sheriff Bot <webkit.review....@gmail.com>
+ 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).
+
+ * 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):
+
+2012-02-07 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r106932.
http://trac.webkit.org/changeset/106932
https://bugs.webkit.org/show_bug.cgi?id=77988
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (106950 => 106951)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp 2012-02-07 16:43:23 UTC (rev 106951)
@@ -251,8 +251,9 @@
void CCLayerTreeHost::setNeedsRedraw()
{
- m_proxy->setNeedsRedraw();
- if (!CCThreadProxy::implThread())
+ if (CCThreadProxy::implThread())
+ m_proxy->setNeedsRedraw();
+ else
m_client->scheduleComposite();
}
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp (106950 => 106951)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSingleThreadProxy.cpp 2012-02-07 16:43:23 UTC (rev 106951)
@@ -29,7 +29,6 @@
#include "GraphicsContext3D.h"
#include "LayerRendererChromium.h"
#include "TraceEvent.h"
-#include "cc/CCDamageTracker.h"
#include "cc/CCLayerTreeHost.h"
#include "cc/CCTextureUpdater.h"
#include <wtf/CurrentTime.h>
@@ -195,10 +194,6 @@
void CCSingleThreadProxy::setNeedsRedraw()
{
- CCRenderSurface* renderSurface = m_layerTreeHostImpl->rootLayer()->renderSurface();
- if (renderSurface)
- renderSurface->damageTracker()->forceFullDamageNextUpdate();
-
// FIXME: Once we move render_widget scheduling into this class, we can
// treat redraw requests more efficiently than commitAndRedraw requests.
setNeedsCommit();
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (106950 => 106951)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-02-07 16:43:23 UTC (rev 106951)
@@ -28,7 +28,6 @@
#include "GraphicsContext3D.h"
#include "TraceEvent.h"
-#include "cc/CCDamageTracker.h"
#include "cc/CCDelayBasedTimeSource.h"
#include "cc/CCFrameRateController.h"
#include "cc/CCInputHandler.h"
@@ -249,7 +248,6 @@
{
ASSERT(isMainThread());
TRACE_EVENT("CCThreadProxy::setNeedsRedraw", this, 0);
- CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::resetDamageTrackerOnImplThread));
CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setNeedsRedrawOnImplThread));
}
@@ -276,14 +274,6 @@
completion->signal();
}
-void CCThreadProxy::resetDamageTrackerOnImplThread()
-{
- ASSERT(isImplThread());
- CCRenderSurface* renderSurface = m_layerTreeHostImpl->rootLayer()->renderSurface();
- if (renderSurface)
- renderSurface->damageTracker()->forceFullDamageNextUpdate();
-}
-
void CCThreadProxy::setNeedsRedrawOnImplThread()
{
ASSERT(isImplThread());
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h (106950 => 106951)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h 2012-02-07 16:43:23 UTC (rev 106951)
@@ -103,7 +103,6 @@
void initializeLayerRendererOnImplThread(CCCompletionEvent*, bool* initializeSucceeded, LayerRendererCapabilities*);
void setVisibleOnImplThread(CCCompletionEvent*, bool visible);
void layerTreeHostClosedOnImplThread(CCCompletionEvent*);
- void resetDamageTrackerOnImplThread();
// Accessed on main thread only.
bool m_animateRequested;
Modified: trunk/Source/WebKit/chromium/ChangeLog (106950 => 106951)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-07 16:43:23 UTC (rev 106951)
@@ -1,3 +1,18 @@
+2012-02-07 Sheriff Bot <webkit.review....@gmail.com>
+
+ 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).
+
+ * public/WebWidget.h:
+ (WebWidget):
+ * src/WebViewImpl.cpp:
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-02-07 Jonathan Backer <bac...@chromium.org>
[chromium] Add setNeedsRedraw to WebWidget
Modified: trunk/Source/WebKit/chromium/public/WebWidget.h (106950 => 106951)
--- trunk/Source/WebKit/chromium/public/WebWidget.h 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebKit/chromium/public/WebWidget.h 2012-02-07 16:43:23 UTC (rev 106951)
@@ -107,11 +107,6 @@
// animate or layout in this case.
virtual void composite(bool finish) = 0;
- // Temporary method for the embedder to notify the WebWidget that the widget
- // has taken damage, e.g. due to a window expose. This method will be
- // removed when the WebWidget inversion patch lands --- http://crbug.com/112837
- virtual void setNeedsRedraw() { }
-
// Called to inform the WebWidget of a change in theme.
// Implementors that cache rendered copies of widgets need to re-render
// on receiving this message
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (106950 => 106951)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-07 16:43:23 UTC (rev 106951)
@@ -1271,14 +1271,6 @@
#endif
}
-void WebViewImpl::setNeedsRedraw()
-{
-#if USE(ACCELERATED_COMPOSITING)
- if (m_layerTreeHost && isAcceleratedCompositingActive())
- m_layerTreeHost->setNeedsRedraw();
-#endif
-}
-
void WebViewImpl::loseCompositorContext(int numTimes)
{
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (106950 => 106951)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-02-07 16:28:17 UTC (rev 106950)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-02-07 16:43:23 UTC (rev 106951)
@@ -113,7 +113,6 @@
virtual void paint(WebCanvas*, const WebRect&);
virtual void themeChanged();
virtual void composite(bool finish);
- virtual void setNeedsRedraw();
virtual bool handleInputEvent(const WebInputEvent&);
virtual void mouseCaptureLost();
virtual void setFocus(bool enable);
