Title: [216043] trunk/Source/WebCore
Revision
216043
Author
[email protected]
Date
2017-05-01 16:54:31 -0700 (Mon, 01 May 2017)

Log Message

Web Inspector: ASSERT(!m_startedComposite) fails when recording on non-Cocoa Timeline
https://bugs.webkit.org/show_bug.cgi?id=171363

Patch by Ross Kirsling <[email protected]> on 2017-05-01
Reviewed by Matt Baker.

* page/FrameView.cpp:
(WebCore::FrameView::flushCompositingStateIncludingSubframes): Add PLATFORM(COCOA) guard.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (216042 => 216043)


--- trunk/Source/WebCore/ChangeLog	2017-05-01 23:18:15 UTC (rev 216042)
+++ trunk/Source/WebCore/ChangeLog	2017-05-01 23:54:31 UTC (rev 216043)
@@ -1,3 +1,13 @@
+2017-05-01  Ross Kirsling  <[email protected]>
+
+        Web Inspector: ASSERT(!m_startedComposite) fails when recording on non-Cocoa Timeline
+        https://bugs.webkit.org/show_bug.cgi?id=171363
+
+        Reviewed by Matt Baker.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::flushCompositingStateIncludingSubframes): Add PLATFORM(COCOA) guard.
+
 2017-05-01  David Kilzer  <[email protected]>
 
         Stop using strcpy() in fullyQualifiedInfoTableName() from Database.cpp

Modified: trunk/Source/WebCore/page/FrameView.cpp (216042 => 216043)


--- trunk/Source/WebCore/page/FrameView.cpp	2017-05-01 23:18:15 UTC (rev 216042)
+++ trunk/Source/WebCore/page/FrameView.cpp	2017-05-01 23:54:31 UTC (rev 216043)
@@ -1231,7 +1231,9 @@
 
 bool FrameView::flushCompositingStateIncludingSubframes()
 {
+#if PLATFORM(COCOA)
     InspectorInstrumentation::willComposite(frame());
+#endif
 
     bool allFramesFlushed = flushCompositingStateForThisFrame(frame());
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to