From cd142f7b24fc9b2777e9663e677629733de44f09 Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Mon, 14 Jul 2014 22:00:09 +0000 Subject: [PATCH] ASSERT(isMainThread()) under OneShotDisplayLinkHandler https://bugs.webkit.org/show_bug.cgi?id=134900 Reviewed by Simon Fraser. * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm: (-[OneShotDisplayLinkHandler displayLinkFired:]): isMainThread means the Web thread sometimes. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171087 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 11 +++++++++++ .../UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index afb2e3f2550c..c133c194310f 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,14 @@ +2014-07-14 Tim Horton + + ASSERT(isMainThread()) under OneShotDisplayLinkHandler + https://bugs.webkit.org/show_bug.cgi?id=134900 + + Reviewed by Simon Fraser. + + * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm: + (-[OneShotDisplayLinkHandler displayLinkFired:]): + isMainThread means the Web thread sometimes. + 2014-07-14 Tim Horton Fix the build. diff --git a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm index 721309073208..c48e01d1eba2 100644 --- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm +++ b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm @@ -77,7 +77,7 @@ using namespace WebCore; - (void)displayLinkFired:(CADisplayLink *)sender { - ASSERT(isMainThread()); + ASSERT(isUIThread()); _drawingAreaProxy->didRefreshDisplay(sender.timestamp); _displayLink.paused = YES; } -- 2.36.0