Changeset 223861 in webkit

Timestamp:

Oct 23, 2017 4:23:05 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix ASAN test after r222824
​https://bugs.webkit.org/show_bug.cgi?id=178688
<rdar://problem/35104706>

Reviewed by Tim Horton.

• UIProcess/WebBackForwardList.cpp:

(WebKit::WebBackForwardList::clear):
Resizing a list of Ref<T> after we've WTFMoved all the elements doesn't make ASAN happy.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebBackForwardList.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-10-23  Alex Christensen  <achristensen@webkit.org>
+
+        Fix ASAN test after r222824
+        https://bugs.webkit.org/show_bug.cgi?id=178688
+        <rdar://problem/35104706>
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/WebBackForwardList.cpp:
+        (WebKit::WebBackForwardList::clear):
+        Resizing a list of Ref<T> after we've WTFMoved all the elements doesn't make ASAN happy.
+
 2017-10-23  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/WebBackForwardList.cpp

@@ -375 +375 @@
     m_currentIndex = 0;
 
-    if (currentItem) {
-        m_entries.shrink(1);
-        m_entries[0] = currentItem.releaseNonNull();
-    } else {
-        m_entries.clear();
+    m_entries.clear();
+    if (currentItem)
+        m_entries.append(currentItem.releaseNonNull());
+    else
         m_hasCurrentIndex = false;
-    }
-
     m_page->didChangeBackForwardList(nullptr, WTFMove(removedItems));
 }