Changeset 207419 in webkit

Timestamp:

Oct 17, 2016 11:35:17 AM (8 years ago)

Author:

andersca@apple.com

Message:

CTTE some of the BackForwardList member functions
​https://bugs.webkit.org/show_bug.cgi?id=163555

Reviewed by Dan Bernstein.

• History/BackForwardList.h:

(BackForwardList::entries):

• History/BackForwardList.mm:

(BackForwardList::removeItem):
(BackForwardList::containsItem):
(BackForwardList::entries): Deleted.

• History/WebBackForwardList.mm:

(-[WebBackForwardList removeItem:]):
(-[WebBackForwardList containsItem:]):
(-[WebBackForwardList description]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• History/BackForwardList.h (modified) (1 diff)
• History/BackForwardList.mm (modified) (3 diffs)
• History/WebBackForwardList.mm (modified) (4 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-10-17  Anders Carlsson  <andersca@apple.com>
+
+        CTTE some of the BackForwardList member functions
+        https://bugs.webkit.org/show_bug.cgi?id=163555
+
+        Reviewed by Dan Bernstein.
+
+        * History/BackForwardList.h:
+        (BackForwardList::entries):
+        * History/BackForwardList.mm:
+        (BackForwardList::removeItem):
+        (BackForwardList::containsItem):
+        (BackForwardList::entries): Deleted.
+        * History/WebBackForwardList.mm:
+        (-[WebBackForwardList removeItem:]):
+        (-[WebBackForwardList containsItem:]):
+        (-[WebBackForwardList description]):
+
 2016-10-17  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/mac/History/BackForwardList.h

@@ -62 +62 @@
     int backListCount() override;
     int forwardListCount() override;
-    bool containsItem(WebCore::HistoryItem*);
+    bool containsItem(WebCore::HistoryItem&);
 
     void close() override;
     bool closed();
 
-    void removeItem(WebCore::HistoryItem*);
-    Vector<Ref<WebCore::HistoryItem>>& entries();
+    void removeItem(WebCore::HistoryItem&);
+    const Vector<Ref<WebCore::HistoryItem>>& entries() const { return m_entries; }
 
 #if PLATFORM(IOS)

trunk/Source/WebKit/mac/History/BackForwardList.mm

@@ -212 +212 @@
 }
 
-Vector<Ref<HistoryItem>>& BackForwardList::entries()
-{
-    return m_entries;
-}
-
 #if PLATFORM(IOS)
 unsigned BackForwardList::current()
@@ -244 +239 @@
 }
 
-void BackForwardList::removeItem(HistoryItem* item)
-{
-    if (!item)
-        return;
-    
+void BackForwardList::removeItem(HistoryItem& item)
+{
     for (unsigned i = 0; i < m_entries.size(); ++i) {
-        if (m_entries[i].ptr() == item) {
+        if (m_entries[i].ptr() == &item) {
             m_entries.remove(i);
-            m_entryHash.remove(item);
+            m_entryHash.remove(&item);
             if (m_current == NoCurrentItemIndex || m_current < i)
                 break;
@@ -267 +259 @@
 }
 
-bool BackForwardList::containsItem(HistoryItem* entry)
-{
-    return m_entryHash.contains(entry);
-}
+bool BackForwardList::containsItem(HistoryItem& entry)
+{
+    return m_entryHash.contains(&entry);
+}

trunk/Source/WebKit/mac/History/WebBackForwardList.mm

@@ -146 +146 @@
 - (void)removeItem:(WebHistoryItem *)item
 {
-    core(self)->removeItem(core(item));
+    if (!item)
+        return;
+
+    core(self)->removeItem(*core(item));
 }
 
@@ -200 +203 @@
 - (BOOL)containsItem:(WebHistoryItem *)item
 {
-    return core(self)->containsItem(core(item));
+    if (!item)
+        return NO;
+
+    return core(self)->containsItem(*core(item));
 }
 
@@ -307 +313 @@
     BackForwardList* backForwardList = core(self);
     auto& entries = backForwardList->entries();
-    
-    unsigned size = entries.size();
-    for (unsigned i = 0; i < size; ++i) {
+
+    for (unsigned i = 0; i < entries.size(); ++i) {
         if (entries[i].ptr() == backForwardList->currentItem()) {
             [result appendString:@" >>>"]; 
@@ -317 +322 @@
         [result appendFormat:@"%2d) ", i];
         int currPos = [result length];
-        [result appendString:[kit(entries[i].ptr()) description]];
+        [result appendString:[kit(const_cast<HistoryItem*>(entries[i].ptr())) description]];
 
         // shift all the contents over.  a bit slow, but this is for debugging