Title: [168412] tags/Safari-538.34/Source/WebKit2
- Revision
- 168412
- Author
- lforsch...@apple.com
- Date
- 2014-05-06 23:07:34 -0700 (Tue, 06 May 2014)
Log Message
Merged r168411.
Modified Paths
Diff
Modified: tags/Safari-538.34/Source/WebKit2/ChangeLog (168411 => 168412)
--- tags/Safari-538.34/Source/WebKit2/ChangeLog 2014-05-07 05:37:22 UTC (rev 168411)
+++ tags/Safari-538.34/Source/WebKit2/ChangeLog 2014-05-07 06:07:34 UTC (rev 168412)
@@ -1,3 +1,21 @@
+2014-04-17 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r168411
+
+ 2014-05-06 Brady Eidson <beid...@apple.com>
+
+ Followup to "Add WK2 SPI to prevent the previous back/forward item from remaining in the list"
+ <rdar://problem/16248710> and https://bugs.webkit.org/show_bug.cgi?id=132636
+
+ Reviewed by NOBODY (My mistake while addressing previous review feedback)
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient): During review feedback, this client switched from default negative to default
+ positve, so when the client isn't implemented... return true instead of false.
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::addItem): Fix nonsensical comments while I'm at it.
+
2014-05-06 Brady Eidson <beid...@apple.com>
Add WK2 SPI to prevent the previous back/forward item from remaining in the list
Modified: tags/Safari-538.34/Source/WebKit2/UIProcess/API/C/WKPage.cpp (168411 => 168412)
--- tags/Safari-538.34/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-07 05:37:22 UTC (rev 168411)
+++ tags/Safari-538.34/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-05-07 06:07:34 UTC (rev 168412)
@@ -971,7 +971,7 @@
virtual bool shouldKeepCurrentBackForwardListItemInList(WebKit::WebPageProxy* page, WebKit::WebBackForwardListItem* item) override
{
if (!m_client.shouldKeepCurrentBackForwardListItemInList)
- return false;
+ return true;
return m_client.shouldKeepCurrentBackForwardListItemInList(toAPI(page), toAPI(item));
}
Modified: tags/Safari-538.34/Source/WebKit2/UIProcess/WebBackForwardList.cpp (168411 => 168412)
--- tags/Safari-538.34/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-05-07 05:37:22 UTC (rev 168411)
+++ tags/Safari-538.34/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-05-07 06:07:34 UTC (rev 168412)
@@ -127,14 +127,14 @@
}
if (!shouldKeepCurrentItem) {
- // m_current never be pointing past the end of the entries Vector.
+ // m_current should never be pointing past the end of the entries Vector.
// If it is, something has gone wrong and we should not try to swap in the new item.
ASSERT(m_currentIndex < m_entries.size());
removedItems.append(m_entries[m_currentIndex]);
m_entries[m_currentIndex] = newItem;
} else {
- // m_current never be pointing more than 1 past the end of the entries Vector.
+ // m_current should never be pointing more than 1 past the end of the entries Vector.
// If it is, something has gone wrong and we should not try to insert the new item.
ASSERT(m_currentIndex <= m_entries.size());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
