Title: [196005] trunk/Source/WebKit2
- Revision
- 196005
- Author
- [email protected]
- Date
- 2016-02-02 03:00:41 -0800 (Tue, 02 Feb 2016)
Log Message
[GTK] Several tests fail due to assert not reached in DrawingArea::dispatchAfterEnsuringDrawing()
https://bugs.webkit.org/show_bug.cgi?id=153785
Patch by Adrien Plazas <[email protected]> on 2016-02-02
Reviewed by Carlos Garcia Campos.
* UIProcess/DrawingAreaProxyImpl.cpp:
(WebKit::DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing):
* UIProcess/DrawingAreaProxyImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (196004 => 196005)
--- trunk/Source/WebKit2/ChangeLog 2016-02-02 06:35:09 UTC (rev 196004)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-02 11:00:41 UTC (rev 196005)
@@ -1,3 +1,14 @@
+2016-02-02 Adrien Plazas <[email protected]>
+
+ [GTK] Several tests fail due to assert not reached in DrawingArea::dispatchAfterEnsuringDrawing()
+ https://bugs.webkit.org/show_bug.cgi?id=153785
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing):
+ * UIProcess/DrawingAreaProxyImpl.h:
+
2016-02-01 Joseph Pecoraro <[email protected]>
Web Inspector: High Level Memory Overview Instrument
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (196004 => 196005)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-02-02 06:35:09 UTC (rev 196004)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2016-02-02 11:00:41 UTC (rev 196005)
@@ -322,6 +322,16 @@
}
#endif
+void DrawingAreaProxyImpl::dispatchAfterEnsuringDrawing(std::function<void (CallbackBase::Error)> callbackFunction)
+{
+ if (!m_webPageProxy.isValid()) {
+ callbackFunction(CallbackBase::Error::OwnerWasInvalidated);
+ return;
+ }
+
+ RunLoop::main().dispatch([callbackFunction] { callbackFunction(CallbackBase::Error::None); });
+}
+
void DrawingAreaProxyImpl::exitAcceleratedCompositingMode()
{
ASSERT(isInAcceleratedCompositingMode());
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (196004 => 196005)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-02-02 06:35:09 UTC (rev 196004)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2016-02-02 11:00:41 UTC (rev 196005)
@@ -53,6 +53,8 @@
void destroyNativeSurfaceHandleForCompositing();
#endif
+ virtual void dispatchAfterEnsuringDrawing(std::function<void (CallbackBase::Error)>) override;
+
private:
// DrawingAreaProxy
virtual void sizeDidChange() override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
