<!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>[207493] 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/207493">207493</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 15:28:31 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of more WebHistoryItem cruft
https://bugs.webkit.org/show_bug.cgi?id=163623
Reviewed by Tim Horton.
Source/WebCore:
* history/HistoryItem.cpp:
(WebCore::HistoryItem::HistoryItem):
* history/HistoryItem.h:
(WebCore::HistoryItem::setViewportArguments):
(WebCore::HistoryItem::bookmarkID): Deleted.
(WebCore::HistoryItem::setBookmarkID): Deleted.
(WebCore::HistoryItem::sharedLinkUniqueIdentifier): Deleted.
(WebCore::HistoryItem::setSharedLinkUniqueIdentifier): Deleted.
Source/WebKit/mac:
* History/WebHistoryItem.mm:
(-[WebHistoryItem initFromDictionaryRepresentation:]):
* History/WebHistoryItemPrivate.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="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemPrivateh">trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-18 Anders Carlsson <andersca@apple.com>
+
+ Get rid of more WebHistoryItem cruft
+ https://bugs.webkit.org/show_bug.cgi?id=163623
+
+ Reviewed by Tim Horton.
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::HistoryItem):
+ * history/HistoryItem.h:
+ (WebCore::HistoryItem::setViewportArguments):
+ (WebCore::HistoryItem::bookmarkID): Deleted.
+ (WebCore::HistoryItem::setBookmarkID): Deleted.
+ (WebCore::HistoryItem::sharedLinkUniqueIdentifier): Deleted.
+ (WebCore::HistoryItem::setSharedLinkUniqueIdentifier): Deleted.
+
</ins><span class="cx"> 2016-10-18 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.cpp (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -120,8 +120,6 @@
</span><span class="cx"> , m_obscuredInset(item.m_obscuredInset)
</span><span class="cx"> , m_scale(item.m_scale)
</span><span class="cx"> , m_scaleIsInitial(item.m_scaleIsInitial)
</span><del>- , m_bookmarkID(item.m_bookmarkID)
- , m_sharedLinkUniqueIdentifier(item.m_sharedLinkUniqueIdentifier)
</del><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> if (item.m_formData)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebCore/history/HistoryItem.h 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -192,11 +192,6 @@
</span><span class="cx">
</span><span class="cx"> const ViewportArguments& viewportArguments() const { return m_viewportArguments; }
</span><span class="cx"> void setViewportArguments(const ViewportArguments& viewportArguments) { m_viewportArguments = viewportArguments; }
</span><del>-
- uint32_t bookmarkID() const { return m_bookmarkID; }
- void setBookmarkID(uint32_t bookmarkID) { m_bookmarkID = bookmarkID; }
- String sharedLinkUniqueIdentifier() const { return m_sharedLinkUniqueIdentifier; }
- void setSharedLinkUniqueIdentifier(const String& sharedLinkUniqueidentifier) { m_sharedLinkUniqueIdentifier = sharedLinkUniqueidentifier; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void notifyChanged();
</span><span class="lines">@@ -265,9 +260,6 @@
</span><span class="cx"> float m_scale { 0 }; // Note that UIWebView looks for a non-zero value, so this has to start as 0.
</span><span class="cx"> bool m_scaleIsInitial { false };
</span><span class="cx"> ViewportArguments m_viewportArguments;
</span><del>-
- uint32_t m_bookmarkID { 0 };
- String m_sharedLinkUniqueIdentifier;
</del><span class="cx"> #endif
</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 (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-18 Anders Carlsson <andersca@apple.com>
+
+ Get rid of more WebHistoryItem cruft
+ https://bugs.webkit.org/show_bug.cgi?id=163623
+
+ Reviewed by Tim Horton.
+
+ * History/WebHistoryItem.mm:
+ (-[WebHistoryItem initFromDictionaryRepresentation:]):
+ * History/WebHistoryItemPrivate.h:
+
</ins><span class="cx"> 2016-10-18 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Showing and hiding candidates list is very distracting after selecting word
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -71,9 +71,6 @@
</span><span class="cx"> static NSString *scaleIsInitialKey = @"scaleIsInitial";
</span><span class="cx"> static NSString *scrollPointXKey = @"scrollPointX";
</span><span class="cx"> static NSString *scrollPointYKey = @"scrollPointY";
</span><del>-
-static NSString * const bookmarkIDKey = @"bookmarkID";
-static NSString * const sharedLinkUniqueIdentifierKey = @"sharedLinkUniqueIdentifier";
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Private keys used in the WebHistoryItem's dictionary representation.
</span><span class="lines">@@ -379,14 +376,6 @@
</span><span class="cx"> NSNumber *scrollPointYValue = [dict objectForKey:scrollPointYKey];
</span><span class="cx"> if (scrollPointXValue && scrollPointYValue)
</span><span class="cx"> core(_private)->setScrollPosition(IntPoint([scrollPointXValue intValue], [scrollPointYValue intValue]));
</span><del>-
- uint32_t bookmarkIDValue = [[dict objectForKey:bookmarkIDKey] unsignedIntValue];
- if (bookmarkIDValue)
- core(_private)->setBookmarkID(bookmarkIDValue);
-
- NSString *sharedLinkUniqueIdentifierValue = [dict objectForKey:sharedLinkUniqueIdentifierKey];
- if (sharedLinkUniqueIdentifierValue)
- core(_private)->setSharedLinkUniqueIdentifier(sharedLinkUniqueIdentifierValue);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="lines">@@ -475,14 +464,6 @@
</span><span class="cx"> IntPoint scrollPosition = core(_private)->scrollPosition();
</span><span class="cx"> [dict setObject:[NSNumber numberWithInt:scrollPosition.x()] forKey:scrollPointXKey];
</span><span class="cx"> [dict setObject:[NSNumber numberWithInt:scrollPosition.y()] forKey:scrollPointYKey];
</span><del>-
- uint32_t bookmarkID = core(_private)->bookmarkID();
- if (bookmarkID)
- [dict setObject:[NSNumber numberWithUnsignedInt:bookmarkID] forKey:bookmarkIDKey];
-
- NSString *sharedLinkUniqueIdentifier = [self _sharedLinkUniqueIdentifier];
- if (sharedLinkUniqueIdentifier)
- [dict setObject:sharedLinkUniqueIdentifier forKey:sharedLinkUniqueIdentifierKey];
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return dict;
</span><span class="lines">@@ -619,25 +600,6 @@
</span><span class="cx"> core(_private)->setScrollPosition(IntPoint(scrollPoint));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (uint32_t)_bookmarkID
-{
- return core(_private)->bookmarkID();
-}
-
-- (void)_setBookmarkID:(uint32_t)bookmarkID
-{
- core(_private)->setBookmarkID(bookmarkID);
-}
-
-- (NSString *)_sharedLinkUniqueIdentifier
-{
- return nsStringNilIfEmpty(core(_private)->sharedLinkUniqueIdentifier());
-}
-
-- (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier
-{
- core(_private)->setSharedLinkUniqueIdentifier(identifier);
-}
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> - (BOOL)_isInPageCache
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (207492 => 207493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2016-10-18 22:22:55 UTC (rev 207492)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2016-10-18 22:28:31 UTC (rev 207493)
</span><span class="lines">@@ -75,11 +75,6 @@
</span><span class="cx"> - (void)_setViewportArguments:(NSDictionary *)arguments;
</span><span class="cx"> - (CGPoint)_scrollPoint;
</span><span class="cx"> - (void)_setScrollPoint:(CGPoint)scrollPoint;
</span><del>-
-- (uint32_t)_bookmarkID;
-- (void)_setBookmarkID:(uint32_t)bookmarkID;
-- (NSString *)_sharedLinkUniqueIdentifier;
-- (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> - (BOOL)_isInPageCache;
</span></span></pre>
</div>
</div>
</body>
</html>