<!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>[162121] trunk/Source/WebKit2</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/162121">162121</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-16 02:53:18 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose scrollView on WKView
https://bugs.webkit.org/show_bug.cgi?id=127085
Patch by Ian Henderson <ianh@apple.com> on 2014-01-16
Reviewed by Antti Koivisto.
Expose WKView's scroll view as a property. In order to support
clients calling setDelegate:, we create a forwarder object that sends
delegate methods to both WKView (the "internal delegate") and the
publicly-exposed delegate (the "external delegate").
* UIProcess/API/Cocoa/WKView.h:
* UIProcess/API/ios/WKScrollView.h:
* UIProcess/API/ios/WKScrollView.mm:
(-[WKScrollViewDelegateForwarder initWithInternalDelegate:externalDelegate:]):
(-[WKScrollViewDelegateForwarder methodSignatureForSelector:]):
(-[WKScrollViewDelegateForwarder respondsToSelector:]):
(-[WKScrollViewDelegateForwarder forwardInvocation:]):
(-[WKScrollView setInternalDelegate:]):
(-[WKScrollView setDelegate:]):
(-[WKScrollView delegate]):
Pretend like _externalDelegate is the real delegate to avoid exposing
our internal delegate or forwarder object.
(-[WKScrollView _updateDelegate]):
(-[WKScrollView dealloc]):
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView scrollView]):
(-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKScrollViewh">trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKScrollViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162120 => 162121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-16 10:22:48 UTC (rev 162120)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-16 10:53:18 UTC (rev 162121)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-01-16 Ian Henderson <ianh@apple.com>
+
+ Expose scrollView on WKView
+ https://bugs.webkit.org/show_bug.cgi?id=127085
+
+ Reviewed by Antti Koivisto.
+
+ Expose WKView's scroll view as a property. In order to support
+ clients calling setDelegate:, we create a forwarder object that sends
+ delegate methods to both WKView (the "internal delegate") and the
+ publicly-exposed delegate (the "external delegate").
+
+ * UIProcess/API/Cocoa/WKView.h:
+ * UIProcess/API/ios/WKScrollView.h:
+ * UIProcess/API/ios/WKScrollView.mm:
+ (-[WKScrollViewDelegateForwarder initWithInternalDelegate:externalDelegate:]):
+ (-[WKScrollViewDelegateForwarder methodSignatureForSelector:]):
+ (-[WKScrollViewDelegateForwarder respondsToSelector:]):
+ (-[WKScrollViewDelegateForwarder forwardInvocation:]):
+ (-[WKScrollView setInternalDelegate:]):
+ (-[WKScrollView setDelegate:]):
+ (-[WKScrollView delegate]):
+ Pretend like _externalDelegate is the real delegate to avoid exposing
+ our internal delegate or forwarder object.
+ (-[WKScrollView _updateDelegate]):
+ (-[WKScrollView dealloc]):
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView scrollView]):
+ (-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+
</ins><span class="cx"> 2014-01-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL][NIX] Do not use PrintContext, Frame and DocumentLoader in Errors
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h (162120 => 162121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-01-16 10:22:48 UTC (rev 162120)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKView.h 2014-01-16 10:53:18 UTC (rev 162121)
</span><span class="lines">@@ -66,4 +66,8 @@
</span><span class="cx"> @property BOOL drawsBackground;
</span><span class="cx"> @property BOOL drawsTransparentBackground;
</span><span class="cx">
</span><ins>+#if TARGET_OS_IPHONE
+@property (nonatomic, readonly) UIScrollView *scrollView;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.h (162120 => 162121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.h 2014-01-16 10:22:48 UTC (rev 162120)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.h 2014-01-16 10:53:18 UTC (rev 162121)
</span><span class="lines">@@ -26,4 +26,7 @@
</span><span class="cx"> #import <UIKit/UIWebScrollView.h>
</span><span class="cx">
</span><span class="cx"> @interface WKScrollView : UIWebScrollView
</span><ins>+
+@property (nonatomic, assign) id <UIScrollViewDelegate> internalDelegate;
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKScrollViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.mm (162120 => 162121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.mm 2014-01-16 10:22:48 UTC (rev 162120)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKScrollView.mm 2014-01-16 10:53:18 UTC (rev 162121)
</span><span class="lines">@@ -26,12 +26,110 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WKScrollView.h"
</span><span class="cx">
</span><del>-@implementation WKScrollView
</del><ins>+@interface WKScrollViewDelegateForwarder : NSObject <UIScrollViewDelegate>
</ins><span class="cx">
</span><ins>+- (instancetype)initWithInternalDelegate:(id <UIScrollViewDelegate>)internalDelegate externalDelegate:(id <UIScrollViewDelegate>)externalDelegate;
+
+@end
+
+@implementation WKScrollViewDelegateForwarder {
+ id <UIScrollViewDelegate> _internalDelegate;
+ id <UIScrollViewDelegate> _externalDelegate;
+}
+
+- (instancetype)initWithInternalDelegate:(id <UIScrollViewDelegate>)internalDelegate externalDelegate:(id <UIScrollViewDelegate>)externalDelegate
+{
+ self = [super init];
+ if (!self)
+ return nil;
+ _internalDelegate = internalDelegate;
+ _externalDelegate = externalDelegate;
+ return self;
+}
+
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
+{
+ NSMethodSignature *signature = [super methodSignatureForSelector:aSelector];
+ if (!signature)
+ signature = [(NSObject *)_internalDelegate methodSignatureForSelector:aSelector];
+ if (!signature)
+ signature = [(NSObject *)_externalDelegate methodSignatureForSelector:aSelector];
+ return signature;
+}
+
+- (BOOL)respondsToSelector:(SEL)aSelector
+{
+ return [super respondsToSelector:aSelector] || [_internalDelegate respondsToSelector:aSelector] || [_externalDelegate respondsToSelector:aSelector];
+}
+
+- (void)forwardInvocation:(NSInvocation *)anInvocation
+{
+ BOOL messageHandled = NO;
+ if ([_internalDelegate respondsToSelector:[anInvocation selector]]) {
+ [anInvocation invokeWithTarget:_internalDelegate];
+ messageHandled = YES;
+ }
+ if ([_externalDelegate respondsToSelector:[anInvocation selector]]) {
+ [anInvocation invokeWithTarget:_externalDelegate];
+ messageHandled = YES;
+ }
+ if (!messageHandled)
+ [super forwardInvocation:anInvocation];
+}
+
+@end
+
+@implementation WKScrollView {
+ id <UIScrollViewDelegate> _externalDelegate;
+ WKScrollViewDelegateForwarder *_delegateForwarder;
+}
+
</ins><span class="cx"> - (BOOL)touchesShouldCancelInContentView:(UIView *)contentView
</span><span class="cx"> {
</span><span class="cx"> return NO;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setInternalDelegate:(id <UIScrollViewDelegate>)internalDelegate
+{
+ if (internalDelegate == _internalDelegate)
+ return;
+ _internalDelegate = internalDelegate;
+ [self _updateDelegate];
+}
+
+- (void)setDelegate:(id <UIScrollViewDelegate>)delegate
+{
+ if (_externalDelegate == delegate)
+ return;
+ _externalDelegate = delegate;
+ [self _updateDelegate];
+}
+
+- (id <UIScrollViewDelegate>)delegate
+{
+ return _externalDelegate;
+}
+
+- (void)_updateDelegate
+{
+ WKScrollViewDelegateForwarder *oldForwarder = _delegateForwarder;
+ _delegateForwarder = nil;
+ if (!_externalDelegate)
+ [super setDelegate:_internalDelegate];
+ else if (!_internalDelegate)
+ [super setDelegate:_externalDelegate];
+ else {
+ _delegateForwarder = [[WKScrollViewDelegateForwarder alloc] initWithInternalDelegate:_internalDelegate externalDelegate:_externalDelegate];
+ [super setDelegate:_delegateForwarder];
+ }
+ [oldForwarder release];
+}
+
+- (void)dealloc
+{
+ [_delegateForwarder release];
+ [super dealloc];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm (162120 => 162121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-01-16 10:22:48 UTC (rev 162120)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-01-16 10:53:18 UTC (rev 162121)
</span><span class="lines">@@ -90,6 +90,11 @@
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (UIScrollView *)scrollView
+{
+ return _scrollView.get();
+}
+
</ins><span class="cx"> - (WKBrowsingContextController *)browsingContextController
</span><span class="cx"> {
</span><span class="cx"> return [_contentView browsingContextController];
</span><span class="lines">@@ -232,7 +237,7 @@
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span><del>- [_scrollView setDelegate:self];
</del><ins>+ [_scrollView setInternalDelegate:self];
</ins><span class="cx"> [_scrollView setBouncesZoom:YES];
</span><span class="cx">
</span><span class="cx"> [self addSubview:_scrollView.get()];
</span></span></pre>
</div>
</div>
</body>
</html>