<!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>[207419] trunk/Source/WebKit/mac</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/207419">207419</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-17 11:35:17 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryBackForwardListh">trunk/Source/WebKit/mac/History/BackForwardList.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryBackForwardListmm">trunk/Source/WebKit/mac/History/BackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (207418 => 207419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-17 18:26:49 UTC (rev 207418)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-17 18:35:17 UTC (rev 207419)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-10-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Remove WEBCORE_EXPORT from BackForwardList, it lives in WebKit now
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=163551
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BackForwardList.h (207418 => 207419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BackForwardList.h 2016-10-17 18:26:49 UTC (rev 207418)
+++ trunk/Source/WebKit/mac/History/BackForwardList.h 2016-10-17 18:35:17 UTC (rev 207419)
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx"> void setEnabled(bool);
</span><span class="cx"> int backListCount() override;
</span><span class="cx"> int forwardListCount() override;
</span><del>- bool containsItem(WebCore::HistoryItem*);
</del><ins>+ bool containsItem(WebCore::HistoryItem&);
</ins><span class="cx">
</span><span class="cx"> void close() override;
</span><span class="cx"> bool closed();
</span><span class="cx">
</span><del>- void removeItem(WebCore::HistoryItem*);
- Vector<Ref<WebCore::HistoryItem>>& entries();
</del><ins>+ void removeItem(WebCore::HistoryItem&);
+ const Vector<Ref<WebCore::HistoryItem>>& entries() const { return m_entries; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unsigned current();
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/BackForwardList.mm (207418 => 207419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/BackForwardList.mm 2016-10-17 18:26:49 UTC (rev 207418)
+++ trunk/Source/WebKit/mac/History/BackForwardList.mm 2016-10-17 18:35:17 UTC (rev 207419)
</span><span class="lines">@@ -211,11 +211,6 @@
</span><span class="cx"> return m_entries[index + m_current].ptr();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<Ref<HistoryItem>>& BackForwardList::entries()
-{
- return m_entries;
-}
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unsigned BackForwardList::current()
</span><span class="cx"> {
</span><span class="lines">@@ -243,15 +238,12 @@
</span><span class="cx"> return m_closed;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BackForwardList::removeItem(HistoryItem* item)
</del><ins>+void BackForwardList::removeItem(HistoryItem& item)
</ins><span class="cx"> {
</span><del>- if (!item)
- return;
-
</del><span class="cx"> for (unsigned i = 0; i < m_entries.size(); ++i) {
</span><del>- if (m_entries[i].ptr() == item) {
</del><ins>+ if (m_entries[i].ptr() == &item) {
</ins><span class="cx"> m_entries.remove(i);
</span><del>- m_entryHash.remove(item);
</del><ins>+ m_entryHash.remove(&item);
</ins><span class="cx"> if (m_current == NoCurrentItemIndex || m_current < i)
</span><span class="cx"> break;
</span><span class="cx"> if (m_current > i)
</span><span class="lines">@@ -266,7 +258,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool BackForwardList::containsItem(HistoryItem* entry)
</del><ins>+bool BackForwardList::containsItem(HistoryItem& entry)
</ins><span class="cx"> {
</span><del>- return m_entryHash.contains(entry);
</del><ins>+ return m_entryHash.contains(&entry);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (207418 => 207419)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-10-17 18:26:49 UTC (rev 207418)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2016-10-17 18:35:17 UTC (rev 207419)
</span><span class="lines">@@ -145,7 +145,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)removeItem:(WebHistoryItem *)item
</span><span class="cx"> {
</span><del>- core(self)->removeItem(core(item));
</del><ins>+ if (!item)
+ return;
+
+ core(self)->removeItem(*core(item));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -199,7 +202,10 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)containsItem:(WebHistoryItem *)item
</span><span class="cx"> {
</span><del>- return core(self)->containsItem(core(item));
</del><ins>+ if (!item)
+ return NO;
+
+ return core(self)->containsItem(*core(item));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)goBack
</span><span class="lines">@@ -306,9 +312,8 @@
</span><span class="cx">
</span><span class="cx"> BackForwardList* backForwardList = core(self);
</span><span class="cx"> auto& entries = backForwardList->entries();
</span><del>-
- unsigned size = entries.size();
- for (unsigned i = 0; i < size; ++i) {
</del><ins>+
+ for (unsigned i = 0; i < entries.size(); ++i) {
</ins><span class="cx"> if (entries[i].ptr() == backForwardList->currentItem()) {
</span><span class="cx"> [result appendString:@" >>>"];
</span><span class="cx"> } else {
</span><span class="lines">@@ -316,7 +321,7 @@
</span><span class="cx"> }
</span><span class="cx"> [result appendFormat:@"%2d) ", i];
</span><span class="cx"> int currPos = [result length];
</span><del>- [result appendString:[kit(entries[i].ptr()) description]];
</del><ins>+ [result appendString:[kit(const_cast<HistoryItem*>(entries[i].ptr())) description]];
</ins><span class="cx">
</span><span class="cx"> // shift all the contents over. a bit slow, but this is for debugging
</span><span class="cx"> NSRange replRange = { static_cast<NSUInteger>(currPos), [result length] - currPos };
</span></span></pre>
</div>
</div>
</body>
</html>