[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mihaip at chromium.org
mihaip at chromium.org
Wed Dec 22 18:09:28 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e5dbd3758614b8f28891aa1b3d9948d6bccc5445
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 8 02:32:41 2010 +0000
2010-11-29 Mihai Parparita <mihaip at chromium.org>
Reviewed by Adam Barth.
returning to a POST result within a frame does a GET instead of a POST
https://bugs.webkit.org/show_bug.cgi?id=10199
Re-enable postredirect-frames-goback1.html and post-frames-goback1.html
now that the big that made them be checked in disabled was fixed.
The tests were also re-written to not be pixel tests, since that just
adds extra per-platform baseline pain.
Add fast/history/history-back-initial-vs-final-url.html since there did
not appear to be any tests for whether we used the initial or final URL
of a frame's history item (and this patch changes it from the former to
the latter).
* fast/history/history-back-initial-vs-final-url-expected.txt: Added.
* fast/history/history-back-initial-vs-final-url.html: Added.
* fast/history/resources/frame-final-url.html: Added.
* fast/history/resources/frame-initial-url.html: Added.
* http/tests/navigation/post-frames-goback1-expected.txt: Added.
* http/tests/navigation/post-frames-goback1.html: Added.
* http/tests/navigation/post-frames-goback1.html-disabled: Removed.
* http/tests/navigation/post-frames.html:
* http/tests/navigation/postredirect-frames-goback1-expected.txt: Added.
* http/tests/navigation/postredirect-frames-goback1.html: Added.
* http/tests/navigation/postredirect-frames-goback1.html-disabled: Removed.
* http/tests/navigation/resources/form-target.pl:
* http/tests/navigation/resources/redirect-to-go-back.pl: Added.
* http/tests/navigation/resources/top-go-back.html: Added.
2010-11-29 Mihai Parparita <mihaip at chromium.org>
Reviewed by Adam Barth.
returning to a POST result within a frame does a GET instead of a POST
https://bugs.webkit.org/show_bug.cgi?id=10199
FrameLoader::loadURLIntoChildFrame had a check for whether a frame
had a HistoryItem, and if so used that item's URL. However, that did
not handle the case where the HistoryItem had FormData and thus was the
result of a POST request. FrameLoader::navigateToDifferentDocument (now
renamed to loadDifferentDocumentItem) does all that, so just switch to
using it instead.
Besides the bug fix, the only difference in behavior is that we use the
HistoryItem's URL instead of original URL when restoring it in a child
frame. This seems desirable too (for consistency with other browsers, and
so that we can avoid form double-submits for forms that that do
POST-then-redirect), and is tested by
fast/history/history-back-initial-vs-final-url.html.
Tests: fast/history/history-back-initial-vs-final-url.html
http/tests/navigation/post-frames-goback1.html
http/tests/navigation/postredirect-frames-goback1.html
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadURLIntoChildFrame): Switch to using
loadDifferentDocumentItem. Also cleaned up ordering slightly (if
on the archive path, there's no need to do any of the other checks).
(WebCore::FrameLoader::loadDifferentDocumentItem): Renamed from
navigateToDifferentDocument so that calling it from loadItem and
loadURLIntoChildFrame flows more easily.
(WebCore::FrameLoader::loadSameDocumentItem): Similarly, renamed from
navigateWithinDocument.
(WebCore::FrameLoader::loadItem): Update callsites to the above methods.
* loader/FrameLoader.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d0502b..a315039 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,36 @@
+2010-11-29 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ returning to a POST result within a frame does a GET instead of a POST
+ https://bugs.webkit.org/show_bug.cgi?id=10199
+
+ Re-enable postredirect-frames-goback1.html and post-frames-goback1.html
+ now that the big that made them be checked in disabled was fixed.
+
+ The tests were also re-written to not be pixel tests, since that just
+ adds extra per-platform baseline pain.
+
+ Add fast/history/history-back-initial-vs-final-url.html since there did
+ not appear to be any tests for whether we used the initial or final URL
+ of a frame's history item (and this patch changes it from the former to
+ the latter).
+
+ * fast/history/history-back-initial-vs-final-url-expected.txt: Added.
+ * fast/history/history-back-initial-vs-final-url.html: Added.
+ * fast/history/resources/frame-final-url.html: Added.
+ * fast/history/resources/frame-initial-url.html: Added.
+ * http/tests/navigation/post-frames-goback1-expected.txt: Added.
+ * http/tests/navigation/post-frames-goback1.html: Added.
+ * http/tests/navigation/post-frames-goback1.html-disabled: Removed.
+ * http/tests/navigation/post-frames.html:
+ * http/tests/navigation/postredirect-frames-goback1-expected.txt: Added.
+ * http/tests/navigation/postredirect-frames-goback1.html: Added.
+ * http/tests/navigation/postredirect-frames-goback1.html-disabled: Removed.
+ * http/tests/navigation/resources/form-target.pl:
+ * http/tests/navigation/resources/redirect-to-go-back.pl: Added.
+ * http/tests/navigation/resources/top-go-back.html: Added.
+
2010-12-07 Dan Bernstein <mitz at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt b/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt
new file mode 100644
index 0000000..5872195
--- /dev/null
+++ b/LayoutTests/fast/history/history-back-initial-vs-final-url-expected.txt
@@ -0,0 +1,22 @@
+ALERT: Initial URL loaded.
+ALERT: Final URL loaded.
+ALERT: Going back.
+ALERT: Final URL loaded.
+Checks that when going back to a page that frames that were navigated, that the final URL of the frames is loaded directly, instead the initial URL. Four alerts should appear, in this order:
+
+Initial URL loaded.
+Final URL loaded.
+Going back.
+Final URL loaded.
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+final page contents
+
+============== Back Forward List ==============
+curr-> (file test):fast/history/history-back-initial-vs-final-url.html **nav target**
+ (file test):fast/history/resources/frame-final-url.html (in frame "<!--framePath //<!--frame0-->-->")
+ data:text/html,%3Cscript%3Ealert(%22Going%20back.%22);history.back();%3C/script%3E **nav target**
+===============================================
diff --git a/LayoutTests/fast/history/history-back-initial-vs-final-url.html b/LayoutTests/fast/history/history-back-initial-vs-final-url.html
new file mode 100644
index 0000000..04055c5
--- /dev/null
+++ b/LayoutTests/fast/history/history-back-initial-vs-final-url.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<p>Checks that when going back to a page that frames that were navigated, that the final URL of the frames is loaded directly, instead the initial URL. Four alerts should appear, in this order:</p>
+
+<ol>
+ <li>Initial URL loaded.</li>
+ <li>Final URL loaded.</li>
+ <li>Going back.</li>
+ <li>Final URL loaded.</li>
+</ol>
+
+<iframe a width="200" height="200" onunload="" src="resources/frame-initial-url.html"></iframe>
+
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpBackForwardList();
+} else {
+ // Disable page cache when not running under the DRT.
+ onunload = function() {};
+}
+
+function runTest()
+{
+ if (sessionStorage.didNav) {
+ delete sessionStorage.didNav;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ } else {
+ // Navigate a timeout to make sure we generate a history entry that we can go back to.
+ setTimeout(function() {location.href = 'data:text/html,<script>alert("Going back.");history.back();</' + 'script>';}, 0);
+ sessionStorage.didNav = true;
+ }
+};
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/history/resources/frame-final-url.html b/LayoutTests/fast/history/resources/frame-final-url.html
new file mode 100644
index 0000000..33137ca
--- /dev/null
+++ b/LayoutTests/fast/history/resources/frame-final-url.html
@@ -0,0 +1,5 @@
+final page contents
+<script>
+alert('Final URL loaded.');
+top.runTest();
+</script>
\ No newline at end of file
diff --git a/LayoutTests/fast/history/resources/frame-initial-url.html b/LayoutTests/fast/history/resources/frame-initial-url.html
new file mode 100644
index 0000000..152bdf9
--- /dev/null
+++ b/LayoutTests/fast/history/resources/frame-initial-url.html
@@ -0,0 +1,5 @@
+initial frame contents
+<script>
+alert('Initial URL loaded.');
+window.location='frame-final-url.html';
+</script>
diff --git a/LayoutTests/http/tests/navigation/post-frames-goback1-expected.txt b/LayoutTests/http/tests/navigation/post-frames-goback1-expected.txt
new file mode 100644
index 0000000..951016a
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/post-frames-goback1-expected.txt
@@ -0,0 +1,19 @@
+Tests that a POST targetted to a frame is handled correctly when navigating away and coming back to the page.
+
+
+
+
+--------
+Frame: 'target-frame'
+--------
+This page was requested with the HTTP method POST.
+
+Parameters:
+
+the-input = input value goes here
+
+============== Back Forward List ==============
+curr-> http://127.0.0.1:8000/navigation/post-frames-goback1.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/form-target.pl (in frame "target-frame")
+ http://127.0.0.1:8000/navigation/resources/go-back.html **nav target**
+===============================================
diff --git a/LayoutTests/http/tests/navigation/post-frames-goback1.html b/LayoutTests/http/tests/navigation/post-frames-goback1.html
new file mode 100644
index 0000000..581d4f8
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/post-frames-goback1.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpBackForwardList();
+}
+
+onload = function()
+{
+ if (sessionStorage.didNav) {
+ delete sessionStorage.didNav;
+ delete sessionStorage.topShouldNavAndGoBack;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ } else {
+ sessionStorage.topShouldNavAndGoBack = true;
+ document.getElementById('the-form').submit();
+ }
+}
+
+</script>
+
+<p>Tests that a POST targetted to a frame is handled correctly when navigating away and coming back to the page.</p>
+
+<form id="the-form" method="POST" action="resources/form-target.pl" target="target-frame">
+ <input name="the-input" value="input value goes here">
+</form>
+
+<iframe name="target-frame" src="about:blank"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/http/tests/navigation/post-frames-goback1.html-disabled b/LayoutTests/http/tests/navigation/post-frames-goback1.html-disabled
deleted file mode 100644
index 7f8e796..0000000
--- a/LayoutTests/http/tests/navigation/post-frames-goback1.html-disabled
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript" src="resources/testcode.js"/>
-<script>
- runBackTest("resources/frameset.pl?frameURL=success200.html", 1, "post");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-
-<br>
-DISABLED due to http://bugzilla.opendarwin.org/show_bug.cgi?id=10199
diff --git a/LayoutTests/http/tests/navigation/post-frames.html b/LayoutTests/http/tests/navigation/post-frames.html
index 4a0b3d6..59d5c6c 100644
--- a/LayoutTests/http/tests/navigation/post-frames.html
+++ b/LayoutTests/http/tests/navigation/post-frames.html
@@ -3,7 +3,6 @@
layoutTestController.dumpAsText();
layoutTestController.dumpChildFramesAsText();
layoutTestController.waitUntilDone();
- layoutTestController.clearBackForwardList();
layoutTestController.dumpBackForwardList();
}
</script>
diff --git a/LayoutTests/http/tests/navigation/postredirect-frames-goback1-expected.txt b/LayoutTests/http/tests/navigation/postredirect-frames-goback1-expected.txt
new file mode 100644
index 0000000..cefcabd
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/postredirect-frames-goback1-expected.txt
@@ -0,0 +1,21 @@
+Tests the following sequence of events:
+
+Submit a form via POST to a frame (redirect-to-go-back.pl).
+Form page does a 302 to a static page (top-go-back.html), still within the frame.
+Static page does a top-level navigation to another static page (go-back.html)
+This static page goes back.
+We should end up showing the top-level page with the first static page inside the frame.
+
+
+
+
+--------
+Frame: 'target-frame'
+--------
+Target of redirect after POST request.
+
+============== Back Forward List ==============
+curr-> http://127.0.0.1:8000/navigation/postredirect-frames-goback1.html **nav target**
+ http://127.0.0.1:8000/navigation/resources/redirect-to-go-back.pl (in frame "target-frame")
+ http://127.0.0.1:8000/navigation/resources/go-back.html **nav target**
+===============================================
diff --git a/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html b/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html
new file mode 100644
index 0000000..96ed5d0
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpBackForwardList();
+ }
+
+onload = function()
+{
+ if (sessionStorage.didNav) {
+ delete sessionStorage.didNav;
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ } else {
+ document.getElementById('the-form').submit();
+ }
+}
+
+</script>
+
+<p>Tests the following sequence of events:</p>
+<ol>
+ <li>Submit a form via POST to a frame (redirect-to-go-back.pl).</li>
+ <li>Form page does a 302 to a static page (top-go-back.html), still within the frame.</li>
+ <li>Static page does a top-level navigation to another static page (go-back.html)</li>
+ <li>This static page goes back.</li>
+</ol>
+
+<p>We should end up showing the top-level page with the first static page inside the frame.</li>
+
+<form id="the-form" method="POST" action="resources/redirect-to-go-back.pl" target="target-frame">
+ <input name="the-input" value="input value goes here">
+</form>
+
+<iframe name="target-frame" src="about:blank"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html-disabled b/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html-disabled
deleted file mode 100644
index 2974202..0000000
--- a/LayoutTests/http/tests/navigation/postredirect-frames-goback1.html-disabled
+++ /dev/null
@@ -1,9 +0,0 @@
-<script type="text/javascript" src="resources/testcode.js"/>
-<script>
- runBackTest("resources/frameset.pl?frameURL=success200.html", 1, "postredirect");
-</script>
-This page just kicks off a test, and should not appear in the expected test output.
-
-<br>
-DISABLED due to http://bugzilla.opendarwin.org/show_bug.cgi?id=10199
-
diff --git a/LayoutTests/http/tests/navigation/resources/form-target.pl b/LayoutTests/http/tests/navigation/resources/form-target.pl
index 88887a1..200d032 100755
--- a/LayoutTests/http/tests/navigation/resources/form-target.pl
+++ b/LayoutTests/http/tests/navigation/resources/form-target.pl
@@ -41,6 +41,16 @@ if (sessionStorage.formTargetShouldNavAndGoBack) {
}
}
+if (sessionStorage.topShouldNavAndGoBack) {
+ if (!sessionStorage.didNav) {
+ isDone = false;
+ sessionStorage.didNav = true;
+ onload = function() {
+ setTimeout(function() {top.location.href = 'go-back.html'}, 0);
+ };
+ }
+}
+
if (isDone && window.layoutTestController)
layoutTestController.notifyDone();
diff --git a/LayoutTests/http/tests/navigation/resources/redirect-to-go-back.pl b/LayoutTests/http/tests/navigation/resources/redirect-to-go-back.pl
new file mode 100755
index 0000000..c3b4106
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/resources/redirect-to-go-back.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/perl
+# Simple script to generate a 302 HTTP redirect to a page that triggers a
+# navigation back (only if POST is used).
+
+use CGI;
+$query = new CGI;
+
+$method = $query->request_method();
+
+if ($method eq "POST") {
+ print "Status: 302 Moved Temporarily\r\n";
+ print "Location: top-go-back.html\r\n";
+ print "\r\n";
+} else {
+ print "Status: 405 Method not allowed\r\n";
+ print "Content-type: text/plain\r\n";
+ print "\r\n";
+ print "This should only be requested via POST ($method was used)."
+}
diff --git a/LayoutTests/http/tests/navigation/resources/top-go-back.html b/LayoutTests/http/tests/navigation/resources/top-go-back.html
new file mode 100644
index 0000000..2f9cfa7
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/resources/top-go-back.html
@@ -0,0 +1,9 @@
+Target of redirect after POST request.
+<script>
+ onload = function() {
+ if (!sessionStorage.didNav) {
+ sessionStorage.didNav = true;
+ setTimeout(function() {top.location.href = 'go-back.html'}, 0);
+ }
+ };
+</script>
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a1f8f6e..48995bb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,40 @@
+2010-11-29 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ returning to a POST result within a frame does a GET instead of a POST
+ https://bugs.webkit.org/show_bug.cgi?id=10199
+
+ FrameLoader::loadURLIntoChildFrame had a check for whether a frame
+ had a HistoryItem, and if so used that item's URL. However, that did
+ not handle the case where the HistoryItem had FormData and thus was the
+ result of a POST request. FrameLoader::navigateToDifferentDocument (now
+ renamed to loadDifferentDocumentItem) does all that, so just switch to
+ using it instead.
+
+ Besides the bug fix, the only difference in behavior is that we use the
+ HistoryItem's URL instead of original URL when restoring it in a child
+ frame. This seems desirable too (for consistency with other browsers, and
+ so that we can avoid form double-submits for forms that that do
+ POST-then-redirect), and is tested by
+ fast/history/history-back-initial-vs-final-url.html.
+
+ Tests: fast/history/history-back-initial-vs-final-url.html
+ http/tests/navigation/post-frames-goback1.html
+ http/tests/navigation/postredirect-frames-goback1.html
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadURLIntoChildFrame): Switch to using
+ loadDifferentDocumentItem. Also cleaned up ordering slightly (if
+ on the archive path, there's no need to do any of the other checks).
+ (WebCore::FrameLoader::loadDifferentDocumentItem): Renamed from
+ navigateToDifferentDocument so that calling it from loadItem and
+ loadURLIntoChildFrame flows more easily.
+ (WebCore::FrameLoader::loadSameDocumentItem): Similarly, renamed from
+ navigateWithinDocument.
+ (WebCore::FrameLoader::loadItem): Update callsites to the above methods.
+ * loader/FrameLoader.h:
+
2010-12-07 Dan Bernstein <mitz at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 0c79e0c..426f454 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -917,32 +917,24 @@ void FrameLoader::loadURLIntoChildFrame(const KURL& url, const String& referer,
{
ASSERT(childFrame);
- HistoryItem* parentItem = history()->currentItem();
- FrameLoadType loadType = this->loadType();
- FrameLoadType childLoadType = FrameLoadTypeRedirectWithLockedBackForwardList;
+ RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
+ if (subframeArchive) {
+ childFrame->loader()->loadArchive(subframeArchive.release());
+ return;
+ }
- KURL workingURL = url;
-
+ HistoryItem* parentItem = history()->currentItem();
// If we're moving in the back/forward list, we might want to replace the content
// of this child frame with whatever was there at that point.
- if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType)) {
+ if (parentItem && parentItem->children().size() && isBackForwardLoadType(loadType())) {
HistoryItem* childItem = parentItem->childItemWithTarget(childFrame->tree()->uniqueName());
if (childItem) {
- // Use the original URL to ensure we get all the side-effects, such as
- // onLoad handlers, of any redirects that happened. An example of where
- // this is needed is Radar 3213556.
- workingURL = KURL(ParsedURLString, childItem->originalURLString());
- childLoadType = loadType;
- childFrame->loader()->history()->setProvisionalItem(childItem);
+ childFrame->loader()->loadDifferentDocumentItem(childItem, loadType());
+ return;
}
}
- RefPtr<Archive> subframeArchive = activeDocumentLoader()->popArchiveForSubframe(childFrame->tree()->uniqueName());
-
- if (subframeArchive)
- childFrame->loader()->loadArchive(subframeArchive.release());
- else
- childFrame->loader()->loadURL(workingURL, referer, String(), false, childLoadType, 0, 0);
+ childFrame->loader()->loadURL(url, referer, String(), false, FrameLoadTypeRedirectWithLockedBackForwardList, 0, 0);
}
void FrameLoader::loadArchive(PassRefPtr<Archive> prpArchive)
@@ -3123,7 +3115,7 @@ Frame* FrameLoader::findFrameForNavigation(const AtomicString& name)
return frame;
}
-void FrameLoader::navigateWithinDocument(HistoryItem* item)
+void FrameLoader::loadSameDocumentItem(HistoryItem* item)
{
ASSERT(item->documentSequenceNumber() == history()->currentItem()->documentSequenceNumber());
@@ -3145,7 +3137,7 @@ void FrameLoader::navigateWithinDocument(HistoryItem* item)
// FIXME: This function should really be split into a couple pieces, some of
// which should be methods of HistoryController and some of which should be
// methods of FrameLoader.
-void FrameLoader::navigateToDifferentDocument(HistoryItem* item, FrameLoadType loadType)
+void FrameLoader::loadDifferentDocumentItem(HistoryItem* item, FrameLoadType loadType)
{
// Remember this item so we can traverse any child items as child frames load
history()->setProvisionalItem(item);
@@ -3248,9 +3240,9 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
#endif
if (sameDocumentNavigation)
- navigateWithinDocument(item);
+ loadSameDocumentItem(item);
else
- navigateToDifferentDocument(item, loadType);
+ loadDifferentDocumentItem(item, loadType);
}
void FrameLoader::setMainDocumentError(DocumentLoader* loader, const ResourceError& error)
diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h
index 483a84d..41a1615 100644
--- a/WebCore/loader/FrameLoader.h
+++ b/WebCore/loader/FrameLoader.h
@@ -336,8 +336,8 @@ public:
private:
void checkTimerFired(Timer<FrameLoader>*);
- void navigateWithinDocument(HistoryItem*);
- void navigateToDifferentDocument(HistoryItem*, FrameLoadType);
+ void loadSameDocumentItem(HistoryItem*);
+ void loadDifferentDocumentItem(HistoryItem*, FrameLoadType);
void loadProvisionalItemFromCachedPage();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list