<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207482] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207482">207482</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 13:22:58 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemcpp">trunk/Source/WebCore/history/HistoryItem.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemh">trunk/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryHistoryPropertyListmm">trunk/Source/WebKit/mac/History/HistoryPropertyList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistorymm">trunk/Source/WebKit/mac/History/WebHistory.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemInternalh">trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistorycpp">trunk/Source/WebKit/win/WebHistory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebHistoryItemcpp">trunk/Source/WebKit/win/WebHistoryItem.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2016-10-18 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Get all the properties turned on
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -479,27 +479,6 @@
</span><span class="cx"> return equalIgnoringFragmentIdentifier(url(), document.url());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void HistoryItem::notifyChanged()
</span><span class="cx"> {
</span><span class="cx"> notifyHistoryItemChanged(this);
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebCore/history/HistoryItem.h 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -148,10 +148,6 @@
</span><span class="cx"> bool shouldDoSameDocumentNavigationTo(HistoryItem& otherItem) const;
</span><span class="cx"> bool hasSameFrames(HistoryItem& otherItem) const;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void addRedirectURL(const String&);
- WEBCORE_EXPORT Vector<String>* redirectURLs() const;
- WEBCORE_EXPORT void setRedirectURLs(std::unique_ptr<Vector<String>>);
-
</del><span class="cx"> bool isCurrentDocument(Document&) const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-10-18 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Resolve constraints and enumerate devices in the UI process
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryHistoryPropertyListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/HistoryPropertyList.mm (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/HistoryPropertyList.mm 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/History/HistoryPropertyList.mm 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> const String& title = item->title();
</span><span class="cx"> const String& displayTitle = item->alternateTitle();
</span><span class="cx"> double lastVisitedDate = webHistoryItem->_private->_lastVisitedTime;
</span><del>- Vector<String>* redirectURLs = item->redirectURLs();
</del><ins>+ Vector<String>* redirectURLs = webHistoryItem->_private->_redirectURLs.get();
</ins><span class="cx">
</span><span class="cx"> // keys
</span><span class="cx"> stream.writeString(m_urlKey);
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistorymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.mm (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.mm 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/History/WebHistory.mm 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> HistoryItem* item = core(entry);
</span><span class="cx"> item->setLastVisitWasFailure(wasFailure);
</span><span class="cx">
</span><del>- item->setRedirectURLs(nullptr);
</del><ins>+ entry->_private->_redirectURLs = nullptr;
</ins><span class="cx">
</span><span class="cx"> NSArray *entries = [[NSArray alloc] initWithObjects:entry, nil];
</span><span class="cx"> [self _sendNotification:WebHistoryItemsAddedNotification entries:entries];
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> redirectURLsVector->uncheckedAppend((NSString *)redirectURL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- core(_private)->setRedirectURLs(WTFMove(redirectURLsVector));
</del><ins>+ _private->_redirectURLs = WTFMove(redirectURLsVector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSArray *childDicts = [dict objectForKey:childrenKey];
</span><span class="lines">@@ -441,12 +441,12 @@
</span><span class="cx"> }
</span><span class="cx"> if (coreItem->lastVisitWasFailure())
</span><span class="cx"> [dict setObject:[NSNumber numberWithBool:YES] forKey:lastVisitWasFailureKey];
</span><del>- if (Vector<String>* redirectURLs = coreItem->redirectURLs()) {
</del><ins>+ if (Vector<String>* redirectURLs = _private->_redirectURLs.get()) {
</ins><span class="cx"> size_t size = redirectURLs->size();
</span><span class="cx"> ASSERT(size);
</span><span class="cx"> NSMutableArray *result = [[NSMutableArray alloc] initWithCapacity:size];
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- [result addObject:(NSString*)redirectURLs->at(i)];
</del><ins>+ [result addObject:(NSString *)redirectURLs->at(i)];
</ins><span class="cx"> [dict setObject:result forKey:redirectURLsKey];
</span><span class="cx"> [result release];
</span><span class="cx"> }
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)_redirectURLs
</span><span class="cx"> {
</span><del>- Vector<String>* redirectURLs = core(_private)->redirectURLs();
</del><ins>+ Vector<String>* redirectURLs = _private->_redirectURLs.get();
</ins><span class="cx"> if (!redirectURLs)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #import "WebBackForwardList.h"
</span><span class="cx"> #import "WebHistoryItemPrivate.h"
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><ins>+#import <wtf/Vector.h>
+#import <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class HistoryItem;
</span><span class="lines">@@ -61,5 +63,6 @@
</span><span class="cx"> RefPtr<WebCore::HistoryItem> _historyItem;
</span><span class="cx">
</span><span class="cx"> NSTimeInterval _lastVisitedTime;
</span><ins>+ std::unique_ptr<Vector<String>> _redirectURLs;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -1040,6 +1040,17 @@
</span><span class="cx"> [[WebHistory optionalSharedHistory] _visitedURL:loader->urlForHistory() withTitle:loader->title().string() method:loader->originalRequestCopy().httpMethod() wasFailure:loader->urlForHistoryReflectsFailure()];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks()
</span><span class="cx"> {
</span><span class="cx"> WebView* view = getWebView(m_webFrame.get());
</span><span class="lines">@@ -1055,7 +1066,7 @@
</span><span class="cx"> m_webFrame->_private->url.get(), loader->clientRedirectDestinationForHistory(), m_webFrame.get());
</span><span class="cx"> }
</span><span class="cx"> } else if (WebHistoryItem *item = [[WebHistory optionalSharedHistory] _itemForURLString:loader->clientRedirectSourceForHistory()])
</span><del>- core(item)->addRedirectURL(loader->clientRedirectDestinationForHistory());
</del><ins>+ addRedirectURL(item, loader->clientRedirectDestinationForHistory());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!loader->serverRedirectSourceForHistory().isNull()) {
</span><span class="lines">@@ -1065,7 +1076,7 @@
</span><span class="cx"> loader->serverRedirectSourceForHistory(), loader->serverRedirectDestinationForHistory(), m_webFrame.get());
</span><span class="cx"> }
</span><span class="cx"> } else if (WebHistoryItem *item = [[WebHistory optionalSharedHistory] _itemForURLString:loader->serverRedirectSourceForHistory()])
</span><del>- core(item)->addRedirectURL(loader->serverRedirectDestinationForHistory());
</del><ins>+ addRedirectURL(item, loader->serverRedirectDestinationForHistory());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/win/ChangeLog 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-10-16 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Move CSS classes from ExceptionCode to Exception
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -740,13 +740,6 @@
</span><span class="cx"> BString sourceURL(loader->clientRedirectSourceForHistory());
</span><span class="cx"> BString destURL(loader->clientRedirectDestinationForHistory());
</span><span class="cx"> historyDelegate->didPerformClientRedirectFromURL(webView, sourceURL, destURL, m_webFrame);
</span><del>- } else {
- if (history) {
- if (COMPtr<IWebHistoryItem> iWebHistoryItem = history->itemForURLString(loader->clientRedirectSourceForHistory())) {
- COMPtr<WebHistoryItem> webHistoryItem(Query, iWebHistoryItem);
- webHistoryItem->historyItem()->addRedirectURL(loader->clientRedirectDestinationForHistory());
- }
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -755,13 +748,6 @@
</span><span class="cx"> BString sourceURL(loader->serverRedirectSourceForHistory());
</span><span class="cx"> BString destURL(loader->serverRedirectDestinationForHistory());
</span><span class="cx"> historyDelegate->didPerformServerRedirectFromURL(webView, sourceURL, destURL, m_webFrame);
</span><del>- } else {
- if (history) {
- if (COMPtr<IWebHistoryItem> iWebHistoryItem = history->itemForURLString(loader->serverRedirectSourceForHistory())) {
- COMPtr<WebHistoryItem> webHistoryItem(Query, iWebHistoryItem);
- webHistoryItem->historyItem()->addRedirectURL(loader->serverRedirectDestinationForHistory());
- }
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistory.cpp (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistory.cpp 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -522,7 +522,6 @@
</span><span class="cx"> entryPrivate->setLastVisitWasFailure(wasFailure);
</span><span class="cx">
</span><span class="cx"> COMPtr<WebHistoryItem> item(Query, entry);
</span><del>- item->historyItem()->setRedirectURLs(nullptr);
</del><span class="cx">
</span><span class="cx"> COMPtr<IPropertyBag> userInfo = createUserInfoFromHistoryItem(
</span><span class="cx"> getNotificationString(kWebHistoryItemsAddedNotification), entry);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (207481 => 207482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2016-10-18 20:21:02 UTC (rev 207481)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2016-10-18 20:22:58 UTC (rev 207482)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> if (lastVisitWasFailure)
</span><span class="cx"> m_historyItem->setLastVisitWasFailure(true);
</span><span class="cx">
</span><del>- if (redirectURLsVector.get())
- m_historyItem->setRedirectURLs(WTFMove(redirectURLsVector));
-
</del><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -156,22 +153,6 @@
</span><span class="cx"> ++keyCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
- }
-
</del><span class="cx"> *dictionaryRef = CFDictionaryCreate(0, keys, values, keyCount, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < keyCount; ++i)
</span></span></pre>
</div>
</div>
</body>
</html>