Changeset 221923 in webkit

Timestamp:

Sep 12, 2017 9:42:23 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Fix build after r221922.
​https://bugs.webkit.org/show_bug.cgi?id=176728

• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:

(-[ModalDelegate _webViewRunModal:]):
(-[ModalDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
(TEST):
svn-apply inserted the test too early in the file :(
Shift it down to where all the used static variables are declared.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-09-12  Alex Christensen  <achristensen@webkit.org>
+
+        Fix build after r221922.
+        https://bugs.webkit.org/show_bug.cgi?id=176728
+
+        * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+        (-[ModalDelegate _webViewRunModal:]):
+        (-[ModalDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
+        (TEST):
+        svn-apply inserted the test too early in the file :(
+        Shift it down to where all the used static variables are declared.
+
 2017-09-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

@@ -149 +149 @@
 }
 
+#if PLATFORM(MAC)
+
+@class UITestDelegate;
+
+static RetainPtr<WKWebView> webViewFromDelegateCallback;
+static RetainPtr<WKWebView> createdWebView;
+static RetainPtr<UITestDelegate> delegate;
+
+@interface UITestDelegate : NSObject <WKUIDelegatePrivate, WKURLSchemeHandler>
+@end
+
+@implementation UITestDelegate
+
+- (nullable WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
+{
+    createdWebView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration]);
+    [createdWebView setUIDelegate:delegate.get()];
+    return createdWebView.get();
+}
+
+- (void)_showWebView:(WKWebView *)webView
+{
+    webViewFromDelegateCallback = webView;
+    done = true;
+}
+
+- (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
+{
+    NSString *data = @"<script>window.open('other.html');</script>";
+    [urlSchemeTask didReceiveResponse:[[[NSURLResponse alloc] initWithURL:urlSchemeTask.request.URL MIMEType:@"text/html" expectedContentLength:data.length textEncodingName:nil] autorelease]];
+    [urlSchemeTask didReceiveData:[data dataUsingEncoding:NSUTF8StringEncoding]];
+    [urlSchemeTask didFinish];
+}
+
+- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
+{
+}
+
+@end
+
+TEST(WebKit, ShowWebView)
+{
+    delegate = adoptNS([[UITestDelegate alloc] init]);
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    [configuration setURLSchemeHandler:delegate.get() forURLScheme:@"test"];
+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration.get()]);
+    [webView setUIDelegate:delegate.get()];
+    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"test:///first"]]];
+    TestWebKitAPI::Util::run(&done);
+    
+    ASSERT_EQ(webViewFromDelegateCallback, createdWebView);
+}
+
 @interface ModalDelegate : NSObject <WKUIDelegatePrivate>
 @end
@@ -179 +232 @@
     [webView sendClicksAtPoint:NSMakePoint(20, 600 - 20) numberOfClicks:1];
     TestWebKitAPI::Util::run(&done);
-}
-
-#if PLATFORM(MAC)
-
-@class UITestDelegate;
-
-static RetainPtr<WKWebView> webViewFromDelegateCallback;
-static RetainPtr<WKWebView> createdWebView;
-static RetainPtr<UITestDelegate> delegate;
-
-@interface UITestDelegate : NSObject <WKUIDelegatePrivate, WKURLSchemeHandler>
-@end
-
-@implementation UITestDelegate
-
-- (nullable WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
-{
-    createdWebView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration]);
-    [createdWebView setUIDelegate:delegate.get()];
-    return createdWebView.get();
-}
-
-- (void)_showWebView:(WKWebView *)webView
-{
-    webViewFromDelegateCallback = webView;
-    done = true;
-}
-
-- (void)webView:(WKWebView *)webView startURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
-{
-    NSString *data = @"<script>window.open('other.html');</script>";
-    [urlSchemeTask didReceiveResponse:[[[NSURLResponse alloc] initWithURL:urlSchemeTask.request.URL MIMEType:@"text/html" expectedContentLength:data.length textEncodingName:nil] autorelease]];
-    [urlSchemeTask didReceiveData:[data dataUsingEncoding:NSUTF8StringEncoding]];
-    [urlSchemeTask didFinish];
-}
-
-- (void)webView:(WKWebView *)webView stopURLSchemeTask:(id <WKURLSchemeTask>)urlSchemeTask
-{
-}
-
-@end
-
-TEST(WebKit, ShowWebView)
-{
-    delegate = adoptNS([[UITestDelegate alloc] init]);
-    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
-    [configuration setURLSchemeHandler:delegate.get() forURLScheme:@"test"];
-    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration.get()]);
-    [webView setUIDelegate:delegate.get()];
-    [webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"test:///first"]]];
-    TestWebKitAPI::Util::run(&done);
-    
-    ASSERT_EQ(webViewFromDelegateCallback, createdWebView);
 }