Changeset 207482 in webkit

Timestamp:

Oct 18, 2016 1:22:58 PM (8 years ago)

Author:

andersca@apple.com

Message:

Move some history specific HistoryItem code to WebHistoryItem
​https://bugs.webkit.org/show_bug.cgi?id=163567

Reviewed by Tim Horton.

Source/WebCore:

• history/HistoryItem.cpp:

(WebCore::HistoryItem::addRedirectURL): Deleted.
(WebCore::HistoryItem::redirectURLs): Deleted.
(WebCore::HistoryItem::setRedirectURLs): Deleted.

• history/HistoryItem.h:

Source/WebKit/mac:

• History/HistoryPropertyList.mm:

(HistoryPropertyListWriter::writeHistoryItem):

• History/WebHistory.mm:

(-[WebHistory _visitedURL:withTitle:method:wasFailure:]):

• History/WebHistoryItem.mm:

(-[WebHistoryItem initFromDictionaryRepresentation:]):

• History/WebHistoryItemInternal.h:
• WebCoreSupport/WebFrameLoaderClient.mm:

(addRedirectURL):
(WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):

Source/WebKit/win:

Remove these, they aren't used.

• WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):

• WebHistory.cpp:

(WebHistory::visitedURL):

• WebHistoryItem.cpp:

(WebHistoryItem::initFromDictionaryRepresentation):
(WebHistoryItem::dictionaryRepresentation):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/history/HistoryItem.cpp (modified) (1 diff)
• WebCore/history/HistoryItem.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/History/HistoryPropertyList.mm (modified) (1 diff)
• WebKit/mac/History/WebHistory.mm (modified) (1 diff)
• WebKit/mac/History/WebHistoryItem.mm (modified) (3 diffs)
• WebKit/mac/History/WebHistoryItemInternal.h (modified) (2 diffs)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (3 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)
• WebKit/win/WebHistory.cpp (modified) (1 diff)
• WebKit/win/WebHistoryItem.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-17  Anders Carlsson  <andersca@apple.com>
+
+        Move some history specific HistoryItem code to WebHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=163567
+
+        Reviewed by Tim Horton.
+
+        * history/HistoryItem.cpp:
+        (WebCore::HistoryItem::addRedirectURL): Deleted.
+        (WebCore::HistoryItem::redirectURLs): Deleted.
+        (WebCore::HistoryItem::setRedirectURLs): Deleted.
+        * history/HistoryItem.h:
+
 2016-10-18  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -480 +480 @@
 }
 
-void HistoryItem::addRedirectURL(const String& url)
-{
-    if (!m_redirectURLs)
-        m_redirectURLs = std::make_unique<Vector<String>>();
-
-    // Our API allows us to store all the URLs in the redirect chain, but for
-    // now we only have a use for the final URL.
-    (*m_redirectURLs).resize(1);
-    (*m_redirectURLs)[0] = url;
-}
-
-Vector<String>* HistoryItem::redirectURLs() const
-{
-    return m_redirectURLs.get();
-}
-
-void HistoryItem::setRedirectURLs(std::unique_ptr<Vector<String>> redirectURLs)
-{
-    m_redirectURLs = WTFMove(redirectURLs);
-}
-
 void HistoryItem::notifyChanged()
 {

trunk/Source/WebCore/history/HistoryItem.h

@@ -149 +149 @@
     bool hasSameFrames(HistoryItem& otherItem) const;
 
-    WEBCORE_EXPORT void addRedirectURL(const String&);
-    WEBCORE_EXPORT Vector<String>* redirectURLs() const;
-    WEBCORE_EXPORT void setRedirectURLs(std::unique_ptr<Vector<String>>);
-
     bool isCurrentDocument(Document&) const;
     

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-10-17  Anders Carlsson  <andersca@apple.com>
+
+        Move some history specific HistoryItem code to WebHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=163567
+
+        Reviewed by Tim Horton.
+
+        * History/HistoryPropertyList.mm:
+        (HistoryPropertyListWriter::writeHistoryItem):
+        * History/WebHistory.mm:
+        (-[WebHistory _visitedURL:withTitle:method:wasFailure:]):
+        * History/WebHistoryItem.mm:
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+        * History/WebHistoryItemInternal.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (addRedirectURL):
+        (WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
+
 2016-10-18  Eric Carlson  <eric.carlson@apple.com>
 

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

@@ -91 +91 @@
     const String& displayTitle = item->alternateTitle();
     double lastVisitedDate = webHistoryItem->_private->_lastVisitedTime;
-    Vector<String>* redirectURLs = item->redirectURLs();
+    Vector<String>* redirectURLs = webHistoryItem->_private->_redirectURLs.get();
 
     // keys

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

@@ -898 +898 @@
     item->setLastVisitWasFailure(wasFailure);
 
-    item->setRedirectURLs(nullptr);
+    entry->_private->_redirectURLs = nullptr;
 
     NSArray *entries = [[NSArray alloc] initWithObjects:entry, nil];

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

@@ -355 +355 @@
         }
 
-        core(_private)->setRedirectURLs(WTFMove(redirectURLsVector));
+        _private->_redirectURLs = WTFMove(redirectURLsVector);
     }
 
@@ -442 +442 @@
     if (coreItem->lastVisitWasFailure())
         [dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasFailureKey];
