Title: [228705] branches/safari-605-branch/Source/WebCore
- Revision
- 228705
- Author
- [email protected]
- Date
- 2018-02-19 12:16:54 -0800 (Mon, 19 Feb 2018)
Log Message
Apply patch. rdar://problem/37590759
Disable release assertions in updateStyleIfNeeded and updateLayout
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228704 => 228705)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-19 19:55:04 UTC (rev 228704)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-19 20:16:54 UTC (rev 228705)
@@ -1,3 +1,25 @@
+2018-02-19 Jason Marcell <[email protected]>
+
+ Apply patch. rdar://problem/37590759
+
+ Disable release assertions in updateStyleIfNeeded and updateLayout
+
+ 2018-02-19 Ryosuke Niwa <[email protected]>
+
+ Disable release assertions in updateStyleIfNeeded and updateLayout
+ https://bugs.webkit.org/show_bug.cgi?id=182854
+ <rdar://problem/37590759>
+
+ Reviewed by Simon Fraser.
+
+ No new tests. Replacing release assertions with debug assertions.
+
+ * dom/Document.cpp:
+ (WebCore::Document::updateStyleIfNeeded):
+ (WebCore::Document::updateLayout):
+ * page/LayoutContext.cpp:
+ (WebCore::LayoutContext::layout):
+
2018-02-16 Jason Marcell <[email protected]>
Cherry-pick r228545. rdar://problem/37615437
Modified: branches/safari-605-branch/Source/WebCore/dom/Document.cpp (228704 => 228705)
--- branches/safari-605-branch/Source/WebCore/dom/Document.cpp 2018-02-19 19:55:04 UTC (rev 228704)
+++ branches/safari-605-branch/Source/WebCore/dom/Document.cpp 2018-02-19 20:16:54 UTC (rev 228705)
@@ -1939,6 +1939,7 @@
return false;
}
+#if !ASSERT_DISABLED
static bool isSafeToUpdateStyleOrLayout(const Document& document)
{
bool isSafeToExecuteScript = ScriptDisallowedScope::InMainThread::isScriptAllowed();
@@ -1947,6 +1948,7 @@
bool isAssertionDisabled = ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable();
return isSafeToExecuteScript || isInFrameFlattening || !isInWebProcess() || isAssertionDisabled;
}
+#endif
bool Document::updateStyleIfNeeded()
{
@@ -1966,7 +1968,7 @@
}
// The early exit above for !needsStyleRecalc() is needed when updateWidgetPositions() is called in runOrScheduleAsynchronousTasks().
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
+ ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
resolveStyle();
return true;
@@ -1982,7 +1984,7 @@
ASSERT_NOT_REACHED();
return;
}
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
+ ASSERT_WITH_SECURITY_IMPLICATION(isSafeToUpdateStyleOrLayout(*this));
RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
Modified: branches/safari-605-branch/Source/WebCore/page/LayoutContext.cpp (228704 => 228705)
--- branches/safari-605-branch/Source/WebCore/page/LayoutContext.cpp 2018-02-19 19:55:04 UTC (rev 228704)
+++ branches/safari-605-branch/Source/WebCore/page/LayoutContext.cpp 2018-02-19 20:16:54 UTC (rev 228705)
@@ -122,7 +122,7 @@
{
LOG_WITH_STREAM(Layout, stream << "FrameView " << &view() << " LayoutContext::layout() with size " << view().layoutSize());
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(!frame().document()->inRenderTreeUpdate() || ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable());
+ ASSERT_WITH_SECURITY_IMPLICATION(!frame().document()->inRenderTreeUpdate() || ScriptDisallowedScope::LayoutAssertionDisableScope::shouldDisable());
ASSERT(LayoutDisallowedScope::isLayoutAllowed());
ASSERT(!view().isPainting());
ASSERT(frame().view() == &view());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
