Commit 2f351093 authored by eric@webkit.org's avatar eric@webkit.org

2010-02-01 Diego Gonzalez <diego.gonzalez@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@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: svn://svn.chromium.org/blink/trunk@54155 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d62b6928
2010-02-01 Diego Gonzalez <diego.gonzalez@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@apple.com> 2010-02-01 Brian Weinstein <bweinstein@apple.com>
Rubber-stamped by Oliver Hunt. Rubber-stamped by Oliver Hunt.
......
...@@ -4869,15 +4869,6 @@ http/tests/misc/window-dot-stop.html ...@@ -4869,15 +4869,6 @@ http/tests/misc/window-dot-stop.html
# Skip failing http/tests/security tests # Skip failing http/tests/security tests
http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW.html 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/cross-frame-access-put.html
http/tests/security/dataTransfer-set-data-file-url.html http/tests/security/dataTransfer-set-data-file-url.html
http/tests/security/drag-over-remote-content-iframe.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 ...@@ -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/XFrameOptions/x-frame-options-parent-same-origin-deny.html
http/tests/security/aboutBlank/security-context-alias.html http/tests/security/aboutBlank/security-context-alias.html
http/tests/security/aboutBlank/security-context-window-open.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/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-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/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-plugin-navigation.html
http/tests/security/frameNavigation/xss-DENIED-targeted-link-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 http/tests/security/originHeader/origin-header-for-empty.html
# XSSAuditor test that times out. See https://bugs.webkit.org/show_bug.cgi?id=33460. # 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 ...@@ -5014,12 +4979,7 @@ fast/css/namespaces/namespaces-empty.xml
fast/dom/javascript-url-crash-function.html fast/dom/javascript-url-crash-function.html
fast/dom/location-new-window-no-crash.html fast/dom/location-new-window-no-crash.html
inspector/console-clear.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-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 # This test requires ogg codecs
media/media-can-play-ogg.html media/media-can-play-ogg.html
...@@ -5036,7 +4996,6 @@ fast/repaint/inline-overflow.html ...@@ -5036,7 +4996,6 @@ fast/repaint/inline-overflow.html
fast/repaint/inline-relative-positioned.html fast/repaint/inline-relative-positioned.html
http/tests/local/file-url-sent-as-referer.html http/tests/local/file-url-sent-as-referer.html
http/tests/misc/bubble-drag-events.html http/tests/misc/bubble-drag-events.html
http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html
http/tests/uri/css-href.php http/tests/uri/css-href.php
printing/compositing-layer-printing.html printing/compositing-layer-printing.html
svg/css/composite-shadow-example.html svg/css/composite-shadow-example.html
......
2010-02-01 Diego Gonzalez <diego.gonzalez@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@apple.com> 2010-02-01 Brady Eidson <beidson@apple.com>
Reviewed by Adele Peterson. Reviewed by Adele Peterson.
......
...@@ -73,6 +73,7 @@ void LayoutTestController::reset() ...@@ -73,6 +73,7 @@ void LayoutTestController::reset()
m_waitForPolicy = false; m_waitForPolicy = false;
m_handleErrorPages = false; m_handleErrorPages = false;
m_webHistory = 0; m_webHistory = 0;
m_globalFlag = false;
qt_dump_editing_callbacks(false); qt_dump_editing_callbacks(false);
qt_dump_resource_load_callbacks(false); qt_dump_resource_load_callbacks(false);
emit hidePage(); emit hidePage();
......
...@@ -53,6 +53,7 @@ class LayoutTestController : public QObject { ...@@ -53,6 +53,7 @@ class LayoutTestController : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount) Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
Q_PROPERTY(int workerThreadCount READ workerThreadCount) Q_PROPERTY(int workerThreadCount READ workerThreadCount)
Q_PROPERTY(bool globalFlag READ globalFlag WRITE setGlobalFlag)
public: public:
LayoutTestController(WebCore::DumpRenderTree* drt); LayoutTestController(WebCore::DumpRenderTree* drt);
...@@ -91,6 +92,8 @@ public slots: ...@@ -91,6 +92,8 @@ public slots:
void keepWebHistory(); void keepWebHistory();
void notifyDone(); void notifyDone();
void dumpBackForwardList() { m_dumpBackForwardList = true; } void dumpBackForwardList() { m_dumpBackForwardList = true; }
bool globalFlag() const { return m_globalFlag; }
void setGlobalFlag(bool flag) { m_globalFlag = flag; }
void handleErrorPages() { m_handleErrorPages = true; } void handleErrorPages() { m_handleErrorPages = true; }
void dumpEditingCallbacks(); void dumpEditingCallbacks();
void dumpResourceLoadCallbacks(); void dumpResourceLoadCallbacks();
...@@ -160,6 +163,7 @@ private: ...@@ -160,6 +163,7 @@ private:
bool m_waitForPolicy; bool m_waitForPolicy;
bool m_handleErrorPages; bool m_handleErrorPages;
bool m_loadFinished; bool m_loadFinished;
bool m_globalFlag;
QUrl m_userStyleSheetLocation; QUrl m_userStyleSheetLocation;
QBasicTimer m_timeoutTimer; QBasicTimer m_timeoutTimer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment