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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index afb2e3f2550c631fbded34f7439713565375d9da..c133c194310f104ed50a46bea80f07b93d46a834 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2014-07-14  Tim Horton  <timothy_horton@apple.com>
+
+        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  <timothy_horton@apple.com>
 
         Fix the build.

diff --git a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
index 721309073208631cf4cc64529193f8267e78a77b..c48e01d1eba2aabcbc07a85bb6080f93a8b3d5b3 100644 (file)
--- 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;
 }