<!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>[207300] 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/207300">207300</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-13 12:15:23 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of the HistoryItemVector typedef
https://bugs.webkit.org/show_bug.cgi?id=163398
Reviewed by Beth Dakin.
Expand the HistoryitemVector typedef instead to make it more clear what types we are dealing with.
Source/WebCore:
* history/BackForwardList.cpp:
(WebCore::BackForwardList::backListWithLimit):
(WebCore::BackForwardList::forwardListWithLimit):
(WebCore::BackForwardList::entries):
* history/BackForwardList.h:
* history/HistoryItem.cpp:
(WebCore::HistoryItem::children):
* history/HistoryItem.h:
* loader/HistoryController.cpp:
(WebCore::HistoryController::currentFramesMatchItem):
Source/WebKit/mac:
* History/WebBackForwardList.mm:
(-[WebBackForwardList dictionaryRepresentation]):
(vectorToNSArray):
(-[WebBackForwardList backListWithLimit:]):
(-[WebBackForwardList forwardListWithLimit:]):
(-[WebBackForwardList description]):
* History/WebHistoryItem.mm:
(-[WebHistoryItem description]):
Source/WebKit/win:
* WebBackForwardList.cpp:
(WebBackForwardList::backListWithLimit):
(WebBackForwardList::forwardListWithLimit):
* WebHistoryItem.cpp:
(WebHistoryItem::children):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryBackForwardListcpp">trunk/Source/WebCore/history/BackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryBackForwardListh">trunk/Source/WebCore/history/BackForwardList.h</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="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebBackForwardListcpp">trunk/Source/WebKit/win/WebBackForwardList.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 (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/ChangeLog 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-13 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the HistoryItemVector typedef
+ https://bugs.webkit.org/show_bug.cgi?id=163398
+
+ Reviewed by Beth Dakin.
+
+ Expand the HistoryitemVector typedef instead to make it more clear what types we are dealing with.
+
+ * history/BackForwardList.cpp:
+ (WebCore::BackForwardList::backListWithLimit):
+ (WebCore::BackForwardList::forwardListWithLimit):
+ (WebCore::BackForwardList::entries):
+ * history/BackForwardList.h:
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::children):
+ * history/HistoryItem.h:
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::currentFramesMatchItem):
+
</ins><span class="cx"> 2016-10-13 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] MediaControls base class
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardList.cpp (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardList.cpp 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/history/BackForwardList.cpp 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BackForwardList::backListWithLimit(int limit, HistoryItemVector& list)
</del><ins>+void BackForwardList::backListWithLimit(int limit, Vector<Ref<HistoryItem>>& list)
</ins><span class="cx"> {
</span><span class="cx"> list.clear();
</span><span class="cx"> if (m_current != NoCurrentItemIndex) {
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BackForwardList::forwardListWithLimit(int limit, HistoryItemVector& list)
</del><ins>+void BackForwardList::forwardListWithLimit(int limit, Vector<Ref<HistoryItem>>& list)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(limit > -1);
</span><span class="cx"> list.clear();
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> return m_entries[index + m_current].ptr();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HistoryItemVector& BackForwardList::entries()
</del><ins>+Vector<Ref<HistoryItem>>& BackForwardList::entries()
</ins><span class="cx"> {
</span><span class="cx"> return m_entries;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/BackForwardList.h (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/BackForwardList.h 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/history/BackForwardList.h 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx">
</span><span class="cx"> class Page;
</span><span class="cx">
</span><del>-typedef Vector<Ref<HistoryItem>> HistoryItemVector;
</del><span class="cx"> typedef HashSet<RefPtr<HistoryItem>> HistoryItemHashSet;
</span><span class="cx">
</span><span class="cx"> class BackForwardList : public BackForwardClient {
</span><span class="lines">@@ -56,8 +55,8 @@
</span><span class="cx"> WEBCORE_EXPORT HistoryItem* forwardItem();
</span><span class="cx"> HistoryItem* itemAtIndex(int) override;
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void backListWithLimit(int, HistoryItemVector&);
- WEBCORE_EXPORT void forwardListWithLimit(int, HistoryItemVector&);
</del><ins>+ WEBCORE_EXPORT void backListWithLimit(int, Vector<Ref<HistoryItem>>&);
+ WEBCORE_EXPORT void forwardListWithLimit(int, Vector<Ref<HistoryItem>>&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT int capacity();
</span><span class="cx"> WEBCORE_EXPORT void setCapacity(int);
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx"> WEBCORE_EXPORT bool closed();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void removeItem(HistoryItem*);
</span><del>- WEBCORE_EXPORT HistoryItemVector& entries();
</del><ins>+ WEBCORE_EXPORT Vector<Ref<HistoryItem>>& entries();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unsigned current() override;
</span><span class="lines">@@ -84,7 +83,7 @@
</span><span class="cx"> WEBCORE_EXPORT explicit BackForwardList(Page*);
</span><span class="cx">
</span><span class="cx"> Page* m_page;
</span><del>- HistoryItemVector m_entries;
</del><ins>+ Vector<Ref<HistoryItem>> m_entries;
</ins><span class="cx"> HistoryItemHashSet m_entryHash;
</span><span class="cx"> unsigned m_current;
</span><span class="cx"> unsigned m_capacity;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const HistoryItemVector& HistoryItem::children() const
</del><ins>+const Vector<Ref<HistoryItem>>& HistoryItem::children() const
</ins><span class="cx"> {
</span><span class="cx"> return m_children;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/history/HistoryItem.h 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -56,8 +56,6 @@
</span><span class="cx"> class URL;
</span><span class="cx"> enum class PruningReason;
</span><span class="cx">
</span><del>-typedef Vector<Ref<HistoryItem>> HistoryItemVector;
-
</del><span class="cx"> WEBCORE_EXPORT extern void (*notifyHistoryItemChanged)(HistoryItem*);
</span><span class="cx">
</span><span class="cx"> class HistoryItem : public RefCounted<HistoryItem> {
</span><span class="lines">@@ -143,7 +141,7 @@
</span><span class="cx"> void setChildItem(Ref<HistoryItem>&&);
</span><span class="cx"> WEBCORE_EXPORT HistoryItem* childItemWithTarget(const String&);
</span><span class="cx"> HistoryItem* childItemWithDocumentSequenceNumber(long long number);
</span><del>- WEBCORE_EXPORT const HistoryItemVector& children() const;
</del><ins>+ WEBCORE_EXPORT const Vector<Ref<HistoryItem>>& children() const;
</ins><span class="cx"> WEBCORE_EXPORT bool hasChildren() const;
</span><span class="cx"> void clearChildren();
</span><span class="cx"> bool isAncestorOf(const HistoryItem&) const;
</span><span class="lines">@@ -233,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> ShouldOpenExternalURLsPolicy m_shouldOpenExternalURLsPolicy { ShouldOpenExternalURLsPolicy::ShouldNotAllow };
</span><span class="cx">
</span><del>- HistoryItemVector m_children;
</del><ins>+ Vector<Ref<HistoryItem>> m_children;
</ins><span class="cx">
</span><span class="cx"> bool m_lastVisitWasFailure;
</span><span class="cx"> bool m_isTargetItem;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -786,7 +786,7 @@
</span><span class="cx"> if ((!m_frame.tree().uniqueName().isEmpty() || !item->target().isEmpty()) && m_frame.tree().uniqueName() != item->target())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- const HistoryItemVector& childItems = item->children();
</del><ins>+ const auto& childItems = item->children();
</ins><span class="cx"> if (childItems.size() != m_frame.tree().childCount())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-13 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the HistoryItemVector typedef
+ https://bugs.webkit.org/show_bug.cgi?id=163398
+
+ Reviewed by Beth Dakin.
+
+ Expand the HistoryitemVector typedef instead to make it more clear what types we are dealing with.
+
+ * History/WebBackForwardList.mm:
+ (-[WebBackForwardList dictionaryRepresentation]):
+ (vectorToNSArray):
+ (-[WebBackForwardList backListWithLimit:]):
+ (-[WebBackForwardList forwardListWithLimit:]):
+ (-[WebBackForwardList description]):
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem description]):
+
</ins><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Drop support for legacy [ConstructorConditional=*]
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> {
</span><span class="cx"> BackForwardList *coreBFList = core(self);
</span><span class="cx">
</span><del>- HistoryItemVector& historyItems = coreBFList->entries();
</del><ins>+ auto& historyItems = coreBFList->entries();
</ins><span class="cx"> unsigned size = historyItems.size();
</span><span class="cx"> NSMutableArray *entriesArray = [[NSMutableArray alloc] initWithCapacity:size];
</span><span class="cx"> for (unsigned i = 0; i < size; ++i)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> return [[kit(core(self)->forwardItem()) retain] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSArray* vectorToNSArray(HistoryItemVector& list)
</del><ins>+static NSArray* vectorToNSArray(Vector<Ref<HistoryItem>>& list)
</ins><span class="cx"> {
</span><span class="cx"> unsigned size = list.size();
</span><span class="cx"> NSMutableArray *result = [[[NSMutableArray alloc] initWithCapacity:size] autorelease];
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)backListWithLimit:(int)limit
</span><span class="cx"> {
</span><del>- HistoryItemVector list;
</del><ins>+ Vector<Ref<HistoryItem>> list;
</ins><span class="cx"> core(self)->backListWithLimit(limit, list);
</span><span class="cx"> NSArray *result = vectorToNSArray(list);
</span><span class="cx">
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)forwardListWithLimit:(int)limit
</span><span class="cx"> {
</span><del>- HistoryItemVector list;
</del><ins>+ Vector<Ref<HistoryItem>> list;
</ins><span class="cx"> core(self)->forwardListWithLimit(limit, list);
</span><span class="cx"> NSArray *result = vectorToNSArray(list);
</span><span class="cx">
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> [result appendString:@"WebBackForwardList:\n"];
</span><span class="cx">
</span><span class="cx"> BackForwardList* backForwardList = core(self);
</span><del>- HistoryItemVector& entries = backForwardList->entries();
</del><ins>+ auto& entries = backForwardList->entries();
</ins><span class="cx">
</span><span class="cx"> unsigned size = entries.size();
</span><span class="cx"> for (unsigned i = 0; i < size; ++i) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (coreItem->children().size()) {
</span><del>- const HistoryItemVector& children = coreItem->children();
</del><ins>+ const auto& children = coreItem->children();
</ins><span class="cx"> int currPos = [result length];
</span><span class="cx"> unsigned size = children.size();
</span><span class="cx"> for (unsigned i = 0; i < size; ++i) {
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> #else
</span><span class="cx"> if (coreItem->children().size()) {
</span><span class="cx"> #endif
</span><del>- const HistoryItemVector& children = coreItem->children();
</del><ins>+ const auto& children = coreItem->children();
</ins><span class="cx"> NSMutableArray *childDicts = [NSMutableArray arrayWithCapacity:children.size()];
</span><span class="cx">
</span><span class="cx"> for (int i = children.size() - 1; i >= 0; i--)
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)children
</span><span class="cx"> {
</span><del>- const HistoryItemVector& children = core(_private)->children();
</del><ins>+ const auto& children = core(_private)->children();
</ins><span class="cx"> if (!children.size())
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/win/ChangeLog 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-13 Anders Carlsson <andersca@apple.com>
+
+ Get rid of the HistoryItemVector typedef
+ https://bugs.webkit.org/show_bug.cgi?id=163398
+
+ Reviewed by Beth Dakin.
+
+ Expand the HistoryitemVector typedef instead to make it more clear what types we are dealing with.
+
+ * WebBackForwardList.cpp:
+ (WebBackForwardList::backListWithLimit):
+ (WebBackForwardList::forwardListWithLimit):
+ * WebHistoryItem.cpp:
+ (WebHistoryItem::children):
+
</ins><span class="cx"> 2016-10-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r207218.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebBackForwardList.cpp (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebBackForwardList.cpp 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/win/WebBackForwardList.cpp 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> HRESULT WebBackForwardList::backListWithLimit(int limit, _Out_ int* listCount,
</span><span class="cx"> __deref_inout_opt IWebHistoryItem** list)
</span><span class="cx"> {
</span><del>- HistoryItemVector historyItemVector;
</del><ins>+ Vector<Ref<HistoryItem>> historyItemVector;
</ins><span class="cx"> m_backForwardList->backListWithLimit(limit, historyItemVector);
</span><span class="cx">
</span><span class="cx"> *listCount = static_cast<int>(historyItemVector.size());
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> HRESULT WebBackForwardList::forwardListWithLimit(int limit, _Out_ int* listCount,
</span><span class="cx"> __deref_inout_opt IWebHistoryItem** list)
</span><span class="cx"> {
</span><del>- HistoryItemVector historyItemVector;
</del><ins>+ Vector<Ref<HistoryItem>> historyItemVector;
</ins><span class="cx"> m_backForwardList->forwardListWithLimit(limit, historyItemVector);
</span><span class="cx">
</span><span class="cx"> *listCount = static_cast<int>(historyItemVector.size());
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebHistoryItem.cpp (207299 => 207300)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebHistoryItem.cpp 2016-10-13 19:02:29 UTC (rev 207299)
+++ trunk/Source/WebKit/win/WebHistoryItem.cpp 2016-10-13 19:15:23 UTC (rev 207300)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> *outChildCount = 0;
</span><span class="cx"> *outChildren = 0;
</span><span class="cx">
</span><del>- const HistoryItemVector& coreChildren = m_historyItem->children();
</del><ins>+ const auto& coreChildren = m_historyItem->children();
</ins><span class="cx"> if (coreChildren.isEmpty())
</span><span class="cx"> return S_OK;
</span><span class="cx"> size_t childCount = coreChildren.size();
</span></span></pre>
</div>
</div>
</body>
</html>