[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 11:26:37 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 56ae33e53022ce08144247a7880efdcc73f4a5db
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 16:41:58 2010 +0000

    2010-07-23  Justin Schuh  <jschuh at chromium.org>
    
            Unreviewed, rolling out r63925.
            http://trac.webkit.org/changeset/63925
            https://bugs.webkit.org/show_bug.cgi?id=42858
    
            Introduced a regression in history state.
    
            * page/History.cpp:
            (WebCore::History::urlForState):
    2010-07-23  Justin Schuh  <jschuh at chromium.org>
    
            Unreviewed, rolling out r63925.
            http://trac.webkit.org/changeset/63925
            https://bugs.webkit.org/show_bug.cgi?id=42858
    
            Introduced a regression in history state.
    
            * fast/history/history-replace-illegal-expected.txt: Removed.
            * fast/history/history-replace-illegal.html: Removed.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7b13fcb..e7450a2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-07-23  Justin Schuh  <jschuh at chromium.org>
 
+        Unreviewed, rolling out r63925.
+        http://trac.webkit.org/changeset/63925
+        https://bugs.webkit.org/show_bug.cgi?id=42858
+
+        Introduced a regression in history state.
+
+        * fast/history/history-replace-illegal-expected.txt: Removed.
+        * fast/history/history-replace-illegal.html: Removed.
+
+2010-07-23  Justin Schuh  <jschuh at chromium.org>
+
         Unreviewed, rolling out r63959.
         http://trac.webkit.org/changeset/63959
         https://bugs.webkit.org/show_bug.cgi?id=42884
diff --git a/LayoutTests/fast/history/history-replace-illegal-expected.txt b/LayoutTests/fast/history/history-replace-illegal-expected.txt
deleted file mode 100644
index 6103e11..0000000
--- a/LayoutTests/fast/history/history-replace-illegal-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: line 9: SECURITY_ERR: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
-This page should trigger an error on attempting to set the URL bar to https://www.test.com/
diff --git a/LayoutTests/fast/history/history-replace-illegal.html b/LayoutTests/fast/history/history-replace-illegal.html
deleted file mode 100644
index 25c7da1..0000000
--- a/LayoutTests/fast/history/history-replace-illegal.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<base href="https://www.test.com/">
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-window.onload = function(){
-    window.history.replaceState({}, {}, 'https://www.test.com/');
-};
-</script>
-</head>
-<body>
-This page should trigger an error on attempting to set the URL bar to https://www.test.com/
-</body>
-</html>
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 39445f4..2b67c0e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-23  Justin Schuh  <jschuh at chromium.org>
+
+        Unreviewed, rolling out r63925.
+        http://trac.webkit.org/changeset/63925
+        https://bugs.webkit.org/show_bug.cgi?id=42858
+
+        Introduced a regression in history state.
+
+        * page/History.cpp:
+        (WebCore::History::urlForState):
+
 2010-07-23  Martin Robinson  <mrobinson at igalia.com>
 
         Unreviewed build fix.
diff --git a/WebCore/page/History.cpp b/WebCore/page/History.cpp
index 0a9b9a1..78e8ea6 100644
--- a/WebCore/page/History.cpp
+++ b/WebCore/page/History.cpp
@@ -82,7 +82,7 @@ void History::go(int distance)
 
 KURL History::urlForState(const String& urlString)
 {
-    KURL baseURL = m_frame->document()->url();
+    KURL baseURL = m_frame->loader()->baseURL();
     if (urlString.isEmpty())
         return baseURL;
         

-- 
WebKit Debian packaging

