[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
mihaip at chromium.org
mihaip at chromium.org
Wed Dec 22 15:12:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3355ca0d06f875c8e98e462346dd7f38a90b6fed
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 28 23:20:22 2010 +0000
2010-10-28 Mihai Parparita <mihaip at chromium.org>
Reviewed by Darin Adler.
[Chromium] History related tests REGRESSED after r70723
https://bugs.webkit.org/show_bug.cgi?id=48513
Remove test_expectations.txt lines for tests that now pass.
* platform/chromium/test_expectations.txt:
2010-10-28 Mihai Parparita <mihaip at chromium.org>
Reviewed by Darin Adler.
[Chromium] History related tests REGRESSED after r70723
https://bugs.webkit.org/show_bug.cgi?id=48513
Remove backItem(), forwardItem() and currentItem() from the Chromium
BackForwardList implementation, since they can use the base class
behavior now (which call itemAtIndex with -1, 1, and 0 respectively).
* history/BackForwardList.h:
* history/BackForwardListChromium.cpp:
2010-10-28 Mihai Parparita <mihaip at chromium.org>
Reviewed by Darin Adler.
[Chromium] History related tests REGRESSED after r70723
https://bugs.webkit.org/show_bug.cgi?id=48513
Since r70723 made BackForwardList::currentItem no longer be virtual,
we were not reaching the implementation in Chromium's
BackForwardListClientImpl, and for Chromium currentItem is not the same
as itemAtIndex(0).
The fix is to make itemAtIndex(0) have the currentItem() behavior, which
lets us keep currentItem as non-virtual (and remove its implementation
from the Chromium side).
This also switches Chromium to use the default implementation of
backItem() and forwardItem() (vs. the old stubs that just had
ASSERT_NOT_REACHED) since they're actually reacheable with Chromium
code thanks to the calls in FrameLoader::checkDidPerformFirstNavigation.
* src/BackForwardListClientImpl.cpp:
(WebKit::BackForwardListClientImpl::itemAtIndex):
* src/BackForwardListClientImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70823 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 04cfa57..09b1638 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-28 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ [Chromium] History related tests REGRESSED after r70723
+ https://bugs.webkit.org/show_bug.cgi?id=48513
+
+ Remove test_expectations.txt lines for tests that now pass.
+
+ * platform/chromium/test_expectations.txt:
+
2010-10-28 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Tony Chang.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 8a3e6ac..f876540 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3245,118 +3245,3 @@ BUGWK46868 WONTFIX : platform/chromium/fast/text/chromium-mac-duplicate-ime-comp
// Vertical text needs to be implemented in platforms other than OS X.
BUGWK48459 WIN LINUX : fast/blockflow/border-vertical-lr.html = IMAGE+TEXT
-
-// History related tests regressed after r70723.
-BUGWK48513 : fast/history/form-submit-in-frame-via-onclick.html = TEXT
-BUGWK48513 : fast/history/form-submit-in-frame.html = TEXT
-BUGWK48513 : fast/history/history-back-within-subframe-hash.html = TIMEOUT
-BUGWK48513 : fast/history/gesture-before-onload-form-submit.html = TEXT
-BUGWK48513 : fast/history/gesture-before-onload-location-href.html = TEXT
-BUGWK48513 : fast/history/redirect-via-iframe.html = TEXT
-BUGWK48513 : fast/history/same-document-iframes-changing-fragment.html = TEXT
-BUGWK48513 : fast/history/same-document-iframes-changing-pushstate.html = TEXT
-BUGWK48513 : fast/loader/fragment-after-redirect-gets-back-entry.html = TEXT
-BUGWK48513 : fast/loader/frame-location-change-not-added-to-history.html = TEXT
-BUGWK48513 : fast/loader/frame-src-change-added-to-history.html = TEXT
-BUGWK48513 : fast/loader/frame-src-change-not-added-to-history.html = TEXT
-BUGWK48513 : fast/loader/stateobjects/pushstate-clears-forward-history.html = TEXT
-BUGWK48513 : fast/loader/subframe-navigate-during-main-frame-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-200-refresh-0-seconds.pl = TEXT
-BUGWK48513 : http/tests/history/redirect-200-refresh-2-seconds.pl = TEXT
-BUGWK48513 : http/tests/history/redirect-301.html = TEXT
-BUGWK48513 : http/tests/history/redirect-302.html = TEXT
-BUGWK48513 : http/tests/history/redirect-303.html = TEXT
-BUGWK48513 : http/tests/history/redirect-307.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-document-location-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-document-location-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-document-location-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-form-submit-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-form-submit-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-form-submit-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-assign-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-assign-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-assign-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-href-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-href-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-href-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-replace-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-replace-2-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-js-location-replace-before-load.html = TEXT
-BUGWK48513 : http/tests/history/redirect-meta-refresh-0-seconds.html = TEXT
-BUGWK48513 : http/tests/history/redirect-meta-refresh-2-seconds.html = TEXT
-BUGWK48513 : http/tests/navigation/anchor-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/anchor-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/anchor-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/back-to-slow-frame.html = TEXT
-BUGWK48513 : http/tests/navigation/document-location-click-timeout.html = TEXT
-BUGWK48513 : http/tests/navigation/document-location-click.html = TEXT
-BUGWK48513 : http/tests/navigation/document-location-mouseover.html = TEXT
-BUGWK48513 : http/tests/navigation/document-location-onload.html = TEXT
-BUGWK48513 : http/tests/navigation/document-location-script.html = TEXT
-BUGWK48513 : http/tests/navigation/dynamic-iframe-dynamic-form-back-entry.html = TEXT
-BUGWK48513 : http/tests/navigation/error404-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/error404-frames.html = TEXT
-BUGWK48513 WIN : http/tests/navigation/error404-goback.html = TEXT
-BUGWK48513 WIN LINUX : http/tests/navigation/error404-subframeload.html = TEXT
-BUGWK48513 MAC : http/tests/navigation/error404-subframeload.html = IMAGE+TEXT
-BUGWK48513 : http/tests/navigation/javascriptlink-basic.html = TEXT
-BUGWK48513 WIN : http/tests/navigation/javascriptlink-frames.html = TEXT
-BUGWK48513 MAC LINUX : http/tests/navigation/javascriptlink-frames.html = IMAGE+TEXT
-BUGWK48513 : http/tests/navigation/javascriptlink-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/javascriptlink-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/location-assign-adds-history-item.html = TEXT
-BUGWK48513 : http/tests/navigation/location-href-set-adds-history-item.html = TEXT
-BUGWK48513 : http/tests/navigation/location-replace-adds-history-item.html = TEXT
-BUGWK48513 : http/tests/navigation/location-set-adds-history-item.html = TEXT
-BUGWK48513 : http/tests/navigation/lockedhistory-iframe.html = TEXT
-BUGWK48513 : http/tests/navigation/metaredirect-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/metaredirect-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/metaredirect-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/metaredirect-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/multiple-back-forward-entries.html = TEXT
-BUGWK48513 : http/tests/navigation/new-window-redirect-history.html = TEXT
-BUGWK48513 : http/tests/navigation/onload-navigation-iframe-2.html = TEXT
-BUGWK48513 : http/tests/navigation/onload-navigation-iframe-timeout.html = TEXT
-BUGWK48513 : http/tests/navigation/onload-navigation-iframe.html = TEXT
-BUGWK48513 : http/tests/navigation/parsed-iframe-dynamic-form-back-entry.html = TEXT
-BUGWK48513 : http/tests/navigation/post-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/post-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/post-goback-same-url.html = TEXT
-BUGWK48513 : http/tests/navigation/post-goback1.html = TEXT
-BUGWK48513 : http/tests/navigation/post-goback2.html = TEXT
-BUGWK48513 : http/tests/navigation/postredirect-basic.html = TEXT
-BUGWK48513 WIN : http/tests/navigation/postredirect-frames.html = TEXT
-BUGWK48513 LINUX MAC : http/tests/navigation/postredirect-frames.html = IMAGE+TEXT
-BUGWK48513 : http/tests/navigation/postredirect-goback1.html = TEXT
-BUGWK48513 : http/tests/navigation/postredirect-goback2.html = TEXT
-BUGWK48513 : http/tests/navigation/postredirect-reload.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect-cycle.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect-load-no-form-restoration.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect302-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect302-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect302-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect302-metaredirect.html = TEXT
-BUGWK48513 : http/tests/navigation/redirect302-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/relativeanchor-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/relativeanchor-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/relativeanchor-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/restore-form-state-https.html = TEXT
-BUGWK48513 : http/tests/navigation/slowmetaredirect-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/slowtimerredirect-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-frames-loadsame.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-loadsame.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-reload.html = TEXT
-BUGWK48513 : http/tests/navigation/success200-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/timerredirect-basic.html = TEXT
-BUGWK48513 : http/tests/navigation/timerredirect-frames.html = TEXT
-BUGWK48513 : http/tests/navigation/timerredirect-goback.html = TEXT
-BUGWK48513 : http/tests/navigation/timerredirect-subframeload.html = TEXT
-BUGWK48513 : http/tests/navigation/window-open-adds-history-item.html = TEXT
-BUGWK48513 : http/tests/navigation/window-open-adds-history-item2.html = TEXT
-
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2041cf..c182a73 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-28 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ [Chromium] History related tests REGRESSED after r70723
+ https://bugs.webkit.org/show_bug.cgi?id=48513
+
+ Remove backItem(), forwardItem() and currentItem() from the Chromium
+ BackForwardList implementation, since they can use the base class
+ behavior now (which call itemAtIndex with -1, 1, and 0 respectively).
+
+ * history/BackForwardList.h:
+ * history/BackForwardListChromium.cpp:
+
2010-10-28 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Tony Chang.
diff --git a/WebCore/history/BackForwardList.h b/WebCore/history/BackForwardList.h
index 83efc3c..b622a9d 100644
--- a/WebCore/history/BackForwardList.h
+++ b/WebCore/history/BackForwardList.h
@@ -54,7 +54,6 @@ public:
virtual ~BackForwardListClient() {}
virtual void addItem(PassRefPtr<HistoryItem>) = 0;
virtual void goToItem(HistoryItem*) = 0;
- virtual HistoryItem* currentItem() = 0;
virtual HistoryItem* itemAtIndex(int) = 0;
virtual int backListCount() = 0;
virtual int forwardListCount() = 0;
diff --git a/WebCore/history/BackForwardListChromium.cpp b/WebCore/history/BackForwardListChromium.cpp
index dc1efc9..a22a147 100644
--- a/WebCore/history/BackForwardListChromium.cpp
+++ b/WebCore/history/BackForwardListChromium.cpp
@@ -64,23 +64,6 @@ void BackForwardListImpl::goToItem(HistoryItem* item)
m_client->goToItem(item);
}
-HistoryItem* BackForwardListImpl::backItem()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-HistoryItem* BackForwardListImpl::forwardItem()
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-HistoryItem* BackForwardListImpl::currentItem()
-{
- return m_client->currentItem();
-}
-
int BackForwardListImpl::capacity()
{
return m_capacity;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 188078c..8b93fe4 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,28 @@
+2010-10-28 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ [Chromium] History related tests REGRESSED after r70723
+ https://bugs.webkit.org/show_bug.cgi?id=48513
+
+ Since r70723 made BackForwardList::currentItem no longer be virtual,
+ we were not reaching the implementation in Chromium's
+ BackForwardListClientImpl, and for Chromium currentItem is not the same
+ as itemAtIndex(0).
+
+ The fix is to make itemAtIndex(0) have the currentItem() behavior, which
+ lets us keep currentItem as non-virtual (and remove its implementation
+ from the Chromium side).
+
+ This also switches Chromium to use the default implementation of
+ backItem() and forwardItem() (vs. the old stubs that just had
+ ASSERT_NOT_REACHED) since they're actually reacheable with Chromium
+ code thanks to the calls in FrameLoader::checkDidPerformFirstNavigation.
+
+ * src/BackForwardListClientImpl.cpp:
+ (WebKit::BackForwardListClientImpl::itemAtIndex):
+ * src/BackForwardListClientImpl.h:
+
2010-10-28 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by David Levin.
diff --git a/WebKit/chromium/src/BackForwardListClientImpl.cpp b/WebKit/chromium/src/BackForwardListClientImpl.cpp
index 2976329..af659bc 100644
--- a/WebKit/chromium/src/BackForwardListClientImpl.cpp
+++ b/WebKit/chromium/src/BackForwardListClientImpl.cpp
@@ -84,14 +84,15 @@ void BackForwardListClientImpl::goToItem(HistoryItem* item)
m_pendingHistoryItem = 0;
}
-HistoryItem* BackForwardListClientImpl::currentItem()
-{
- return m_currentItem.get();
-}
-
HistoryItem* BackForwardListClientImpl::itemAtIndex(int index)
{
- if (!m_webView->client() || index > forwardListCount() || -index > backListCount())
+ if (!m_webView->client())
+ return 0;
+
+ if (!index)
+ return m_currentItem.get();
+
+ if (index > forwardListCount() || -index > backListCount())
return 0;
// Since we don't keep the entire back/forward list, we have no way to
diff --git a/WebKit/chromium/src/BackForwardListClientImpl.h b/WebKit/chromium/src/BackForwardListClientImpl.h
index 1d8beb0..38e37a4 100644
--- a/WebKit/chromium/src/BackForwardListClientImpl.h
+++ b/WebKit/chromium/src/BackForwardListClientImpl.h
@@ -50,7 +50,6 @@ private:
// WebCore::BackForwardListClient methods:
virtual void addItem(PassRefPtr<WebCore::HistoryItem>);
virtual void goToItem(WebCore::HistoryItem*);
- virtual WebCore::HistoryItem* currentItem();
virtual WebCore::HistoryItem* itemAtIndex(int index);
virtual int backListCount();
virtual int forwardListCount();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list