Add a "preview" state to Page Visibility API implementation

https://bugs.webkit.org/show_bug.cgi?id=81355

Patch by Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> on 2012-03-30
Reviewed by Adam Barth.

Updating the Page Visibility API implementation to the current spec version.

Source/WebCore:

This change is covered by fast/events/page-visibility-transition-test.html,
so no new tests needed.

* page/PageVisibilityState.cpp:
(WebCore::pageVisibilityStateString):
* page/PageVisibilityState.h:

Source/WebKit/chromium:

* public/WebPageVisibilityState.h:
* src/AssertMatchingEnums.cpp:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setVisibilityState):

Source/WebKit/efl:

* WebCoreSupport/AssertMatchingEnums.cpp:
* ewk/ewk_view.h:

Tools:

* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::setPageVisibility):

LayoutTests:

* fast/events/page-visibility-transition-test-expected.txt:
* fast/events/page-visibility-transition-test.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@112664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d20265a..2c05997 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-30  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add a "preview" state to Page Visibility API implementation
+        https://bugs.webkit.org/show_bug.cgi?id=81355
+
+        Reviewed by Adam Barth.
+
+        Updating the Page Visibility API implementation to the current spec version.
+
+        * fast/events/page-visibility-transition-test-expected.txt:
+        * fast/events/page-visibility-transition-test.html:
+
 2012-03-30  Alexander Pavlov  <apavlov@chromium.org>
 
         [Chromium] Unreviewed, updated fast/frames/valid.html expectation for LEOPARD.

diff --git a/LayoutTests/fast/events/page-visibility-transition-test-expected.txt b/LayoutTests/fast/events/page-visibility-transition-test-expected.txt
index c92665b..69ef86c 100644 (file)
--- a/LayoutTests/fast/events/page-visibility-transition-test-expected.txt
+++ b/LayoutTests/fast/events/page-visibility-transition-test-expected.txt
@@ -13,6 +13,10 @@ PASS document.webkitVisibilityState is "prerender"
 PASS document.webkitHidden is true
 PASS document.webkitVisibilityState is "visible"
 PASS document.webkitHidden is false
+PASS document.webkitVisibilityState is "preview"
+PASS document.webkitHidden is true
+PASS document.webkitVisibilityState is "visible"
+PASS document.webkitHidden is false
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/fast/events/page-visibility-transition-test.html b/LayoutTests/fast/events/page-visibility-transition-test.html
index 4aafa64..b0dd150 100644 (file)
--- a/LayoutTests/fast/events/page-visibility-transition-test.html
+++ b/LayoutTests/fast/events/page-visibility-transition-test.html
@@ -24,6 +24,11 @@ function makePagePrerender() {
         layoutTestController.setPageVisibility("prerender");
 }
 
