Changeset 207493 in webkit
- Timestamp:
- Oct 18, 2016 3:28:31 PM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207490 r207493 1 2016-10-18 Anders Carlsson <andersca@apple.com> 2 3 Get rid of more WebHistoryItem cruft 4 https://bugs.webkit.org/show_bug.cgi?id=163623 5 6 Reviewed by Tim Horton. 7 8 * history/HistoryItem.cpp: 9 (WebCore::HistoryItem::HistoryItem): 10 * history/HistoryItem.h: 11 (WebCore::HistoryItem::setViewportArguments): 12 (WebCore::HistoryItem::bookmarkID): Deleted. 13 (WebCore::HistoryItem::setBookmarkID): Deleted. 14 (WebCore::HistoryItem::sharedLinkUniqueIdentifier): Deleted. 15 (WebCore::HistoryItem::setSharedLinkUniqueIdentifier): Deleted. 16 1 17 2016-10-18 Dave Hyatt <hyatt@apple.com> 2 18 -
trunk/Source/WebCore/history/HistoryItem.cpp
r207482 r207493 121 121 , m_scale(item.m_scale) 122 122 , m_scaleIsInitial(item.m_scaleIsInitial) 123 , m_bookmarkID(item.m_bookmarkID)124 , m_sharedLinkUniqueIdentifier(item.m_sharedLinkUniqueIdentifier)125 123 #endif 126 124 { -
trunk/Source/WebCore/history/HistoryItem.h
r207482 r207493 193 193 const ViewportArguments& viewportArguments() const { return m_viewportArguments; } 194 194 void setViewportArguments(const ViewportArguments& viewportArguments) { m_viewportArguments = viewportArguments; } 195 196 uint32_t bookmarkID() const { return m_bookmarkID; }197 void setBookmarkID(uint32_t bookmarkID) { m_bookmarkID = bookmarkID; }198 String sharedLinkUniqueIdentifier() const { return m_sharedLinkUniqueIdentifier; }199 void setSharedLinkUniqueIdentifier(const String& sharedLinkUniqueidentifier) { m_sharedLinkUniqueIdentifier = sharedLinkUniqueidentifier; }200 195 #endif 201 196 … … 266 261 bool m_scaleIsInitial { false }; 267 262 ViewportArguments m_viewportArguments; 268 269 uint32_t m_bookmarkID { 0 };270 String m_sharedLinkUniqueIdentifier;271 263 #endif 272 264 -
trunk/Source/WebKit/mac/ChangeLog
r207483 r207493 1 2016-10-18 Anders Carlsson <andersca@apple.com> 2 3 Get rid of more WebHistoryItem cruft 4 https://bugs.webkit.org/show_bug.cgi?id=163623 5 6 Reviewed by Tim Horton. 7 8 * History/WebHistoryItem.mm: 9 (-[WebHistoryItem initFromDictionaryRepresentation:]): 10 * History/WebHistoryItemPrivate.h: 11 1 12 2016-10-18 Wenson Hsieh <wenson_hsieh@apple.com> 2 13 -
trunk/Source/WebKit/mac/History/WebHistoryItem.mm
r207482 r207493 72 72 static NSString *scrollPointXKey = @"scrollPointX"; 73 73 static NSString *scrollPointYKey = @"scrollPointY"; 74 75 static NSString * const bookmarkIDKey = @"bookmarkID";76 static NSString * const sharedLinkUniqueIdentifierKey = @"sharedLinkUniqueIdentifier";77 74 #endif 78 75 … … 380 377 if (scrollPointXValue && scrollPointYValue) 381 378 core(_private)->setScrollPosition(IntPoint([scrollPointXValue intValue], [scrollPointYValue intValue])); 382 383 uint32_t bookmarkIDValue = [[dict objectForKey:bookmarkIDKey] unsignedIntValue];384 if (bookmarkIDValue)385 core(_private)->setBookmarkID(bookmarkIDValue);386 387 NSString *sharedLinkUniqueIdentifierValue = [dict objectForKey:sharedLinkUniqueIdentifierKey];388 if (sharedLinkUniqueIdentifierValue)389 core(_private)->setSharedLinkUniqueIdentifier(sharedLinkUniqueIdentifierValue);390 379 #endif 391 380 … … 476 465 [dict setObject:[NSNumber numberWithInt:scrollPosition.x()] forKey:scrollPointXKey]; 477 466 [dict setObject:[NSNumber numberWithInt:scrollPosition.y()] forKey:scrollPointYKey]; 478 479 uint32_t bookmarkID = core(_private)->bookmarkID();480 if (bookmarkID)481 [dict setObject:[NSNumber numberWithUnsignedInt:bookmarkID] forKey:bookmarkIDKey];482 483 NSString *sharedLinkUniqueIdentifier = [self _sharedLinkUniqueIdentifier];484 if (sharedLinkUniqueIdentifier)485 [dict setObject:sharedLinkUniqueIdentifier forKey:sharedLinkUniqueIdentifierKey];486 467 #endif 487 468 … … 620 601 } 621 602 622 - (uint32_t)_bookmarkID623 {624 return core(_private)->bookmarkID();625 }626 627 - (void)_setBookmarkID:(uint32_t)bookmarkID628 {629 core(_private)->setBookmarkID(bookmarkID);630 }631 632 - (NSString *)_sharedLinkUniqueIdentifier633 {634 return nsStringNilIfEmpty(core(_private)->sharedLinkUniqueIdentifier());635 }636 637 - (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier638 {639 core(_private)->setSharedLinkUniqueIdentifier(identifier);640 }641 603 #endif // PLATFORM(IOS) 642 604 -
trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h
r190566 r207493 76 76 - (CGPoint)_scrollPoint; 77 77 - (void)_setScrollPoint:(CGPoint)scrollPoint; 78 79 - (uint32_t)_bookmarkID;80 - (void)_setBookmarkID:(uint32_t)bookmarkID;81 - (NSString *)_sharedLinkUniqueIdentifier;82 - (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier;83 78 #endif 84 79
Note: See TracChangeset
for help on using the changeset viewer.