Changeset 224627 in webkit

Timestamp:

Nov 9, 2017 7:22:00 AM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

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

Location:

tags/Safari-605.1.13/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

tags/Safari-605.1.13/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-09  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r224604. rdar://problem/35421652
+
+    2017-11-08  Ryosuke Niwa  <rniwa@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  <zalan@apple.com>
 

tags/Safari-605.1.13/Source/WebCore/dom/Document.cpp

@@ -1940 +1940 @@
 
     // 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();
@@ -1957 +1959 @@
         return;
     }
+#if !USE(WEB_THREAD)
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::InMainThread::isEventAllowed() || (frameView && frameView->isInChildFrameWithFrameFlattening()));
-
+#endif
 
     RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());