Title: [224627] tags/Safari-605.1.13/Source/WebCore
Revision
224627
Author
matthew_han...@apple.com
Date
2017-11-09 07:22:00 -0800 (Thu, 09 Nov 2017)

Log Message

Cherry-pick r224604. rdar://problem/35421652

Modified Paths

Diff

Modified: tags/Safari-605.1.13/Source/WebCore/ChangeLog (224626 => 224627)


--- tags/Safari-605.1.13/Source/WebCore/ChangeLog	2017-11-09 15:16:22 UTC (rev 224626)
+++ tags/Safari-605.1.13/Source/WebCore/ChangeLog	2017-11-09 15:22:00 UTC (rev 224627)
@@ -1,3 +1,20 @@
+2017-11-09  Jason Marcell  <jmarc...@apple.com>
+
+        Cherry-pick r224604. rdar://problem/35421652
+
+    2017-11-08  Ryosuke Niwa  <rn...@webkit.org>
+
+            REGRESSION(r224534): Crash inside Document::updateStyleIfNeeded
+            https://bugs.webkit.org/show_bug.cgi?id=179442
+
+            Reviewed by Simon Fraser.
+
+            Disable the assertion when the web thread is used.
+
+            * dom/Document.cpp:
+            (WebCore::Document::updateStyleIfNeeded):
+            (WebCore::Document::updateLayout):
+
 2017-11-08  Zalan Bujtas  <za...@apple.com>
 
         [LayoutState cleanup] Make public data members private.

Modified: tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp (224626 => 224627)


--- tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp	2017-11-09 15:16:22 UTC (rev 224626)
+++ tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp	2017-11-09 15:22:00 UTC (rev 224627)
@@ -1939,7 +1939,9 @@
     }
 
     // The early exit for needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks().
+#if !USE(WEB_THREAD)
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::InMainThread::isEventAllowed() || (frameView && frameView->isInChildFrameWithFrameFlattening()));
+#endif
 
     resolveStyle();
     return true;
@@ -1956,9 +1958,10 @@
         ASSERT_NOT_REACHED();
         return;
     }
+#if !USE(WEB_THREAD)
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::InMainThread::isEventAllowed() || (frameView && frameView->isInChildFrameWithFrameFlattening()));
+#endif
 
-
     RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
 
     if (HTMLFrameOwnerElement* owner = ownerElement())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to