<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[215207] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/215207">215207</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-04-10 15:22:39 -0700 (Mon, 10 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor DataInteractionTests.UnresponsivePageDoesNotHangUI to not check against a fixed time interval
https://bugs.webkit.org/show_bug.cgi?id=170658
Reviewed by Tim Horton.
Uses ignoreSynchronousMessagingTimeoutsForTesting to ensure that this test times out if data interaction
preparation is synchronous, or passes if it is asynchronous.
* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/cocoa/TestWKWebView.h:
* TestWebKitAPI/cocoa/TestWKWebView.mm:
(-[TestWKWebView initWithFrame:]):
(-[TestWKWebView initWithFrame:configuration:processPoolConfiguration:]):
(-[TestWKWebView _setUpTestWindow:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsiosDataInteractionTestsmm">trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPIcocoaTestWKWebViewh">trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIcocoaTestWKWebViewmm">trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (215206 => 215207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-10 21:46:04 UTC (rev 215206)
+++ trunk/Tools/ChangeLog 2017-04-10 22:22:39 UTC (rev 215207)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-04-10 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Refactor DataInteractionTests.UnresponsivePageDoesNotHangUI to not check against a fixed time interval
+ https://bugs.webkit.org/show_bug.cgi?id=170658
+
+ Reviewed by Tim Horton.
+
+ Uses ignoreSynchronousMessagingTimeoutsForTesting to ensure that this test times out if data interaction
+ preparation is synchronous, or passes if it is asynchronous.
+
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/cocoa/TestWKWebView.h:
+ * TestWebKitAPI/cocoa/TestWKWebView.mm:
+ (-[TestWKWebView initWithFrame:]):
+ (-[TestWKWebView initWithFrame:configuration:processPoolConfiguration:]):
+ (-[TestWKWebView _setUpTestWindow:]):
+
</ins><span class="cx"> 2017-04-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][macOS] Block access to Apple Events before launch.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsiosDataInteractionTestsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (215206 => 215207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-04-10 21:46:04 UTC (rev 215206)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-04-10 22:22:39 UTC (rev 215207)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import <UIKit/UIItemProvider_Private.h>
</span><span class="cx"> #import <WebKit/WKPreferencesPrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span><ins>+#import <WebKit/_WKProcessPoolConfiguration.h>
</ins><span class="cx">
</span><span class="cx"> @implementation TestWKWebView (DataInteractionTests)
</span><span class="cx">
</span><span class="lines">@@ -387,14 +388,15 @@
</span><span class="cx">
</span><span class="cx"> TEST(DataInteractionTests, UnresponsivePageDoesNotHangUI)
</span><span class="cx"> {
</span><del>- RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
</del><ins>+ _WKProcessPoolConfiguration *processPoolConfiguration = [[[_WKProcessPoolConfiguration alloc] init] autorelease];
+ processPoolConfiguration.ignoreSynchronousMessagingTimeoutsForTesting = YES;
+
+ RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:[[[WKWebViewConfiguration alloc] init] autorelease] processPoolConfiguration:processPoolConfiguration]);
</ins><span class="cx"> [webView synchronouslyLoadTestPageNamed:@"simple"];
</span><span class="cx"> [webView evaluateJavaScript:@"while(1);" completionHandler:nil];
</span><span class="cx">
</span><del>- NSTimeInterval startTime = [NSDate timeIntervalSinceReferenceDate];
</del><ins>+ // The test passes if we can prepare for data interaction without timing out.
</ins><span class="cx"> [webView _simulatePrepareForDataInteractionSession:nil completion:^() { }];
</span><del>-
- EXPECT_LT([NSDate timeIntervalSinceReferenceDate] - startTime, 1);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIcocoaTestWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h (215206 => 215207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h 2017-04-10 21:46:04 UTC (rev 215206)
+++ trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h 2017-04-10 22:22:39 UTC (rev 215207)
</span><span class="lines">@@ -28,11 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+@class _WKProcessPoolConfiguration;
+
</ins><span class="cx"> @interface TestMessageHandler : NSObject <WKScriptMessageHandler>
</span><span class="cx"> - (void)addMessage:(NSString *)message withHandler:(dispatch_block_t)handler;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface TestWKWebView : WKWebView
</span><ins>+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration processPoolConfiguration:(_WKProcessPoolConfiguration *)processPoolConfiguration;
</ins><span class="cx"> - (void)clearMessageHandlers:(NSArray *)messageNames;
</span><span class="cx"> - (void)performAfterReceivingMessage:(NSString *)message action:(dispatch_block_t)action;
</span><span class="cx"> - (void)loadTestPageNamed:(NSString *)pageName;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIcocoaTestWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm (215206 => 215207)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm 2017-04-10 21:46:04 UTC (rev 215206)
+++ trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm 2017-04-10 22:22:39 UTC (rev 215207)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><span class="cx"> #import "TestNavigationDelegate.h"
</span><span class="cx"> #import "Utilities.h"
</span><span class="cx">
</span><ins>+#import <WebKit/WKWebViewConfigurationPrivate.h>
</ins><span class="cx"> #import <WebKit/WebKitPrivate.h>
</span><ins>+#import <WebKit/_WKProcessPoolConfiguration.h>
</ins><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -159,13 +161,13 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation TestWKWebView {
</span><del>- TestWKWebViewHostWindow *_hostWindow;
</del><ins>+ RetainPtr<TestWKWebViewHostWindow> _hostWindow;
</ins><span class="cx"> RetainPtr<TestMessageHandler> _testHandler;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame
</span><span class="cx"> {
</span><del>- WKWebViewConfiguration *defaultConfiguration = [[WKWebViewConfiguration alloc] init];
</del><ins>+ WKWebViewConfiguration *defaultConfiguration = [[[WKWebViewConfiguration alloc] init] autorelease];
</ins><span class="cx"> return [self initWithFrame:frame configuration:defaultConfiguration];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,17 +179,23 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration processPoolConfiguration:(_WKProcessPoolConfiguration *)processPoolConfiguration
+{
+ [configuration setProcessPool:[[[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration] autorelease]];
+ return [self initWithFrame:frame configuration:configuration];
+}
+
</ins><span class="cx"> - (void)_setUpTestWindow:(NSRect)frame
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- _hostWindow = [[TestWKWebViewHostWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO];
</del><ins>+ _hostWindow = adoptNS([[TestWKWebViewHostWindow alloc] initWithContentRect:frame styleMask:NSWindowStyleMaskBorderless backing:NSBackingStoreBuffered defer:NO]);
</ins><span class="cx"> [_hostWindow setFrameOrigin:NSMakePoint(0, 0)];
</span><span class="cx"> [_hostWindow setIsVisible:YES];
</span><span class="cx"> [[_hostWindow contentView] addSubview:self];
</span><span class="cx"> [_hostWindow makeKeyAndOrderFront:self];
</span><span class="cx"> #else
</span><del>- _hostWindow = [[TestWKWebViewHostWindow alloc] initWithFrame:frame];
- _hostWindow.hidden = NO;
</del><ins>+ _hostWindow = adoptNS([[TestWKWebViewHostWindow alloc] initWithFrame:frame]);
+ [_hostWindow setHidden:NO];
</ins><span class="cx"> [_hostWindow addSubview:self];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -306,8 +314,8 @@
</span><span class="cx"> NSString *characterAsString = [NSString stringWithFormat:@"%c" , character];
</span><span class="cx"> NSEventType keyDownEventType = NSEventTypeKeyDown;
</span><span class="cx"> NSEventType keyUpEventType = NSEventTypeKeyUp;
</span><del>- [self keyDown:[NSEvent keyEventWithType:keyDownEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:_hostWindow.windowNumber context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
- [self keyUp:[NSEvent keyEventWithType:keyUpEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:_hostWindow.windowNumber context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
</del><ins>+ [self keyDown:[NSEvent keyEventWithType:keyDownEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:[_hostWindow windowNumber] context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
+ [self keyUp:[NSEvent keyEventWithType:keyUpEventType location:NSZeroPoint modifierFlags:0 timestamp:GetCurrentEventTime() windowNumber:[_hostWindow windowNumber] context:nil characters:characterAsString charactersIgnoringModifiers:characterAsString isARepeat:NO keyCode:character]];
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>