| Index: Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm
|
| diff --git a/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm b/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm
|
| deleted file mode 100644
|
| index 154b8c32c0d060d6cedb741560e2deece7130437..0000000000000000000000000000000000000000
|
| --- a/Tools/TestWebKitAPI/Tests/mac/DeviceScaleFactorOnBack.mm
|
| +++ /dev/null
|
| @@ -1,109 +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 "WebKitAgnosticTest.h"
|
| -
|
| -#include "JavaScriptTest.h"
|
| -#include "PlatformUtilities.h"
|
| -#include "SyntheticBackingScaleFactorWindow.h"
|
| -#include <WebKit2/WKViewPrivate.h>
|
| -#include <wtf/RetainPtr.h>
|
| -
|
| -namespace TestWebKitAPI {
|
| -
|
| -class DeviceScaleFactorOnBack : public WebKitAgnosticTest {
|
| -public:
|
| - RetainPtr<SyntheticBackingScaleFactorWindow> createWindow();
|
| -
|
| - template <typename View> void runTest(View);
|
| -
|
| - // WebKitAgnosticTest
|
| - virtual NSURL *url() const { return [[NSBundle mainBundle] URLForResource:@"devicePixelRatio" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]; }
|
| - virtual void didLoadURL(WebView *webView) { runTest(webView); }
|
| - virtual void didLoadURL(WKView *wkView) { runTest(wkView); }
|
| - virtual void initializeView(WebView *);
|
| - virtual void initializeView(WKView *);
|
| -};
|
| -
|
| -RetainPtr<SyntheticBackingScaleFactorWindow> DeviceScaleFactorOnBack::createWindow()
|
| -{
|
| - RetainPtr<SyntheticBackingScaleFactorWindow> window(AdoptNS, [[SyntheticBackingScaleFactorWindow alloc] initWithContentRect:viewFrame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES]);
|
| - [window.get() setReleasedWhenClosed:NO];
|
| - return window;
|
| -}
|
| -
|
| -void DeviceScaleFactorOnBack::initializeView(WebView *view)
|
| -{
|
| - // The default cache model has a capacity of 0, so it is necessary to switch to a cache
|
| - // model that actuall caches things.
|
| - [[view preferences] setCacheModel:WebCacheModelDocumentBrowser];
|
| -}
|
| -
|
| -void DeviceScaleFactorOnBack::initializeView(WKView *view)
|
| -{
|
| - // The default cache model has a capacity of 0, so it is necessary to switch to a cache
|
| - // model that actuall caches things.
|
| - WKContextSetCacheModel(WKPageGetContext([view pageRef]), kWKCacheModelDocumentBrowser);
|
| -}
|
| -
|
| -template <typename View>
|
| -void DeviceScaleFactorOnBack::runTest(View view)
|
| -{
|
| - EXPECT_JS_EQ(view, "window.devicePixelRatio", "1");
|
| - EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "1");
|
| -
|
| - // Navigate to new URL
|
| - loadURL(view, [NSURL URLWithString:@"about:blank"]);
|
| - waitForLoadToFinish();
|
| -
|
| - // Change the scale factor
|
| - RetainPtr<SyntheticBackingScaleFactorWindow> window1 = createWindow();
|
| - [window1.get() setBackingScaleFactor:3];
|
| -
|
| - [[window1.get() contentView] addSubview:view];
|
| -
|
| - // Navigate back to the first page
|
| - goBack(view);
|
| - waitForLoadToFinish();
|
| -
|
| - // Ensure that the cached page has updated its scale factor
|
| - EXPECT_JS_EQ(view, "window.devicePixelRatio", "3");
|
| - EXPECT_JS_EQ(view, "devicePixelRatioFromStyle()", "3");
|
| -
|
| - [view removeFromSuperview];
|
| -}
|
| -
|
| -TEST_F(DeviceScaleFactorOnBack, WebKit)
|
| -{
|
| - runWebKit1Test();
|
| -}
|
| -
|
| -TEST_F(DeviceScaleFactorOnBack, WebKit2)
|
| -{
|
| - runWebKit2Test();
|
| -}
|
| -
|
| -} // namespace TestWebKitAPI
|
|
|