From a3b4e82682f6d6e33d37d1047475658388ebcbb6 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Thu, 17 May 2012 12:30:11 +0000 Subject: [PATCH] [Qt][WK2] fast/events/page-visibility-* tests fail https://bugs.webkit.org/show_bug.cgi?id=83263 Patch by Hugo Parente Lima on 2012-05-17 Reviewed by Kenneth Rohde Christiansen. Tools: Handle "preview" state and avoid string conversion. * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: (WTR::LayoutTestController::setPageVisibility): LayoutTests: Unskip two page-visibility tests: iframe-propagation-test.html and transition-test.html. * platform/qt-5.0-wk2/Skipped: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117435 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 12 ++++++++++++ LayoutTests/platform/qt-5.0-wk2/Skipped | 2 -- Tools/ChangeLog | 12 ++++++++++++ .../WebKitTestRunner/InjectedBundle/LayoutTestController.cpp | 7 ++++--- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 828212a..30fb710 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,15 @@ +2012-05-17 Hugo Parente Lima + + [Qt][WK2] fast/events/page-visibility-* tests fail + https://bugs.webkit.org/show_bug.cgi?id=83263 + + Reviewed by Kenneth Rohde Christiansen. + + Unskip two page-visibility tests: iframe-propagation-test.html + and transition-test.html. + + * platform/qt-5.0-wk2/Skipped: + 2012-05-17 Csaba Osztrogonác [Qt] Unreviewed gardening, unksip one more now passing test. diff --git a/LayoutTests/platform/qt-5.0-wk2/Skipped b/LayoutTests/platform/qt-5.0-wk2/Skipped index 90e099b..54150b9 100644 --- a/LayoutTests/platform/qt-5.0-wk2/Skipped +++ b/LayoutTests/platform/qt-5.0-wk2/Skipped @@ -76,8 +76,6 @@ fast/loader/policy-delegate-action-hit-test-zoomed.html # Still failing after implementing layoutTestController.setPageVisibility() # https://bugs.webkit.org/show_bug.cgi?id=83263 fast/events/page-visibility-iframe-move-test.html -fast/events/page-visibility-iframe-propagation-test.html -fast/events/page-visibility-transition-test.html svg/custom/mouse-move-on-svg-container.xhtml svg/custom/mouse-move-on-svg-root-standalone.svg diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 683a647..7e0e3d2 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2012-05-17 Hugo Parente Lima + + [Qt][WK2] fast/events/page-visibility-* tests fail + https://bugs.webkit.org/show_bug.cgi?id=83263 + + Reviewed by Kenneth Rohde Christiansen. + + Handle "preview" state and avoid string conversion. + + * WebKitTestRunner/InjectedBundle/LayoutTestController.cpp: + (WTR::LayoutTestController::setPageVisibility): + 2012-05-17 Gyuyoung Kim Convert setDomainRelaxationForbiddenForURLScheme to use InternalSettings interface diff --git a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp index 9878258..32b09d5 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp +++ b/Tools/WebKitTestRunner/InjectedBundle/LayoutTestController.cpp @@ -545,13 +545,14 @@ void LayoutTestController::setShouldStayOnPageAfterHandlingBeforeUnload(bool sho void LayoutTestController::setPageVisibility(JSStringRef state) { - WKStringRef visibilityStateKey = toWK(state).get(); WebCore::PageVisibilityState visibilityState = WebCore::PageVisibilityStateVisible; - if (WKStringIsEqualToUTF8CString(visibilityStateKey, "hidden")) + if (JSStringIsEqualToUTF8CString(state, "hidden")) visibilityState = WebCore::PageVisibilityStateHidden; - else if (WKStringIsEqualToUTF8CString(visibilityStateKey, "prerender")) + else if (JSStringIsEqualToUTF8CString(state, "prerender")) visibilityState = WebCore::PageVisibilityStatePrerender; + else if (JSStringIsEqualToUTF8CString(state, "preview")) + visibilityState = WebCore::PageVisibilityStatePreview; WKBundleSetPageVisibilityState(InjectedBundle::shared().bundle(), InjectedBundle::shared().pageGroup(), visibilityState, /* isInitialState */ false); } -- 2.7.4