+function makePagePreview() {
+    if (window.layoutTestController)
+        layoutTestController.setPageVisibility("preview");
+}
+
 function checkIsPageVisible() {
     shouldBeEqualToString("document.webkitVisibilityState", "visible");
     shouldBeFalse("document.webkitHidden");
@@ -39,12 +44,19 @@ function checkIsPagePrerendering() {
     shouldBeTrue("document.webkitHidden");
 }
 
+function checkIsPageInPreview() {
+    shouldBeEqualToString("document.webkitVisibilityState", "preview");
+    shouldBeTrue("document.webkitHidden");
+}
+
 // We will try to change the visibility states as:
 //  0 - visible. (Initial - i.e. on load).
 //  1 - hidden (should fire event).
 //  2 - hidden (no event).
 //  3 - prerender (should fire event).
 //  4 - visible (should fire event).
+//  5 - preview (should fire event).
+//  6 - visible (should fire event).
 var numVisibilityChanges = 0;
 
 function startTest() {
@@ -83,6 +95,16 @@ function onVisibilityChange() {
     } else if (numVisibilityChanges == 4) {
         checkIsPageVisible();
         numVisibilityChanges++;
+        makePagePreview();
+        return;
+    } else if (numVisibilityChanges == 5) {
+        checkIsPageInPreview();
+        numVisibilityChanges++;
+        makePageVisible();
+        return;
+    } else if (numVisibilityChanges == 6) {
+        checkIsPageVisible();
+        numVisibilityChanges++;
         finishTest();
         return;
     } else {

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f534032..a8cbcbb 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-30  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add a "preview" state to Page Visibility API implementation
+        https://bugs.webkit.org/show_bug.cgi?id=81355
+
+        Reviewed by Adam Barth.
+
+        Updating the Page Visibility API implementation to the current spec version.
+
+        This change is covered by fast/events/page-visibility-transition-test.html,
+        so no new tests needed.
+
+        * page/PageVisibilityState.cpp:
+        (WebCore::pageVisibilityStateString):
+        * page/PageVisibilityState.h:
+
 2012-03-30  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: [Regression] Execution line is not revealed after pretty print.

diff --git a/Source/WebCore/page/PageVisibilityState.cpp b/Source/WebCore/page/PageVisibilityState.cpp
index 09fa603..de1196e 100644 (file)
--- a/Source/WebCore/page/PageVisibilityState.cpp
+++ b/Source/WebCore/page/PageVisibilityState.cpp
@@ -40,6 +40,7 @@ String pageVisibilityStateString(PageVisibilityState state)
     DEFINE_STATIC_LOCAL(const String, visible, ("visible"));
     DEFINE_STATIC_LOCAL(const String, hidden, ("hidden"));
     DEFINE_STATIC_LOCAL(const String, prerender, ("prerender"));
+    DEFINE_STATIC_LOCAL(const String, preview, ("preview"));
 
     switch (state) {
     case PageVisibilityStateVisible:
@@ -48,6 +49,8 @@ String pageVisibilityStateString(PageVisibilityState state)
         return hidden;
     case PageVisibilityStatePrerender:
         return prerender;
+    case PageVisibilityStatePreview:
+        return preview;
     }
 
     ASSERT_NOT_REACHED();

diff --git a/Source/WebCore/page/PageVisibilityState.h b/Source/WebCore/page/PageVisibilityState.h
index 3fab2e4..5105540 100644 (file)
--- a/Source/WebCore/page/PageVisibilityState.h
+++ b/Source/WebCore/page/PageVisibilityState.h
@@ -40,7 +40,8 @@ namespace WebCore {
 enum PageVisibilityState {
     PageVisibilityStateVisible,
     PageVisibilityStateHidden,
-    PageVisibilityStatePrerender
+    PageVisibilityStatePrerender,
+    PageVisibilityStatePreview
 };
 
 #if ENABLE(PAGE_VISIBILITY_API)

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 00fda53..d5c6291 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-30  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add a "preview" state to Page Visibility API implementation
+        https://bugs.webkit.org/show_bug.cgi?id=81355
+
+        Reviewed by Adam Barth.
+
+        Updating the Page Visibility API implementation to the current spec version.
+
+        * public/WebPageVisibilityState.h:
+        * src/AssertMatchingEnums.cpp:
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setVisibilityState):
+
 2012-03-30  Keishi Hattori  <keishi@webkit.org>
 
         Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium

diff --git a/Source/WebKit/chromium/public/WebPageVisibilityState.h b/Source/WebKit/chromium/public/WebPageVisibilityState.h
index be7705c..8eb867f 100644 (file)
--- a/Source/WebKit/chromium/public/WebPageVisibilityState.h
+++ b/Source/WebKit/chromium/public/WebPageVisibilityState.h
@@ -38,7 +38,8 @@ namespace WebKit {
 enum WebPageVisibilityState {
     WebPageVisibilityStateVisible,
     WebPageVisibilityStateHidden,
-    WebPageVisibilityStatePrerender
+    WebPageVisibilityStatePrerender,
+    WebPageVisibilityStatePreview
 };
 
 } // namespace WebKit

diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
index 38c80b9..e22ddb6 100644 (file)
--- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -504,6 +504,7 @@ COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, Platfor
 COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateVisible, PageVisibilityStateVisible);
 COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateHidden, PageVisibilityStateHidden);
 COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStatePrerender, PageVisibilityStatePrerender);
+COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStatePreview, PageVisibilityStatePreview);
 
 #if ENABLE(MEDIA_STREAM)
 COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeAudio, MediaStreamSource::TypeAudio);

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 1b3ab58..c3825a1 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -3475,7 +3475,8 @@ void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
 #if ENABLE(PAGE_VISIBILITY_API)
     ASSERT(visibilityState == WebPageVisibilityStateVisible
            || visibilityState == WebPageVisibilityStateHidden
-           || visibilityState == WebPageVisibilityStatePrerender);
+           || visibilityState == WebPageVisibilityStatePrerender
+           || visibilityState == WebPageVisibilityStatePreview);
     m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 #endif
 

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index a1533bc..56b79e9 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-30  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add a "preview" state to Page Visibility API implementation
+        https://bugs.webkit.org/show_bug.cgi?id=81355
+
+        Reviewed by Adam Barth.
+
+        Updating the Page Visibility API implementation to the current spec version.
+
+        * WebCoreSupport/AssertMatchingEnums.cpp:
+        * ewk/ewk_view.h:
+
 2012-03-28  Nate Chapin  <japhet@chromium.org>
 
         Remove dispatchDidLoadMainResource callback, since no

diff --git a/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp b/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp
index 158cf01..4a49f5f 100644 (file)
--- a/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp
+++ b/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp
@@ -43,6 +43,7 @@
 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGE_VISIBILITY_STATE_VISIBLE, PageVisibilityStateVisible);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGE_VISIBILITY_STATE_HIDDEN, PageVisibilityStateHidden);
 COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGE_VISIBILITY_STATE_PRERENDER, PageVisibilityStatePrerender);
+COMPILE_ASSERT_MATCHING_ENUM(EWK_PAGE_VISIBILITY_STATE_PREVIEW, PageVisibilityStatePreview);
 #endif
 
 COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_SELECTION_NONE, VisibleSelection::NoSelection);

diff --git a/Source/WebKit/efl/ewk/ewk_view.h b/Source/WebKit/efl/ewk/ewk_view.h
index 1c53335..253978d 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_view.h
+++ b/Source/WebKit/efl/ewk/ewk_view.h
@@ -2262,7 +2262,8 @@ EAPI Eina_Bool ewk_view_js_object_add(Evas_Object *o, Ewk_JS_Object *obj, const
 enum _Ewk_Page_Visibility_State {
     EWK_PAGE_VISIBILITY_STATE_VISIBLE,
     EWK_PAGE_VISIBILITY_STATE_HIDDEN,
-    EWK_PAGE_VISIBILITY_STATE_PRERENDER
+    EWK_PAGE_VISIBILITY_STATE_PRERENDER,
+    EWK_PAGE_VISIBILITY_STATE_PREVIEW
 };
 /// Creates a type name for @a _Ewk_Page_Visibility_State.
 typedef enum _Ewk_Page_Visibility_State Ewk_Page_Visibility_State;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 31cd05a..52792ba 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-30  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Add a "preview" state to Page Visibility API implementation
+        https://bugs.webkit.org/show_bug.cgi?id=81355
+
+        Reviewed by Adam Barth.
+
+        Updating the Page Visibility API implementation to the current spec version.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::setPageVisibility):
+
 2012-03-30  Keishi Hattori  <keishi@webkit.org>
 
         Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium

diff --git a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
index 0baaede..226578b 100644 (file)
--- a/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/Tools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -2187,6 +2187,8 @@ void LayoutTestController::setPageVisibility(const CppArgumentList& arguments, C
             m_shell->webView()->setVisibilityState(WebPageVisibilityStateHidden, false);
         else if (newVisibility == "prerender")
             m_shell->webView()->setVisibilityState(WebPageVisibilityStatePrerender, false);
+        else if (newVisibility == "preview")
+            m_shell->webView()->setVisibilityState(WebPageVisibilityStatePreview, false);
     }
 }