Changeset 212501 in webkit

Timestamp:

Feb 16, 2017 4:56:47 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r212174. rdar://problem/29904368

Location:

branches/safari-603-branch/Source/WebCore

Files:

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

branches/safari-603-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-16  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r212174. rdar://problem/29904368
+
+    2017-02-10  Daniel Bates  <dabates@apple.com>
+
+            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-02-16  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-603-branch/Source/WebCore/dom/Document.cpp

@@ -2224 +2224 @@
 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);