Diff
Modified: trunk/LayoutTests/ChangeLog (160730 => 160731)
--- trunk/LayoutTests/ChangeLog 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/LayoutTests/ChangeLog 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1,3 +1,17 @@
+2013-12-17 Gavin Barraclough <[email protected]>
+
+ Remove PageVisibilityStateUnloaded
+ https://bugs.webkit.org/show_bug.cgi?id=125869
+
+ Reviewed by Anders Carlsson.
+
+ This is not currently supported by WebKit, remove this enum value.
+ We can always add this back later if/when we add support for this state.
+
+ * fast/events/page-visibility-transition-test-expected.txt:
+ * fast/events/page-visibility-transition-test.html:
+ - remove test for visibility state "unloaded"; this is no longer supported (it never really was).
+
2013-12-17 Alexey Proskuryakov <[email protected]>
Sanitize skip entries for pop-up menu tests.
Modified: trunk/LayoutTests/fast/events/page-visibility-transition-test-expected.txt (160730 => 160731)
--- trunk/LayoutTests/fast/events/page-visibility-transition-test-expected.txt 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/LayoutTests/fast/events/page-visibility-transition-test-expected.txt 2013-12-17 23:42:56 UTC (rev 160731)
@@ -13,10 +13,6 @@
PASS document.hidden is true
PASS document.visibilityState is "visible"
PASS document.hidden is false
-PASS document.visibilityState is "unloaded"
-PASS document.hidden is true
-PASS document.visibilityState is "visible"
-PASS document.hidden is false
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/events/page-visibility-transition-test.html (160730 => 160731)
--- trunk/LayoutTests/fast/events/page-visibility-transition-test.html 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/LayoutTests/fast/events/page-visibility-transition-test.html 2013-12-17 23:42:56 UTC (rev 160731)
@@ -95,16 +95,6 @@
} else if (numVisibilityChanges == 4) {
checkIsPageVisible();
numVisibilityChanges++;
- makePageUnloaded();
- return;
- } else if (numVisibilityChanges == 5) {
- checkIsPageInUnloaded();
- numVisibilityChanges++;
- makePageVisible();
- return;
- } else if (numVisibilityChanges == 6) {
- checkIsPageVisible();
- numVisibilityChanges++;
finishTest();
return;
} else {
Modified: trunk/Source/WebCore/ChangeLog (160730 => 160731)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1,3 +1,18 @@
+2013-12-17 Gavin Barraclough <[email protected]>
+
+ Remove PageVisibilityStateUnloaded
+ https://bugs.webkit.org/show_bug.cgi?id=125869
+
+ Reviewed by Anders Carlsson.
+
+ This is not currently supported by WebKit, remove this enum value.
+ We can always add this back later if/when we add support for this state.
+
+ * page/PageVisibilityState.cpp:
+ (WebCore::pageVisibilityStateString):
+ * page/PageVisibilityState.h:
+ - removed PageVisibilityStateUnloaded
+
2013-12-12 Martin Robinson <[email protected]>
[GTK] [CMake] Build the plugin process against GTK+ 2
Modified: trunk/Source/WebCore/page/PageVisibilityState.cpp (160730 => 160731)
--- trunk/Source/WebCore/page/PageVisibilityState.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebCore/page/PageVisibilityState.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -40,7 +40,6 @@
DEFINE_STATIC_LOCAL(const String, visible, (ASCIILiteral("visible")));
DEFINE_STATIC_LOCAL(const String, hidden, (ASCIILiteral("hidden")));
DEFINE_STATIC_LOCAL(const String, prerender, (ASCIILiteral("prerender")));
- DEFINE_STATIC_LOCAL(const String, unloaded, (ASCIILiteral("unloaded")));
switch (state) {
case PageVisibilityStateVisible:
@@ -49,8 +48,6 @@
return hidden;
case PageVisibilityStatePrerender:
return prerender;
- case PageVisibilityStateUnloaded:
- return unloaded;
}
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/page/PageVisibilityState.h (160730 => 160731)
--- trunk/Source/WebCore/page/PageVisibilityState.h 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebCore/page/PageVisibilityState.h 2013-12-17 23:42:56 UTC (rev 160731)
@@ -40,8 +40,7 @@
enum PageVisibilityState {
PageVisibilityStateVisible,
PageVisibilityStateHidden,
- PageVisibilityStatePrerender,
- PageVisibilityStateUnloaded
+ PageVisibilityStatePrerender
};
#if ENABLE(PAGE_VISIBILITY_API)
Modified: trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp (160730 => 160731)
--- trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit/efl/WebCoreSupport/AssertMatchingEnums.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -52,7 +52,6 @@
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_UNLOADED, PageVisibilityStateUnloaded);
#endif
COMPILE_ASSERT_MATCHING_ENUM(EWK_TEXT_SELECTION_NONE, VisibleSelection::NoSelection);
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (160730 => 160731)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -4250,6 +4250,10 @@
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
+ // WebKit does not curently support the "unloaded" state.
+ if (pageVisibilityState == EWK_PAGE_VISIBILITY_STATE_UNLOADED)
+ return false;
+
priv->page->setVisibilityState(static_cast<WebCore::PageVisibilityState>(pageVisibilityState), initialState);
return true;
Modified: trunk/Source/WebKit/mac/ChangeLog (160730 => 160731)
--- trunk/Source/WebKit/mac/ChangeLog 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1,3 +1,19 @@
+2013-12-17 Gavin Barraclough <[email protected]>
+
+ Remove PageVisibilityStateUnloaded
+ https://bugs.webkit.org/show_bug.cgi?id=125869
+
+ Reviewed by Anders Carlsson.
+
+ This is not currently supported by WebKit, remove this enum value.
+ We can always add this back later if/when we add support for this state.
+
+ * WebView/WebView.mm:
+ (core):
+ (kit):
+ * WebView/WebViewPrivate.h:
+ - removed PageVisibilityStateUnloaded/WebPageVisibilityStateUnloaded
+
2013-12-15 Andy Estes <[email protected]>
[iOS] Upstream changes to WebKit Public and Private headers
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (160730 => 160731)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-17 23:42:56 UTC (rev 160731)
@@ -435,8 +435,6 @@
return PageVisibilityStateHidden;
case WebPageVisibilityStatePrerender:
return PageVisibilityStatePrerender;
- case WebPageVisibilityStateUnloaded:
- return PageVisibilityStateUnloaded;
}
ASSERT_NOT_REACHED();
@@ -452,8 +450,6 @@
return WebPageVisibilityStateHidden;
case PageVisibilityStatePrerender:
return WebPageVisibilityStatePrerender;
- case PageVisibilityStateUnloaded:
- return WebPageVisibilityStateUnloaded;
}
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (160730 => 160731)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2013-12-17 23:42:56 UTC (rev 160731)
@@ -156,8 +156,7 @@
typedef enum {
WebPageVisibilityStateVisible,
WebPageVisibilityStateHidden,
- WebPageVisibilityStatePrerender,
- WebPageVisibilityStateUnloaded
+ WebPageVisibilityStatePrerender
} WebPageVisibilityState;
typedef enum {
Modified: trunk/Source/WebKit2/ChangeLog (160730 => 160731)
--- trunk/Source/WebKit2/ChangeLog 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1,3 +1,18 @@
+2013-12-17 Gavin Barraclough <[email protected]>
+
+ Remove PageVisibilityStateUnloaded
+ https://bugs.webkit.org/show_bug.cgi?id=125869
+
+ Reviewed by Anders Carlsson.
+
+ This is not currently supported by WebKit, remove this enum value.
+ We can always add this back later if/when we add support for this state.
+
+ * Shared/API/c/WKPageVisibilityTypes.h:
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toPageVisibilityState):
+ - removed PageVisibilityStateUnloaded/kWKPageVisibilityStateUnloaded
+
2013-12-12 Martin Robinson <[email protected]>
[GTK] [CMake] Build the plugin process against GTK+ 2
Modified: trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h (160730 => 160731)
--- trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h 2013-12-17 23:42:56 UTC (rev 160731)
@@ -35,8 +35,7 @@
enum {
kWKPageVisibilityStateVisible,
kWKPageVisibilityStateHidden,
- kWKPageVisibilityStatePrerender,
- kWKPageVisibilityStateUnloaded
+ kWKPageVisibilityStatePrerender
};
typedef uint32_t WKPageVisibilityState;
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160730 => 160731)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-17 23:42:56 UTC (rev 160731)
@@ -853,8 +853,6 @@
return WebCore::PageVisibilityStateHidden;
case kWKPageVisibilityStatePrerender:
return WebCore::PageVisibilityStatePrerender;
- case kWKPageVisibilityStateUnloaded:
- return WebCore::PageVisibilityStateUnloaded;
}
ASSERT_NOT_REACHED();
Modified: trunk/Tools/ChangeLog (160730 => 160731)
--- trunk/Tools/ChangeLog 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Tools/ChangeLog 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1,3 +1,21 @@
+2013-12-17 Gavin Barraclough <[email protected]>
+
+ Remove PageVisibilityStateUnloaded
+ https://bugs.webkit.org/show_bug.cgi?id=125869
+
+ Reviewed by Anders Carlsson.
+
+ This is not currently supported by WebKit, remove this enum value.
+ We can always add this back later if/when we add support for this state.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::setPageVisibility):
+ * TestWebKitAPI/Tests/WebKit2/PageVisibilityState.cpp:
+ (TestWebKitAPI::didRunStep3StateChangePrerenderToUnloaded):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setPageVisibility):
+ - remove test for visibility state "unloaded"; this is no longer supported (it never really was).
+
2013-12-12 Martin Robinson <[email protected]>
[GTK] [CMake] Build the plugin process against GTK+ 2
Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (160730 => 160731)
--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -817,8 +817,6 @@
ewk_view_visibility_state_set(browser->mainView(), EWK_PAGE_VISIBILITY_STATE_HIDDEN, false);
else if (newVisibility == "prerender")
ewk_view_visibility_state_set(browser->mainView(), EWK_PAGE_VISIBILITY_STATE_PRERENDER, false);
- else if (newVisibility == "unloaded")
- ewk_view_visibility_state_set(browser->mainView(), EWK_PAGE_VISIBILITY_STATE_UNLOADED, false);
}
void TestRunner::setAutomaticLinkDetectionEnabled(bool)
Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (160730 => 160731)
--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2013-12-17 23:42:56 UTC (rev 160731)
@@ -1075,8 +1075,6 @@
[webView _setVisibilityState:WebPageVisibilityStateHidden isInitialState:NO];
else if (!strcmp(newVisibility, "prerender"))
[webView _setVisibilityState:WebPageVisibilityStatePrerender isInitialState:NO];
- else if (!strcmp(newVisibility, "unloaded"))
- [webView _setVisibilityState:WebPageVisibilityStateUnloaded isInitialState:NO];
}
void TestRunner::grantWebNotificationPermission(JSStringRef jsOrigin)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageVisibilityState.cpp (160730 => 160731)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageVisibilityState.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/PageVisibilityState.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -38,7 +38,6 @@
static void didRunStep1StateChangeVisibleToHidden(WKSerializedScriptValueRef, WKErrorRef, void*);
static void didRunStep2StateChangeHiddenToPrerender(WKSerializedScriptValueRef, WKErrorRef, void*);
static void didRunStep3StateChangePrerenderToUnloaded(WKSerializedScriptValueRef, WKErrorRef, void*);
-static void didRunStep4InStateUnloaded(WKSerializedScriptValueRef, WKErrorRef, void*);
static void setPageVisibilityStateWithEvalContinuation(PlatformWebView* webView, WKPageVisibilityState visibilityState, WKPageRunJavaScriptFunction callback)
{
@@ -86,12 +85,6 @@
static void didRunStep3StateChangePrerenderToUnloaded(WKSerializedScriptValueRef resultSerializedScriptValue, WKErrorRef error, void* context)
{
assertSerializedScriptValueIsStringValue(resultSerializedScriptValue, error, "prerender");
- setPageVisibilityStateWithEvalContinuation(static_cast<PlatformWebView*>(context), kWKPageVisibilityStateUnloaded, didRunStep4InStateUnloaded);
-}
-
-static void didRunStep4InStateUnloaded(WKSerializedScriptValueRef resultSerializedScriptValue, WKErrorRef error, void* context)
-{
- assertSerializedScriptValueIsStringValue(resultSerializedScriptValue, error, "unloaded");
testDone = true;
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (160730 => 160731)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-12-17 23:30:04 UTC (rev 160730)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2013-12-17 23:42:56 UTC (rev 160731)
@@ -491,8 +491,6 @@
visibilityState = kWKPageVisibilityStateHidden;
else if (JSStringIsEqualToUTF8CString(state, "prerender"))
visibilityState = kWKPageVisibilityStatePrerender;
- else if (JSStringIsEqualToUTF8CString(state, "unloaded"))
- visibilityState = kWKPageVisibilityStateUnloaded;
InjectedBundle::shared().setVisibilityState(visibilityState, false);
}
