Title: [190566] trunk/Source
- Revision
- 190566
- Author
- [email protected]
- Date
- 2015-10-05 11:13:15 -0700 (Mon, 05 Oct 2015)
Log Message
Remove unused HistoryItem::targetItem()
<https://webkit.org/b/149803>
Reviewed by Anders Carlsson.
Source/WebCore:
This is ancient code with no remaining clients since 2010 (r53650)
* history/HistoryItem.cpp:
(WebCore::HistoryItem::findTargetItem): Deleted.
(WebCore::HistoryItem::targetItem): Deleted.
* history/HistoryItem.h:
Source/WebKit/mac:
Remove the only (unused) client of HistoryItem::targetItem().
* History/WebHistoryItem.mm:
* History/WebHistoryItemPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190565 => 190566)
--- trunk/Source/WebCore/ChangeLog 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 18:13:15 UTC (rev 190566)
@@ -1,3 +1,17 @@
+2015-10-05 Andreas Kling <[email protected]>
+
+ Remove unused HistoryItem::targetItem()
+ <https://webkit.org/b/149803>
+
+ Reviewed by Anders Carlsson.
+
+ This is ancient code with no remaining clients since 2010 (r53650)
+
+ * history/HistoryItem.cpp:
+ (WebCore::HistoryItem::findTargetItem): Deleted.
+ (WebCore::HistoryItem::targetItem): Deleted.
+ * history/HistoryItem.h:
+
2015-10-05 Myles C. Maxfield <[email protected]>
Unprefix -webkit-font-feature-settings
Modified: trunk/Source/WebCore/history/HistoryItem.cpp (190565 => 190566)
--- trunk/Source/WebCore/history/HistoryItem.cpp 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebCore/history/HistoryItem.cpp 2015-10-05 18:13:15 UTC (rev 190566)
@@ -383,27 +383,6 @@
return nullptr;
}
-// <rdar://problem/4895849> HistoryItem::findTargetItem() should be replaced with a non-recursive method.
-HistoryItem* HistoryItem::findTargetItem()
-{
- if (m_isTargetItem)
- return this;
- unsigned size = m_children.size();
- for (unsigned i = 0; i < size; ++i) {
- // FIXME: targetItem() cannot return null currently, which is wrong.
- if (HistoryItem* match = m_children[i]->targetItem())
- return match;
- }
- return nullptr;
-}
-
-HistoryItem* HistoryItem::targetItem()
-{
- HistoryItem* foundItem = findTargetItem();
- // FIXME: This should probably not fall back to |this|.
- return foundItem ? foundItem : this;
-}
-
const HistoryItemVector& HistoryItem::children() const
{
return m_children;
Modified: trunk/Source/WebCore/history/HistoryItem.h (190565 => 190566)
--- trunk/Source/WebCore/history/HistoryItem.h 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebCore/history/HistoryItem.h 2015-10-05 18:13:15 UTC (rev 190566)
@@ -143,7 +143,6 @@
void setChildItem(Ref<HistoryItem>&&);
WEBCORE_EXPORT HistoryItem* childItemWithTarget(const String&);
HistoryItem* childItemWithDocumentSequenceNumber(long long number);
- WEBCORE_EXPORT HistoryItem* targetItem();
WEBCORE_EXPORT const HistoryItemVector& children() const;
WEBCORE_EXPORT bool hasChildren() const;
void clearChildren();
@@ -215,8 +214,6 @@
bool hasSameDocumentTree(HistoryItem& otherItem) const;
- HistoryItem* findTargetItem();
-
String m_urlString;
String m_originalURLString;
String m_referrer;
Modified: trunk/Source/WebKit/mac/ChangeLog (190565 => 190566)
--- trunk/Source/WebKit/mac/ChangeLog 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-10-05 18:13:15 UTC (rev 190566)
@@ -1,5 +1,17 @@
2015-10-05 Andreas Kling <[email protected]>
+ Remove unused HistoryItem::targetItem()
+ <https://webkit.org/b/149803>
+
+ Reviewed by Anders Carlsson.
+
+ Remove the only (unused) client of HistoryItem::targetItem().
+
+ * History/WebHistoryItem.mm:
+ * History/WebHistoryItemPrivate.h:
+
+2015-10-05 Andreas Kling <[email protected]>
+
Remove unused HistoryItem::parent
<https://webkit.org/b/149803>
Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (190565 => 190566)
--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2015-10-05 18:13:15 UTC (rev 190566)
@@ -543,11 +543,6 @@
return url;
}
-- (WebHistoryItem *)targetItem
-{
- return kit(core(_private)->targetItem());
-}
-
#if !PLATFORM(IOS)
+ (void)_releaseAllPendingPageCaches
{
Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (190565 => 190566)
--- trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2015-10-05 17:58:59 UTC (rev 190565)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2015-10-05 18:13:15 UTC (rev 190566)
@@ -54,7 +54,6 @@
- (NSArray *)_redirectURLs;
-- (WebHistoryItem *)targetItem;
- (NSString *)target;
- (BOOL)isTargetItem;
- (NSArray *)children;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