-    if (Vector<String>* redirectURLs = coreItem->redirectURLs()) {
+    if (Vector<String>* redirectURLs = _private->_redirectURLs.get()) {
         size_t size = redirectURLs->size();
         ASSERT(size);
         NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:size];
         for (size_t i = 0; i < size; ++i)
-            [result addObject:(NSString*)redirectURLs->at(i)];
+            [result addObject:(NSString *)redirectURLs->at(i)];
         [dict setObject:result forKey:redirectURLsKey];
         [result release];
@@ -555 +555 @@
 - (NSArray *)_redirectURLs
 {
-    Vector<String>* redirectURLs = core(_private)->redirectURLs();
+    Vector<String>* redirectURLs = _private->_redirectURLs.get();
     if (!redirectURLs)
         return nil;

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

@@ -30 +30 @@
 #import "WebHistoryItemPrivate.h"
 #import <wtf/RefPtr.h>
+#import <wtf/Vector.h>
+#import <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -62 +64 @@
 
     NSTimeInterval _lastVisitedTime;
+    std::unique_ptr<Vector<String>> _redirectURLs;
 }
 @end

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1041 +1041 @@
 }
 
+static void addRedirectURL(WebHistoryItem *item, const String& url)
+{
+    if (!item->_private->_redirectURLs)
+        item->_private->_redirectURLs = std::make_unique<Vector<String>>();
+
+    // Our API allows us to store all the URLs in the redirect chain, but for
+    // now we only have a use for the final URL.
+    item->_private->_redirectURLs->resize(1);
+    item->_private->_redirectURLs->at(0) = url;
+}
+
 void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks()
 {
@@ -1056 +1067 @@
             }
         } else if (WebHistoryItem *item = [[WebHistory optionalSharedHistory] _itemForURLString:loader->clientRedirectSourceForHistory()])
-            core(item)->addRedirectURL(loader->clientRedirectDestinationForHistory());
+            addRedirectURL(item, loader->clientRedirectDestinationForHistory());
     }
 
@@ -1066 +1077 @@
             }
         } else if (WebHistoryItem *item = [[WebHistory optionalSharedHistory] _itemForURLString:loader->serverRedirectSourceForHistory()])
-            core(item)->addRedirectURL(loader->serverRedirectDestinationForHistory());
+            addRedirectURL(item, loader->serverRedirectDestinationForHistory());
     }
 }

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2016-10-18  Anders Carlsson  <andersca@apple.com>
+
+        Move some history specific HistoryItem code to WebHistoryItem
+        https://bugs.webkit.org/show_bug.cgi?id=163567
+
+        Reviewed by Tim Horton.
+
+        Remove these, they aren't used.
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::updateGlobalHistoryRedirectLinks):
+        * WebHistory.cpp:
+        (WebHistory::visitedURL):
+        * WebHistoryItem.cpp:
+        (WebHistoryItem::initFromDictionaryRepresentation):
+        (WebHistoryItem::dictionaryRepresentation):
+
 2016-10-16  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -741 +741 @@
             BString destURL(loader->clientRedirectDestinationForHistory());
             historyDelegate->didPerformClientRedirectFromURL(webView, sourceURL, destURL, m_webFrame);
-        } else {
-            if (history) {
-                if (COMPtr<IWebHistoryItem> iWebHistoryItem = history->itemForURLString(loader->clientRedirectSourceForHistory())) {
-                    COMPtr<WebHistoryItem> webHistoryItem(Query, iWebHistoryItem);
-                    webHistoryItem->historyItem()->addRedirectURL(loader->clientRedirectDestinationForHistory());
-                }
-            }
         }
     }
@@ -756 +749 @@
             BString destURL(loader->serverRedirectDestinationForHistory());
             historyDelegate->didPerformServerRedirectFromURL(webView, sourceURL, destURL, m_webFrame);
-        } else {
-            if (history) {
-                if (COMPtr<IWebHistoryItem> iWebHistoryItem = history->itemForURLString(loader->serverRedirectSourceForHistory())) {
-                    COMPtr<WebHistoryItem> webHistoryItem(Query, iWebHistoryItem);
-                    webHistoryItem->historyItem()->addRedirectURL(loader->serverRedirectDestinationForHistory());
-                }
-            }
         }
     }

trunk/Source/WebKit/win/WebHistory.cpp

@@ -523 +523 @@
 
     COMPtr<WebHistoryItem> item(Query, entry);
-    item->historyItem()->setRedirectURLs(nullptr);
 
     COMPtr<IPropertyBag> userInfo = createUserInfoFromHistoryItem(

trunk/Source/WebKit/win/WebHistoryItem.cpp

@@ -125 +125 @@
         m_historyItem->setLastVisitWasFailure(true);
 
-    if (redirectURLsVector.get())
-        m_historyItem->setRedirectURLs(WTFMove(redirectURLsVector));
-
     return S_OK;
 }
@@ -154 +151 @@
         keys[keyCount] = lastVisitWasFailureKey;
         values[keyCount] = CFRetain(kCFBooleanTrue);
-        ++keyCount;
-    }
-
-    if (Vector<String>* redirectURLs = m_historyItem->redirectURLs()) {
-        size_t size = redirectURLs->size();
-        ASSERT(size);
-        CFStringRef* items = new CFStringRef[size];
-        for (size_t i = 0; i < size; ++i)
-            items[i] = redirectURLs->at(i).createCFString().leakRef();
-        CFArrayRef result = CFArrayCreate(0, (const void**)items, size, &kCFTypeArrayCallBacks);
-        for (size_t i = 0; i < size; ++i)
-            CFRelease(items[i]);
-        delete[] items;
-
-        keys[keyCount] = redirectURLsKey;
-        values[keyCount] = result;
         ++keyCount;
     }