<!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>[190559] 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/190559">190559</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-10-05 07:38:50 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused HistoryItem::parent
<https://webkit.org/b/149803>
Reviewed by Anders Carlsson.
Source/WebCore:
Remove the effectively-unused "parent" field from HistoryItem.
This also allows us to get rid of a HistoryItem constructor.
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem): Deleted.
(WebCore::HistoryItem::reset): Deleted.
(WebCore::HistoryItem::parent): Deleted.
(WebCore::HistoryItem::setParent): Deleted.
* history/HistoryItem.h:
(WebCore::HistoryItem::create): Deleted.
* loader/HistoryController.cpp:
(WebCore::HistoryController::initializeItem): Deleted.
Source/WebKit/mac:
Remove the only (unused) client of HistoryItem's with-parent constructor.
* History/WebHistoryItem.mm:
(-[WebHistoryItem initWithURL:target:parent:title:]): Deleted.
* History/WebHistoryItemInternal.h:</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="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-05 Andreas Kling <akling@apple.com>
+
+ Remove unused HistoryItem::parent
+ <https://webkit.org/b/149803>
+
+ Reviewed by Anders Carlsson.
+
+ Remove the effectively-unused "parent" field from HistoryItem.
+ This also allows us to get rid of a HistoryItem constructor.
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem): Deleted.
+ (WebCore::HistoryItem::reset): Deleted.
+ (WebCore::HistoryItem::parent): Deleted.
+ (WebCore::HistoryItem::setParent): Deleted.
+ * history/HistoryItem.h:
+ (WebCore::HistoryItem::create): Deleted.
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::initializeItem): Deleted.
+
</ins><span class="cx"> 2015-10-05 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> GLContext should control ownership of context-related objects
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -109,27 +109,6 @@
</span><span class="cx"> iconDatabase().retainIconForPageURL(m_urlString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HistoryItem::HistoryItem(const URL& url, const String& target, const String& parent, const String& title)
- : m_urlString(url.string())
- , m_originalURLString(url.string())
- , m_target(target)
- , m_parent(parent)
- , m_title(title)
- , m_pageScaleFactor(0)
- , m_lastVisitWasFailure(false)
- , m_isTargetItem(false)
- , m_itemSequenceNumber(generateSequenceNumber())
- , m_documentSequenceNumber(generateSequenceNumber())
- , m_pruningReason(PruningReason::None)
-#if PLATFORM(IOS)
- , m_scale(0)
- , m_scaleIsInitial(false)
- , m_bookmarkID(0)
-#endif
-{
- iconDatabase().retainIconForPageURL(m_urlString);
-}
-
</del><span class="cx"> HistoryItem::~HistoryItem()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_cachedPage);
</span><span class="lines">@@ -142,7 +121,6 @@
</span><span class="cx"> , m_originalURLString(item.m_originalURLString)
</span><span class="cx"> , m_referrer(item.m_referrer)
</span><span class="cx"> , m_target(item.m_target)
</span><del>- , m_parent(item.m_parent)
</del><span class="cx"> , m_title(item.m_title)
</span><span class="cx"> , m_displayTitle(item.m_displayTitle)
</span><span class="cx"> , m_scrollPoint(item.m_scrollPoint)
</span><span class="lines">@@ -185,7 +163,6 @@
</span><span class="cx"> m_originalURLString = String();
</span><span class="cx"> m_referrer = String();
</span><span class="cx"> m_target = String();
</span><del>- m_parent = String();
</del><span class="cx"> m_title = String();
</span><span class="cx"> m_displayTitle = String();
</span><span class="cx">
</span><span class="lines">@@ -252,11 +229,6 @@
</span><span class="cx"> return m_target;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const String& HistoryItem::parent() const
-{
- return m_parent;
-}
-
</del><span class="cx"> void HistoryItem::setAlternateTitle(const String& alternateTitle)
</span><span class="cx"> {
</span><span class="cx"> m_displayTitle = alternateTitle;
</span><span class="lines">@@ -305,11 +277,6 @@
</span><span class="cx"> notifyHistoryItemChanged(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryItem::setParent(const String& parent)
-{
- m_parent = parent;
-}
-
</del><span class="cx"> const IntPoint& HistoryItem::scrollPoint() const
</span><span class="cx"> {
</span><span class="cx"> return m_scrollPoint;
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebCore/history/HistoryItem.h 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -73,10 +73,6 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new HistoryItem(urlString, title, alternateTitle));
</span><span class="cx"> }
</span><del>- static Ref<HistoryItem> create(const URL& url, const String& target, const String& parent, const String& title)
- {
- return adoptRef(*new HistoryItem(url, target, parent, title));
- }
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~HistoryItem();
</span><span class="cx">
</span><span class="lines">@@ -95,7 +91,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setAlternateTitle(const String&);
</span><span class="cx"> WEBCORE_EXPORT const String& alternateTitle() const;
</span><span class="cx">
</span><del>- const String& parent() const;
</del><span class="cx"> WEBCORE_EXPORT URL url() const;
</span><span class="cx"> WEBCORE_EXPORT URL originalURL() const;
</span><span class="cx"> WEBCORE_EXPORT const String& referrer() const;
</span><span class="lines">@@ -126,7 +121,6 @@
</span><span class="cx"> WEBCORE_EXPORT void setOriginalURLString(const String&);
</span><span class="cx"> WEBCORE_EXPORT void setReferrer(const String&);
</span><span class="cx"> WEBCORE_EXPORT void setTarget(const String&);
</span><del>- void setParent(const String&);
</del><span class="cx"> WEBCORE_EXPORT void setTitle(const String&);
</span><span class="cx"> WEBCORE_EXPORT void setIsTargetItem(bool);
</span><span class="cx">
</span><span class="lines">@@ -216,7 +210,6 @@
</span><span class="cx"> WEBCORE_EXPORT HistoryItem();
</span><span class="cx"> WEBCORE_EXPORT HistoryItem(const String& urlString, const String& title);
</span><span class="cx"> WEBCORE_EXPORT HistoryItem(const String& urlString, const String& title, const String& alternateTitle);
</span><del>- WEBCORE_EXPORT HistoryItem(const URL&, const String& frameName, const String& parent, const String& title);
</del><span class="cx">
</span><span class="cx"> HistoryItem(const HistoryItem&);
</span><span class="cx">
</span><span class="lines">@@ -228,7 +221,6 @@
</span><span class="cx"> String m_originalURLString;
</span><span class="cx"> String m_referrer;
</span><span class="cx"> String m_target;
</span><del>- String m_parent;
</del><span class="cx"> String m_title;
</span><span class="cx"> String m_displayTitle;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -639,13 +639,10 @@
</span><span class="cx"> if (originalURL.isEmpty())
</span><span class="cx"> originalURL = blankURL();
</span><span class="cx">
</span><del>- Frame* parentFrame = m_frame.tree().parent();
- String parent = parentFrame ? parentFrame->tree().uniqueName() : "";
</del><span class="cx"> StringWithDirection title = documentLoader->title();
</span><span class="cx">
</span><span class="cx"> item.setURL(url);
</span><span class="cx"> item.setTarget(m_frame.tree().uniqueName());
</span><del>- item.setParent(parent);
</del><span class="cx"> // FIXME: should store title directionality in history as well.
</span><span class="cx"> item.setTitle(title.string());
</span><span class="cx"> item.setOriginalURLString(originalURL.string());
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-05 Andreas Kling <akling@apple.com>
+
+ Remove unused HistoryItem::parent
+ <https://webkit.org/b/149803>
+
+ Reviewed by Anders Carlsson.
+
+ Remove the only (unused) client of HistoryItem's with-parent constructor.
+
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem initWithURL:target:parent:title:]): Deleted.
+ * History/WebHistoryItemInternal.h:
+
</ins><span class="cx"> 2015-09-30 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Compute document marker rects at use time instead of paint time
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -290,11 +290,6 @@
</span><span class="cx"> return [[[self alloc] initWithURL:URL title:nil] autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title
-{
- return [self initWithWebCoreHistoryItem:HistoryItem::create(URL, target, parent, title)];
-}
-
</del><span class="cx"> - (id)initWithURLString:(NSString *)URLString title:(NSString *)title displayTitle:(NSString *)displayTitle lastVisitedTimeInterval:(NSTimeInterval)time
</span><span class="cx"> {
</span><span class="cx"> WebHistoryItem *item = [self initWithWebCoreHistoryItem:HistoryItem::create(URLString, title, displayTitle)];
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h (190558 => 190559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h 2015-10-05 07:13:50 UTC (rev 190558)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h 2015-10-05 14:38:50 UTC (rev 190559)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx">
</span><span class="cx"> + (WebHistoryItem *)entryWithURL:(NSURL *)URL;
</span><span class="cx">
</span><del>-- (id)initWithURL:(NSURL *)URL target:(NSString *)target parent:(NSString *)parent title:(NSString *)title;
</del><span class="cx"> - (id)initWithURLString:(NSString *)URLString title:(NSString *)title displayTitle:(NSString *)displayTitle lastVisitedTimeInterval:(NSTimeInterval)time;
</span><span class="cx"> - (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
</span><span class="cx"> - (id)initWithWebCoreHistoryItem:(PassRefPtr<WebCore::HistoryItem>)item;
</span></span></pre>
</div>
</div>
</body>
</html>