[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
robert at webkit.org
robert at webkit.org
Sun Feb 20 23:38:33 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 852ab546a26baed92a9ec19bcaf9ef2521bbbda6
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 22 17:27:34 2011 +0000
2011-01-22 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Support layoutTestController.addURLToRedirect()
https://bugs.webkit.org/show_bug.cgi?id=52956
* platform/qt/Skipped:
2011-01-22 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Support layoutTestController.addURLToRedirect()
https://bugs.webkit.org/show_bug.cgi?id=52956
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
(DumpRenderTreeSupportQt::addURLToRedirect):
* WebCoreSupport/DumpRenderTreeSupportQt.h:
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
* WebCoreSupport/FrameLoaderClientQt.h:
2011-01-22 Robert Hogan <robert at webkit.org>
Reviewed by Andreas Kling.
[Qt] Support layoutTestController.addURLToRedirect()
https://bugs.webkit.org/show_bug.cgi?id=52956
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::addURLToRedirect):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76451 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 43f3442..41bcd93 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-22 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Support layoutTestController.addURLToRedirect()
+ https://bugs.webkit.org/show_bug.cgi?id=52956
+
+ * platform/qt/Skipped:
+
2011-01-22 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index da14d71..a13523a 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -784,9 +784,6 @@ fast/ruby/rubyDOM-remove-rt2.html
fast/ruby/rubyDOM-remove-text1.html
fast/ruby/rubyDOM-remove-text2.html
-# ------- not obeying layoutTestController.addURLToRedirect()
-http/tests/loading/cross-origin-XHR-willLoadRequest.html
-
# ============================================================================= #
# Failing SVG tests
# ============================================================================= #
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index aec5b45..dff8935 100644
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-22 Robert Hogan <robert at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Support layoutTestController.addURLToRedirect()
+ https://bugs.webkit.org/show_bug.cgi?id=52956
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::addURLToRedirect):
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
+ * WebCoreSupport/FrameLoaderClientQt.h:
+
2011-01-21 Sam Weinig <sam at webkit.org>
Reviewed by Anders Carlsson.
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index a7a495a..974cf0a 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -893,6 +893,11 @@ QString DumpRenderTreeSupportQt::responseMimeType(QWebFrame* frame)
return docLoader->responseMIMEType();
}
+void DumpRenderTreeSupportQt::addURLToRedirect(const QString& origin, const QString& destination)
+{
+ FrameLoaderClientQt::URLsToRedirect[origin] = destination;
+}
+
// Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
void QWEBKIT_EXPORT qt_resumeActiveDOMObjects(QWebFrame* frame)
diff --git a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index dd84e76..34bed6f 100644
--- a/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -185,6 +185,7 @@ public:
static QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
static QString responseMimeType(QWebFrame*);
+ static void addURLToRedirect(const QString& origin, const QString& destination);
};
#endif
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 474b768..2078aa7 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -180,6 +180,7 @@ QStringList FrameLoaderClientQt::sendRequestClearHeaders;
QString FrameLoaderClientQt::dumpResourceLoadCallbacksPath;
bool FrameLoaderClientQt::policyDelegateEnabled = false;
bool FrameLoaderClientQt::policyDelegatePermissive = false;
+QMap<QString, QString> FrameLoaderClientQt::URLsToRedirect = QMap<QString, QString>();
// Taken from DumpRenderTree/chromium/WebViewHost.cpp
static const char* navigationTypeToString(NavigationType type)
@@ -1021,6 +1022,11 @@ void FrameLoaderClientQt::dispatchWillSendRequest(WebCore::DocumentLoader*, unsi
for (int i = 0; i < sendRequestClearHeaders.size(); ++i)
newRequest.setHTTPHeaderField(sendRequestClearHeaders.at(i).toLocal8Bit().constData(), QString());
+ if (QWebPagePrivate::drtRun) {
+ QString url = newRequest.url().string();
+ if (URLsToRedirect.contains(url))
+ newRequest.setURL(QUrl(URLsToRedirect[url]));
+ }
// seems like the Mac code doesn't do anything here by default neither
//qDebug() << "FrameLoaderClientQt::dispatchWillSendRequest" << request.isNull() << request.url().string`();
}
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
index 3d93eaf..b43fb39 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
@@ -250,6 +250,7 @@ public:
static bool policyDelegatePermissive;
static bool deferMainResourceDataLoad;
static bool dumpHistoryCallbacks;
+ static QMap<QString, QString> URLsToRedirect;
private:
Frame *m_frame;
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index bdf5d86..f19bb75 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
2011-01-22 Robert Hogan <robert at webkit.org>
+ Reviewed by Andreas Kling.
+
+ [Qt] Support layoutTestController.addURLToRedirect()
+ https://bugs.webkit.org/show_bug.cgi?id=52956
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::addURLToRedirect):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
+2011-01-22 Robert Hogan <robert at webkit.org>
+
Reviewed by Kenneth Rohde Christiansen.
[Qt] REGRESSION (r72360): http/tests/security/aboutBlank/xss-DENIED-* tests fail
diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 56406c2..531766b 100644
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -830,5 +830,10 @@ QVariantList LayoutTestController::nodesFromRect(const QWebElement& document, in
return DumpRenderTreeSupportQt::nodesFromRect(document, x, y, top, right, bottom, left, ignoreClipping);
}
+void LayoutTestController::addURLToRedirect(const QString& origin, const QString& destination)
+{
+ DumpRenderTreeSupportQt::addURLToRedirect(origin, destination);
+}
+
const unsigned LayoutTestController::maxViewWidth = 800;
const unsigned LayoutTestController::maxViewHeight = 600;
diff --git a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 0048a7e..bc62c51 100644
--- a/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -230,6 +230,8 @@ public slots:
QVariantList nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping);
+ void addURLToRedirect(const QString& origin, const QString& destination);
+
/*
Policy values: 'on', 'auto' or 'off'.
Orientation values: 'vertical' or 'horizontal'.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list