Title: [207493] trunk/Source
- Revision
- 207493
- Author
- ander...@apple.com
- Date
- 2016-10-18 15:28:31 -0700 (Tue, 18 Oct 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207492 => 207493)
--- 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)
@@ -1,3 +1,19 @@
+2016-10-18 Anders Carlsson <ander...@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 <hy...@apple.com>
Fix Windows build.
Modified: trunk/Source/WebCore/history/HistoryItem.cpp (207492 => 207493)
--- 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)
@@ -120,8 +120,6 @@
, m_obscuredInset(item.m_obscuredInset)
, m_scale(item.m_scale)
, m_scaleIsInitial(item.m_scaleIsInitial)
- , m_bookmarkID(item.m_bookmarkID)
- , m_sharedLinkUniqueIdentifier(item.m_sharedLinkUniqueIdentifier)
#endif
{
if (item.m_formData)
Modified: trunk/Source/WebCore/history/HistoryItem.h (207492 => 207493)
--- 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)
@@ -192,11 +192,6 @@
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
void notifyChanged();
@@ -265,9 +260,6 @@
float m_scale { 0 }; // Note that UIWebView looks for a non-zero value, so this has to start as 0.
bool m_scaleIsInitial { false };
ViewportArguments m_viewportArguments;
-
- uint32_t m_bookmarkID { 0 };
- String m_sharedLinkUniqueIdentifier;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/mac/ChangeLog (207492 => 207493)
--- 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)
@@ -1,3 +1,14 @@
+2016-10-18 Anders Carlsson <ander...@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_hs...@apple.com>
Showing and hiding candidates list is very distracting after selecting word
Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (207492 => 207493)
--- 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)
@@ -71,9 +71,6 @@
static NSString *scaleIsInitialKey = @"scaleIsInitial";
static NSString *scrollPointXKey = @"scrollPointX";
static NSString *scrollPointYKey = @"scrollPointY";
-
-static NSString * const bookmarkIDKey = @"bookmarkID";
-static NSString * const sharedLinkUniqueIdentifierKey = @"sharedLinkUniqueIdentifier";
#endif
// Private keys used in the WebHistoryItem's dictionary representation.
@@ -379,14 +376,6 @@
NSNumber *scrollPointYValue = [dict objectForKey:scrollPointYKey];
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
return self;
@@ -475,14 +464,6 @@
IntPoint scrollPosition = core(_private)->scrollPosition();
[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
return dict;
@@ -619,25 +600,6 @@
core(_private)->setScrollPosition(IntPoint(scrollPoint));
}
-- (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)
- (BOOL)_isInPageCache
Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (207492 => 207493)
--- 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)
@@ -75,11 +75,6 @@
- (void)_setViewportArguments:(NSDictionary *)arguments;
- (CGPoint)_scrollPoint;
- (void)_setScrollPoint:(CGPoint)scrollPoint;
-
-- (uint32_t)_bookmarkID;
-- (void)_setBookmarkID:(uint32_t)bookmarkID;
-- (NSString *)_sharedLinkUniqueIdentifier;
-- (void)_setSharedLinkUniqueIdentifier:(NSString *)identifier;
#endif
- (BOOL)_isInPageCache;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
