[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
robert at webkit.org
robert at webkit.org
Wed Dec 22 14:14:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 50ece61da1875f031f53cabb922d954a70cd74bf
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 5 19:01:15 2010 +0000
2010-10-05 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Fix url conversion in QWebHistory
Converting from KURL to WFT::String to QUrl does not
permit proper percent encoding later.
Unskp tests that now pass:
http/tests/navigation/postredirect-goback2.html
http/tests/navigation/error404-frames.html
http/tests/navigation/post-basic.html
http/tests/navigation/post-frames.html
http/tests/navigation/post-goback1.html
http/tests/navigation/anchor-frames.html
These produce only rendertree differences with '--platform mac'.
Unskipping so we can get Qt-specific results from bot:
http/tests/navigation/error404-basic.html
http/tests/navigation/error404-goback.html
http/tests/navigation/error404-subframeload.html
http/tests/navigation/javascriptlink-frames.html
http/tests/navigation/postredirect-basic.html
http/tests/navigation/postredirect-frames.html
http/tests/navigation/postredirect-goback1.html
https://bugs.webkit.org/show_bug.cgi?id=47048
* platform/qt/Skipped:
2010-10-05 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Fix url conversion in QWebHistory
Converting from KURL to WFT::String to QUrl does not
permit proper percent encoding later.
https://bugs.webkit.org/show_bug.cgi?id=47048
* Api/qwebhistory.cpp:
(QWebHistoryItem::originalUrl):
(QWebHistoryItem::url):
2010-10-05 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Fix url conversion in QWebHistory
Converting from KURL to WFT::String to QUrl does not
permit proper percent encoding later.
https://bugs.webkit.org/show_bug.cgi?id=47048
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::dumpHistoryItem):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 11baf4f..5db5318 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,34 @@
+2010-10-05 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix url conversion in QWebHistory
+
+ Converting from KURL to WFT::String to QUrl does not
+ permit proper percent encoding later.
+
+ Unskp tests that now pass:
+ http/tests/navigation/postredirect-goback2.html
+ http/tests/navigation/error404-frames.html
+ http/tests/navigation/post-basic.html
+ http/tests/navigation/post-frames.html
+ http/tests/navigation/post-goback1.html
+ http/tests/navigation/anchor-frames.html
+
+ These produce only rendertree differences with '--platform mac'.
+ Unskipping so we can get Qt-specific results from bot:
+ http/tests/navigation/error404-basic.html
+ http/tests/navigation/error404-goback.html
+ http/tests/navigation/error404-subframeload.html
+ http/tests/navigation/javascriptlink-frames.html
+ http/tests/navigation/postredirect-basic.html
+ http/tests/navigation/postredirect-frames.html
+ http/tests/navigation/postredirect-goback1.html
+
+ https://bugs.webkit.org/show_bug.cgi?id=47048
+
+ * platform/qt/Skipped:
+
2010-10-05 Tony Chang <tony at chromium.org>
Unreviewed, updating chromium linux baselines after landing r69126
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3db02b1..c10b471 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -214,23 +214,6 @@ http/tests/navigation/target-frame-from-window.html
http/tests/navigation/no-referrer-reset.html
http/tests/navigation/no-referrer-target-blank.html
-# requires correct URL encoding - webkit.org/b/47048
-http/tests/navigation/postredirect-goback2.html
-
-#new - no expected results
-http/tests/navigation/anchor-frames.html
-http/tests/navigation/error404-basic.html
-http/tests/navigation/error404-frames.html
-http/tests/navigation/error404-goback.html
-http/tests/navigation/error404-subframeload.html
-http/tests/navigation/javascriptlink-frames.html
-http/tests/navigation/post-basic.html
-http/tests/navigation/post-frames.html
-http/tests/navigation/post-goback1.html
-http/tests/navigation/postredirect-basic.html
-http/tests/navigation/postredirect-frames.html
-http/tests/navigation/postredirect-goback1.html
-
# time out
http/tests/multipart/invalid-image-data.html
http/tests/multipart/invalid-image-data-standalone.html
diff --git a/WebKit/qt/Api/qwebhistory.cpp b/WebKit/qt/Api/qwebhistory.cpp
index 1d9935d..25d77a4 100644
--- a/WebKit/qt/Api/qwebhistory.cpp
+++ b/WebKit/qt/Api/qwebhistory.cpp
@@ -103,7 +103,7 @@ QWebHistoryItem::~QWebHistoryItem()
QUrl QWebHistoryItem::originalUrl() const
{
if (d->item)
- return QUrl(d->item->originalURL().string());
+ return d->item->originalURL();
return QUrl();
}
@@ -116,7 +116,7 @@ QUrl QWebHistoryItem::originalUrl() const
QUrl QWebHistoryItem::url() const
{
if (d->item)
- return QUrl(d->item->url().string());
+ return d->item->url();
return QUrl();
}
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 41aad33..69df521 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-05 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix url conversion in QWebHistory
+
+ Converting from KURL to WFT::String to QUrl does not
+ permit proper percent encoding later.
+
+ https://bugs.webkit.org/show_bug.cgi?id=47048
+
+ * Api/qwebhistory.cpp:
+ (QWebHistoryItem::originalUrl):
+ (QWebHistoryItem::url):
+
2010-10-05 Jakob Petsovits <jpetsovits at rim.com>
Reviewed by Andreas Kling.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f28b522..805a89b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-05 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix url conversion in QWebHistory
+
+ Converting from KURL to WFT::String to QUrl does not
+ permit proper percent encoding later.
+
+ https://bugs.webkit.org/show_bug.cgi?id=47048
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::dumpHistoryItem):
+
2010-10-05 Anders Carlsson <andersca at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 52cfe46..e2363b1 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -830,7 +830,7 @@ static QString dumpHistoryItem(const QWebHistoryItem& item, int indent, bool cur
for (int i = start; i < indent; i++)
result.append(' ');
- QString url = item.url().toString();
+ QString url = item.url().toEncoded();
if (url.contains("file://")) {
static QString layoutTestsString("/LayoutTests/");
static QString fileTestString("(file test):");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list