Changeset 207493 in webkit

Timestamp:

Oct 18, 2016 3:28:31 PM (8 years ago)

Author:

andersca@apple.com

Message:

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:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/history/HistoryItem.cpp (modified) (1 diff)
• WebCore/history/HistoryItem.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/History/WebHistoryItem.mm (modified) (4 diffs)
• WebKit/mac/History/WebHistoryItemPrivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2016-10-18  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/history/HistoryItem.cpp

@@ -121 +121 @@
     , m_scale(item.m_scale)
     , m_scaleIsInitial(item.m_scaleIsInitial)
-    , m_bookmarkID(item.m_bookmarkID)
-    , m_sharedLinkUniqueIdentifier(item.m_sharedLinkUniqueIdentifier)
 #endif
 {

trunk/Source/WebCore/history/HistoryItem.h

@@ -193 +193 @@
     const ViewportArguments& viewportArguments() const { return m_viewportArguments; }
     void setViewportArguments(const ViewportArguments& viewportArguments) { m_viewportArguments = viewportArguments; }
-
-    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; }
 #endif
 
@@ -266 +261 @@
     bool m_scaleIsInitial { false };
     ViewportArguments m_viewportArguments;
-
-    uint32_t m_bookmarkID { 0 };
-    String m_sharedLinkUniqueIdentifier;
 #endif
 

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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:
+
 2016-10-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/mac/History/WebHistoryItem.mm

@@ -72 +72 @@
 static NSString *scrollPointXKey = @"scrollPointX";
 static NSString *scrollPointYKey = @"scrollPointY";
-
-static NSString * const bookmarkIDKey = @"bookmarkID";
-static NSString * const sharedLinkUniqueIdentifierKey = @"sharedLinkUniqueIdentifier";
 #endif
 
@@ -380 +377 @@
     if (scrollPointXValue && scrollPointYValue)
         core(_private)->setScrollPosition(IntPoint([scrollPointXValue intValue], [scrollPointYValue intValue]));
-
-    uint32_t bookmarkIDValue = [[dict objectForKey:bookmarkIDKey] unsignedIntValue];
-    if (bookmarkIDValue)
-        core(_private)->setBookmarkID(bookmarkIDValue);
-
-    NSString *sharedLinkUniqueIdentifierValue = [dict objectForKey:sharedLinkUniqueIdentifierKey];
-    if (sharedLinkUniqueIdentifierValue)
-        core(_private)->setSharedLinkUniqueIdentifier(sharedLinkUniqueIdentifierValue);
 #endif
 
@@ -476 +465 @@
     [dict setObject:[NSNumber numberWithInt:scrollPosition.x()] forKey:scrollPointXKey];
     [dict setObject:[NSNumber numberWithInt:scrollPosition.y()] forKey:scrollPointYKey];
-
-    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];
 #endif
 
@@ -620 +601 @@
 }
 
-- (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);
-}
 #endif // PLATFORM(IOS)
 

trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h

@@ -76 +76 @@
 - (CGPoint)_scrollPoint;
 - (void)_setScrollPoint:(CGPoint)scrollPoint;
-
-- (uint32_t)_bookmarkID;
-- (void)_setBookmarkID:(uint32_t)bookmarkID;
-- (NSString *)_sharedLinkUniqueIdentifier;
-- (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier;
 #endif