Title: [217679] branches/safari-603-branch/Source/WebCore
- Revision
- 217679
- Author
- [email protected]
- Date
- 2017-06-01 12:52:34 -0700 (Thu, 01 Jun 2017)
Log Message
Cherry-pick r212174. rdar://problem/32080671
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (217678 => 217679)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-06-01 19:52:28 UTC (rev 217678)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-06-01 19:52:34 UTC (rev 217679)
@@ -1,5 +1,18 @@
2017-06-01 Matthew Hanson <[email protected]>
+ Cherry-pick r212174. rdar://problem/32080671
+
+ 2017-02-10 Daniel Bates <[email protected]>
+
+ Attempt to fix the build following <https://trac.webkit.org/changeset/212173>
+ (https://bugs.webkit.org/show_bug.cgi?id=166774)
+
+ * dom/Document.cpp:
+ (WebCore::Document::detachFromCachedFrame): Use ASSER_UNUSED() instead of ASSERT() since
+ the parameter cachedFrame is unused in non-debug build.
+
+2017-06-01 Matthew Hanson <[email protected]>
+
Cherry-pick r212173. rdar://problem/32080671
2017-02-10 Daniel Bates <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/dom/Document.cpp (217678 => 217679)
--- branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-06-01 19:52:28 UTC (rev 217678)
+++ branches/safari-603-branch/Source/WebCore/dom/Document.cpp 2017-06-01 19:52:34 UTC (rev 217679)
@@ -2223,8 +2223,8 @@
void Document::detachFromCachedFrame(CachedFrameBase& cachedFrame)
{
+ ASSERT_UNUSED(cachedFrame, cachedFrame.view());
ASSERT_WITH_SECURITY_IMPLICATION(cachedFrame.document() == this);
- ASSERT(cachedFrame.view());
ASSERT(m_frame == &cachedFrame.view()->frame());
ASSERT(m_pageCacheState == Document::InPageCache);
detachFromFrame();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
