| Index: Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
|
| diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
|
| deleted file mode 100644
|
| index f75de124e26330570926e1b0bd4ed6ca7451574b..0000000000000000000000000000000000000000
|
| --- a/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
|
| +++ /dev/null
|
| @@ -1,86 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2011 Apple Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
|
| - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
| - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
|
| - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
| - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
| - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
| - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
| - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
| - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
| - * THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "JavaScriptTest.h"
|
| -#include "PlatformUtilities.h"
|
| -#include "PlatformWebView.h"
|
| -#include "Test.h"
|
| -
|
| -namespace TestWebKitAPI {
|
| -
|
| -static bool didFinishLoad;
|
| -
|
| -static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
|
| -{
|
| - didFinishLoad = true;
|
| -}
|
| -
|
| -static void setPageLoaderClient(WKPageRef page)
|
| -{
|
| - WKPageLoaderClient loaderClient;
|
| - memset(&loaderClient, 0, sizeof(loaderClient));
|
| - loaderClient.version = 0;
|
| - loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
|
| -
|
| - WKPageSetPageLoaderClient(page, &loaderClient);
|
| -}
|
| -
|
| -static WKRetainPtr<WKDataRef> createSessionStateContainingFormData(WKContextRef context)
|
| -{
|
| - PlatformWebView webView(context);
|
| - setPageLoaderClient(webView.page());
|
| -
|
| - WKPageLoadURL(webView.page(), adoptWK(Util::createURLForResource("simple-form", "html")).get());
|
| - Util::run(&didFinishLoad);
|
| - didFinishLoad = false;
|
| -
|
| - EXPECT_JS_EQ(webView.page(), "submitForm()", "undefined");
|
| - Util::run(&didFinishLoad);
|
| - didFinishLoad = false;
|
| -
|
| - return adoptWK(WKPageCopySessionState(webView.page(), 0, 0));
|
| -}
|
| -
|
| -TEST(WebKit2, RestoreSessionStateContainingFormData)
|
| -{
|
| - WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
|
| -
|
| - // FIXME: Once <rdar://problem/8708435> is fixed, we can move the creation of this
|
| - // PlatformWebView after the call to createSessionStaetContainingFormData. Until then, it must
|
| - // remain here to avoid a race condition between the UI and web processes.
|
| - PlatformWebView webView(context.get());
|
| - setPageLoaderClient(webView.page());
|
| -
|
| - WKRetainPtr<WKDataRef> data = createSessionStateContainingFormData(context.get());
|
| - EXPECT_NOT_NULL(data);
|
| -
|
| - WKPageRestoreFromSessionState(webView.page(), data.get());
|
| - Util::run(&didFinishLoad);
|
| -
|
| - EXPECT_TRUE(WKPageCanGoBack(webView.page()));
|
| -}
|
| -
|
| -} // namespace TestWebKitAPI
|
|
|