<!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>[204945] trunk</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/204945">204945</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-08-24 16:58:45 -0700 (Wed, 24 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS DRT] Hook up uiController.zoomToScale() for DRT
https://bugs.webkit.org/show_bug.cgi?id=161173
Reviewed by Tim Horton.
Tools:
Make a UIWebScrollView subclass, DumpRenderTreeWebScrollView, which has an internal delegate to get
UIScrollView delegate callbacks. Store the zoomToScaleCompletionHandler on it.
UIScriptController::zoomToScale() has to bounce the zoom to the main thread (no poking UIKit from
the WebThread!), but queue up the callback first.
* DumpRenderTree/ios/DumpRenderTreeBrowserView.h:
* DumpRenderTree/ios/DumpRenderTreeBrowserView.mm:
(-[DumpRenderTreeWebScrollView initWithFrame:]):
(-[DumpRenderTreeWebScrollView dealloc]):
(-[DumpRenderTreeWebScrollView zoomToScale:animated:completionHandler:]):
(-[DumpRenderTreeWebScrollView completedZoomToScale]):
(-[DumpRenderTreeWebScrollViewDelegate initWithScrollView:]):
(-[DumpRenderTreeWebScrollViewDelegate viewForZoomingInScrollView:]): All UIScrollView delegates need to implement this.
(-[DumpRenderTreeWebScrollViewDelegate scrollViewDidEndZooming:withView:atScale:]):
* DumpRenderTree/ios/UIScriptControllerIOS.mm:
(WTR::UIScriptController::zoomToScale):
* DumpRenderTree/mac/DumpRenderTree.mm:
(createWebViewAndOffscreenWindow):
* TestRunnerShared/UIScriptContext/UIScriptController.h:
(WTR::UIScriptController::context):
LayoutTests:
The one test in fast/zooming/ios works in DRT and WTR now.
* platform/ios-simulator-wk2/TestExpectations:
* platform/ios-simulator/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2TestExpectations">trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewh">trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewmm">trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm">trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsTestRunnerSharedUIScriptContextUIScriptControllerh">trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/LayoutTests/ChangeLog 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-24 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS DRT] Hook up uiController.zoomToScale() for DRT
+ https://bugs.webkit.org/show_bug.cgi?id=161173
+
+ Reviewed by Tim Horton.
+
+ The one test in fast/zooming/ios works in DRT and WTR now.
+
+ * platform/ios-simulator-wk2/TestExpectations:
+ * platform/ios-simulator/TestExpectations:
+
</ins><span class="cx"> 2016-08-24 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rebase iOS simulator WK1 fast/table tests
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx"> media/controls/ipad [ Pass ]
</span><span class="cx">
</span><span class="cx"> fast/text-autosizing/ios [ Pass ]
</span><ins>+fast/zooming/ios [ Pass ]
</ins><span class="cx">
</span><span class="cx"> # <rdar://problem/22898927> Crashes in iWorkImport.framework
</span><span class="cx"> quicklook/pages.html [ Pass Crash ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">
</span><span class="cx"> fast/scrolling/ios [ Pass ]
</span><span class="cx"> fast/viewport/ios [ Pass ]
</span><del>-fast/zooming/ios [ Pass ]
</del><span class="cx">
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> # End platform-specific directories.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/ChangeLog 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-08-24 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS DRT] Hook up uiController.zoomToScale() for DRT
+ https://bugs.webkit.org/show_bug.cgi?id=161173
+
+ Reviewed by Tim Horton.
+
+ Make a UIWebScrollView subclass, DumpRenderTreeWebScrollView, which has an internal delegate to get
+ UIScrollView delegate callbacks. Store the zoomToScaleCompletionHandler on it.
+
+ UIScriptController::zoomToScale() has to bounce the zoom to the main thread (no poking UIKit from
+ the WebThread!), but queue up the callback first.
+
+ * DumpRenderTree/ios/DumpRenderTreeBrowserView.h:
+ * DumpRenderTree/ios/DumpRenderTreeBrowserView.mm:
+ (-[DumpRenderTreeWebScrollView initWithFrame:]):
+ (-[DumpRenderTreeWebScrollView dealloc]):
+ (-[DumpRenderTreeWebScrollView zoomToScale:animated:completionHandler:]):
+ (-[DumpRenderTreeWebScrollView completedZoomToScale]):
+ (-[DumpRenderTreeWebScrollViewDelegate initWithScrollView:]):
+ (-[DumpRenderTreeWebScrollViewDelegate viewForZoomingInScrollView:]): All UIScrollView delegates need to implement this.
+ (-[DumpRenderTreeWebScrollViewDelegate scrollViewDidEndZooming:withView:atScale:]):
+ * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::zoomToScale):
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (createWebViewAndOffscreenWindow):
+ * TestRunnerShared/UIScriptContext/UIScriptController.h:
+ (WTR::UIScriptController::context):
+
</ins><span class="cx"> 2016-08-24 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix Windows build after r204918.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -39,3 +39,16 @@
</span><span class="cx"> - (CGRect)documentVisibleRect;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+
+@class DumpRenderTreeWebScrollViewDelegate;
+
+@interface DumpRenderTreeWebScrollView : UIWebScrollView
+
+@property (nonatomic, retain) DumpRenderTreeWebScrollViewDelegate *scrollViewDelegate;
+
+@property (nonatomic, copy) void (^zoomToScaleCompletionHandler)(void);
+
+- (void)zoomToScale:(double)scale animated:(BOOL)animated completionHandler:(void (^)(void))completionHandler;
+
+@end
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosDumpRenderTreeBrowserViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.mm 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import <WebCore/WebCoreThreadRun.h>
+#import <WebKit/WebCoreThread.h>
</ins><span class="cx"> #import <WebKit/WebView.h>
</span><span class="cx">
</span><span class="cx"> @interface UIWebBrowserView (WebUIKitDelegate)
</span><span class="lines">@@ -87,4 +89,79 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface DumpRenderTreeWebScrollViewDelegate : NSObject <UIScrollViewDelegate> {
+ DumpRenderTreeWebScrollView *_scrollView;
+}
+- (instancetype)initWithScrollView:(DumpRenderTreeWebScrollView *)scrollView;
+@end
+
+
+@implementation DumpRenderTreeWebScrollView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (!self)
+ return nil;
+
+ self.scrollViewDelegate = [[[DumpRenderTreeWebScrollViewDelegate alloc] initWithScrollView:self] autorelease];
+ self.delegate = self.scrollViewDelegate;
+
+ return self;
+}
+
+- (void)dealloc
+{
+ self.scrollViewDelegate = nil;
+ [super dealloc];
+}
+
+- (void)zoomToScale:(double)scale animated:(BOOL)animated completionHandler:(void (^)(void))completionHandler
+{
+ ASSERT(!self.zoomToScaleCompletionHandler);
+ self.zoomToScaleCompletionHandler = completionHandler;
+
+ [self setZoomScale:scale animated:animated];
+}
+
+- (void)completedZoomToScale
+{
+ if (self.zoomToScaleCompletionHandler) {
+ auto completionHandlerCopy = Block_copy(self.zoomToScaleCompletionHandler);
+
+ WebThreadRun(^{
+ completionHandlerCopy();
+ Block_release(completionHandlerCopy);
+ });
+ self.zoomToScaleCompletionHandler = nullptr;
+ }
+}
+
+@end
+
+@implementation DumpRenderTreeWebScrollViewDelegate
+
+- (instancetype)initWithScrollView:(DumpRenderTreeWebScrollView *)scrollView
+{
+ self = [super init];
+ if (!self)
+ return nil;
+
+ _scrollView = scrollView;
+ return self;
+}
+
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView
+{
+ return [scrollView.subviews firstObject];
+}
+
+// UIScrollView delegate methods.
+- (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)view atScale:(CGFloat)scale
+{
+ [_scrollView completedZoomToScale];
+}
+
+@end
+
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosUIScriptControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -31,9 +31,10 @@
</span><span class="cx"> #import "DumpRenderTreeBrowserView.h"
</span><span class="cx"> #import "UIScriptContext.h"
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><ins>+#import <wtf/MainThread.h>
</ins><span class="cx">
</span><span class="cx"> extern DumpRenderTreeBrowserView *gWebBrowserView;
</span><del>-extern UIWebScrollView *gWebScrollView;
</del><ins>+extern DumpRenderTreeWebScrollView *gWebScrollView;
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><span class="lines">@@ -50,6 +51,16 @@
</span><span class="cx">
</span><span class="cx"> void UIScriptController::zoomToScale(double scale, JSValueRef callback)
</span><span class="cx"> {
</span><ins>+ RefPtr<UIScriptController> protectedThis(this);
+ unsigned callbackID = strongThis->context()->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [gWebScrollView zoomToScale:scale animated:YES completionHandler:^{
+ if (!strongThis->context())
+ return;
+ strongThis->context()->asyncTaskComplete(callbackID);
+ }];
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double UIScriptController::zoomScale() const
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> const CGRect layoutTestViewportRect = { {0, 0}, {static_cast<CGFloat>(TestRunner::viewWidth), static_cast<CGFloat>(TestRunner::viewHeight)} };
</span><span class="cx"> DumpRenderTreeBrowserView *gWebBrowserView = nil;
</span><del>-UIWebScrollView *gWebScrollView = nil;
</del><ins>+DumpRenderTreeWebScrollView *gWebScrollView = nil;
</ins><span class="cx"> DumpRenderTreeWindow *gDrtWindow = nil;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> drtWindow.uiWindow = uiWindow;
</span><span class="cx"> drtWindow.browserView = webBrowserView;
</span><span class="cx">
</span><del>- UIWebScrollView *scrollView = [[UIWebScrollView alloc] initWithFrame:layoutTestViewportRect];
</del><ins>+ DumpRenderTreeWebScrollView *scrollView = [[DumpRenderTreeWebScrollView alloc] initWithFrame:layoutTestViewportRect];
</ins><span class="cx"> [scrollView addSubview:webBrowserView];
</span><span class="cx">
</span><span class="cx"> [viewController.view addSubview:scrollView];
</span></span></pre></div>
<a id="trunkToolsTestRunnerSharedUIScriptContextUIScriptControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (204944 => 204945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2016-08-24 23:47:01 UTC (rev 204944)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2016-08-24 23:58:45 UTC (rev 204945)
</span><span class="lines">@@ -100,6 +100,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> UIScriptController(UIScriptContext&);
</span><ins>+
+ UIScriptContext* context() { return m_context; }
</ins><span class="cx">
</span><span class="cx"> void platformSetDidStartFormControlInteractionCallback();
</span><span class="cx"> void platformSetDidEndFormControlInteractionCallback();
</span></span></pre>
</div>
</div>
</body>
</html>