[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:35:43 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ff8636743e6bca45db6eb9022ff57803d6f39abb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Feb 1 23:19:03 2010 +0000
2010-02-01 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] DRT Provide global flag ability
https://bugs.webkit.org/show_bug.cgi?id=34418
Add the globalFlag property to the Qt LayoutTestController to allow
cross-domain indications.
* platform/qt/Skipped:
2010-02-01 Diego Gonzalez <diego.gonzalez at openbossa.org>
Reviewed by Kenneth Rohde Christiansen.
[Qt] DRT Provide global flag ability
https://bugs.webkit.org/show_bug.cgi?id=34418
Add the globalFlag property to the Qt LayoutTestController to allow
cross-domain indications.
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::reset):
* DumpRenderTree/qt/LayoutTestControllerQt.h:
(LayoutTestController::globalFlag):
(LayoutTestController::setGlobalFlag):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54155 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7c7608b..7a393d4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-01 Diego Gonzalez <diego.gonzalez at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] DRT Provide global flag ability
+ https://bugs.webkit.org/show_bug.cgi?id=34418
+
+ Add the globalFlag property to the Qt LayoutTestController to allow
+ cross-domain indications.
+
+ * platform/qt/Skipped:
+
2010-02-01 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Oliver Hunt.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 931bcf2..b691eda 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -4869,15 +4869,6 @@ http/tests/misc/window-dot-stop.html
# Skip failing http/tests/security tests
http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW.html
-http/tests/security/cross-frame-access-enumeration.html
-http/tests/security/cross-frame-access-get-custom-property-cached.html
-http/tests/security/cross-frame-access-get-override.html
-http/tests/security/cross-frame-access-get.html
-http/tests/security/cross-frame-access-history-get-override.html
-http/tests/security/cross-frame-access-history-get.html
-http/tests/security/cross-frame-access-location-get-override.html
-http/tests/security/cross-frame-access-location-get.html
-http/tests/security/cross-frame-access-private-browsing.html
http/tests/security/cross-frame-access-put.html
http/tests/security/dataTransfer-set-data-file-url.html
http/tests/security/drag-over-remote-content-iframe.html
@@ -4893,37 +4884,11 @@ http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-allow.html
http/tests/security/XFrameOptions/x-frame-options-parent-same-origin-deny.html
http/tests/security/aboutBlank/security-context-alias.html
http/tests/security/aboutBlank/security-context-window-open.html
-http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html
http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url.html
-http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame.html
-http/tests/security/dataURL/xss-DENIED-from-data-url-to-data-url.html
-http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe-location-change.html
-http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-subframe.html
-http/tests/security/dataURL/xss-DENIED-to-data-url-in-foreign-domain-window-open.html
-http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-2-level.html
http/tests/security/dataURL/xss-DENIED-to-data-url-sub-frame-uppercase.html
-http/tests/security/dataURL/xss-DENIED-to-data-url-window-open.html
http/tests/security/frameNavigation/not-opener.html
-http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change.html
http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html
http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-location-htmldom.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-getAttribute-value.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-htmldom.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-setAttribute.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-setAttributeNS.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-setAttributeNode.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-frame-src-setAttributeNodeNS.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-getAttribute-value.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-htmldom.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-setAttribute.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-setAttributeNS.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-setAttributeNode.html
-http/tests/security/javascriptURL/javascriptURL-execution-context-iframe-src-setAttributeNodeNS.html
-http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level.html
-http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-window-open.html
-http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-subframe.html
-http/tests/security/javascriptURL/xss-DENIED-to-javascript-url-in-foreign-domain-window-open.html
http/tests/security/originHeader/origin-header-for-empty.html
# XSSAuditor test that times out. See https://bugs.webkit.org/show_bug.cgi?id=33460.
@@ -5014,12 +4979,7 @@ fast/css/namespaces/namespaces-empty.xml
fast/dom/javascript-url-crash-function.html
fast/dom/location-new-window-no-crash.html
inspector/console-clear.html
-http/tests/misc/set-window-opener-to-null.html
-http/tests/security/aboutBlank/xss-DENIED-set-opener.html
-http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-window-open.html
-http/tests/security/dataURL/xss-DENIED-from-javascript-url-window-open.html
http/tests/security/javascriptURL/xss-ALLOWED-from-javascript-url-window-open.html
-http/tests/security/javascriptURL/xss-DENIED-from-javascript-url-in-foreign-domain-window-open.html
# This test requires ogg codecs
media/media-can-play-ogg.html
@@ -5036,7 +4996,6 @@ fast/repaint/inline-overflow.html
fast/repaint/inline-relative-positioned.html
http/tests/local/file-url-sent-as-referer.html
http/tests/misc/bubble-drag-events.html
-http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html
http/tests/uri/css-href.php
printing/compositing-layer-printing.html
svg/css/composite-shadow-example.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ac68118..7392830 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-01 Diego Gonzalez <diego.gonzalez at openbossa.org>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] DRT Provide global flag ability
+ https://bugs.webkit.org/show_bug.cgi?id=34418
+
+ Add the globalFlag property to the Qt LayoutTestController to allow
+ cross-domain indications.
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::reset):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+ (LayoutTestController::globalFlag):
+ (LayoutTestController::setGlobalFlag):
+
2010-02-01 Brady Eidson <beidson at apple.com>
Reviewed by Adele Peterson.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 9430ec7..ca48003 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -73,6 +73,7 @@ void LayoutTestController::reset()
m_waitForPolicy = false;
m_handleErrorPages = false;
m_webHistory = 0;
+ m_globalFlag = false;
qt_dump_editing_callbacks(false);
qt_dump_resource_load_callbacks(false);
emit hidePage();
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 64b3a15..365640d 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -53,6 +53,7 @@ class LayoutTestController : public QObject {
Q_OBJECT
Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
Q_PROPERTY(int workerThreadCount READ workerThreadCount)
+ Q_PROPERTY(bool globalFlag READ globalFlag WRITE setGlobalFlag)
public:
LayoutTestController(WebCore::DumpRenderTree* drt);
@@ -91,6 +92,8 @@ public slots:
void keepWebHistory();
void notifyDone();
void dumpBackForwardList() { m_dumpBackForwardList = true; }
+ bool globalFlag() const { return m_globalFlag; }
+ void setGlobalFlag(bool flag) { m_globalFlag = flag; }
void handleErrorPages() { m_handleErrorPages = true; }
void dumpEditingCallbacks();
void dumpResourceLoadCallbacks();
@@ -160,6 +163,7 @@ private:
bool m_waitForPolicy;
bool m_handleErrorPages;
bool m_loadFinished;
+ bool m_globalFlag;
QUrl m_userStyleSheetLocation;
QBasicTimer m_timeoutTimer;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list