<!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>[164120] 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/164120">164120</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-14 12:53:13 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/15994340> WK2: Cannot scroll to the bottom of the page when the keyboard is on the screen
https://bugs.webkit.org/show_bug.cgi?id=128710
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-14
Reviewed by Enrica Casucci.
WKView/WKWebView needs to adapt the UIScrollView insets to leave some space for the keyboard.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView dealloc]):
(-[WKWebView _keyboardChangedWithInfo:adjustScrollView:]):
(-[WKWebView _keyboardWillChangeFrame:]):
(-[WKWebView _keyboardDidChangeFrame:]):
(-[WKWebView _keyboardWillShow:]):
(-[WKWebView _keyboardWillHide:]):
* UIProcess/API/ios/WKContentView.h:
* UIProcess/API/ios/WKContentView.mm:
(-[WKContentView isAssistingNode]):
* UIProcess/API/ios/WKInteractionView.h:
* UIProcess/API/ios/WKViewIOS.mm:
(-[WKView dealloc]):
(-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
(-[WKView _keyboardChangedWithInfo:adjustScrollView:]):
(-[WKView _keyboardWillChangeFrame:]):
(-[WKView _keyboardDidChangeFrame:]):
(-[WKView _keyboardWillShow:]):
(-[WKView _keyboardWillHide:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKContentViewh">trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosWKInteractionViewh">trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.h</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 (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-14 Benjamin Poulain <bpoulain@apple.com>
+
+ <rdar://problem/15994340> WK2: Cannot scroll to the bottom of the page when the keyboard is on the screen
+ https://bugs.webkit.org/show_bug.cgi?id=128710
+
+ Reviewed by Enrica Casucci.
+
+ WKView/WKWebView needs to adapt the UIScrollView insets to leave some space for the keyboard.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView dealloc]):
+ (-[WKWebView _keyboardChangedWithInfo:adjustScrollView:]):
+ (-[WKWebView _keyboardWillChangeFrame:]):
+ (-[WKWebView _keyboardDidChangeFrame:]):
+ (-[WKWebView _keyboardWillShow:]):
+ (-[WKWebView _keyboardWillHide:]):
+ * UIProcess/API/ios/WKContentView.h:
+ * UIProcess/API/ios/WKContentView.mm:
+ (-[WKContentView isAssistingNode]):
+ * UIProcess/API/ios/WKInteractionView.h:
+ * UIProcess/API/ios/WKViewIOS.mm:
+ (-[WKView dealloc]):
+ (-[WKView _commonInitializationWithContextRef:pageGroupRef:relatedToPage:]):
+ (-[WKView _keyboardChangedWithInfo:adjustScrollView:]):
+ (-[WKView _keyboardWillChangeFrame:]):
+ (-[WKView _keyboardDidChangeFrame:]):
+ (-[WKView _keyboardWillShow:]):
+ (-[WKView _keyboardWillHide:]):
+
</ins><span class="cx"> 2014-02-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using PLATFORM(MAC) in WebKit2/PluginProcess except where it means “OS X but not iOS”
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -50,6 +50,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "WKScrollView.h"
</span><ins>+#import <UIKit/UIPeripheralHost_Private.h>
+
+@interface UIScrollView (UIScrollViewInternal)
+- (void)_adjustForAutomaticKeyboardInfo:(NSDictionary*)info animated:(BOOL)animated lastAdjustment:(CGFloat*)lastAdjustment;
+@end
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="lines">@@ -73,6 +79,7 @@
</span><span class="cx">
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><ins>+ CGFloat _lastAdjustmentForScroller;
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="cx"> RetainPtr<WKView> _wkView;
</span><span class="lines">@@ -130,6 +137,12 @@
</span><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><span class="cx">
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><ins>+
+ NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+ [center addObserver:self selector:@selector(_keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardDidChangeFrame:) name:UIKeyboardDidChangeFrameNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && !PLATFORM(IOS)
</span><span class="lines">@@ -148,6 +161,9 @@
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> [_remoteObjectRegistry _invalidate];
</span><ins>+#if PLATFORM(IOS)
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+#endif
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="lines">@@ -372,6 +388,42 @@
</span><span class="cx"> [_scrollView setContentOffset:contentOffset];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_keyboardChangedWithInfo:(NSDictionary *)keyboardInfo adjustScrollView:(BOOL)adjustScrollView
+{
+ // FIXME: We will also need to adjust the unobscured rect by taking into account the keyboard rect and the obscured insets.
+ if (adjustScrollView)
+ [_scrollView _adjustForAutomaticKeyboardInfo:keyboardInfo animated:YES lastAdjustment:&_lastAdjustmentForScroller];
+}
+
+- (void)_keyboardWillChangeFrame:(NSNotification *)notification
+{
+ if ([_contentView isAssistingNode])
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
+- (void)_keyboardDidChangeFrame:(NSNotification *)notification
+{
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:NO];
+}
+
+- (void)_keyboardWillShow:(NSNotification *)notification
+{
+ if ([_contentView isAssistingNode])
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
+- (void)_keyboardWillHide:(NSNotification *)notification
+{
+ // Ignore keyboard will hide notifications sent during rotation. They're just there for
+ // backwards compatibility reasons and processing the will hide notification would
+ // temporarily screw up the the unobscured view area.
+ if ([[UIPeripheralHost sharedInstance] rotationState])
+ return;
+
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #pragma mark OS X-specific methods
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -51,11 +51,12 @@
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKContentView : UIView
</span><span class="cx">
</span><del>-@property (readonly, nonatomic) WKBrowsingContextController *browsingContextController;
</del><ins>+@property (nonatomic, readonly) WKBrowsingContextController *browsingContextController;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, assign) id <WKContentViewDelegate> delegate;
</span><span class="cx">
</span><del>-@property (readonly) WKPageRef _pageRef;
</del><ins>+@property (nonatomic, readonly) WKPageRef _pageRef;
+@property (nonatomic, readonly) BOOL isAssistingNode;
</ins><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame context:(WebKit::WebContext&)context configuration:(WebKit::WebPageConfiguration)webPageConfiguration;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -168,6 +168,11 @@
</span><span class="cx"> return toAPI(_page.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isAssistingNode
+{
+ return [_interactionView isEditable];
+}
+
</ins><span class="cx"> - (void)setMinimumSize:(CGSize)size
</span><span class="cx"> {
</span><span class="cx"> _page->drawingArea()->setSize(IntSize(size), IntSize(), IntSize());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosWKInteractionViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.h (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.h 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKInteractionView.h 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx">
</span><span class="cx"> @interface WKInteractionView : UIView<UIGestureRecognizerDelegate, UIWebTouchEventsGestureRecognizerDelegate, UITextInputPrivate, UIWebFormAccessoryDelegate, UIWKInteractionViewProtocol>
</span><span class="cx">
</span><ins>+@property (nonatomic, readonly) BOOL isEditable;
+
</ins><span class="cx"> - (void)setScrollView:(UIWebScrollView *)scrollView;
</span><span class="cx"> - (void)setPage:(PassRefPtr<WebKit::WebPageProxy>)page;
</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 (164119 => 164120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-14 20:51:38 UTC (rev 164119)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKViewIOS.mm 2014-02-14 20:53:13 UTC (rev 164120)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "WKScrollView.h"
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import <UIKit/UIImage_Private.h>
</span><ins>+#import <UIKit/UIPeripheralHost_Private.h>
</ins><span class="cx"> #import <UIKit/UIScreen.h>
</span><span class="cx"> #import <UIKit/UIScrollView_Private.h>
</span><span class="cx"> #import <UIKit/UIWindow_Private.h>
</span><span class="lines">@@ -46,6 +47,10 @@
</span><span class="cx"> - (void)_setDocumentScale:(CGFloat)newScale;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface UIScrollView (UIScrollViewInternal)
+- (void)_adjustForAutomaticKeyboardInfo:(NSDictionary*)info animated:(BOOL)animated lastAdjustment:(CGFloat*)lastAdjustment;
+@end
+
</ins><span class="cx"> @implementation WKView {
</span><span class="cx"> RetainPtr<WKScrollView> _scrollView;
</span><span class="cx"> RetainPtr<WKContentView> _contentView;
</span><span class="lines">@@ -60,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><ins>+ CGFloat _lastAdjustmentForScroller;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithCoder:(NSCoder *)coder
</span><span class="lines">@@ -83,6 +89,12 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
</ins><span class="cx"> - (void)setFrame:(CGRect)frame
</span><span class="cx"> {
</span><span class="cx"> CGRect oldFrame = [self frame];
</span><span class="lines">@@ -234,6 +246,12 @@
</span><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><span class="cx">
</span><span class="cx"> [self _frameOrBoundsChanged];
</span><ins>+
+ NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+ [center addObserver:self selector:@selector(_keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardDidChangeFrame:) name:UIKeyboardDidChangeFrameNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+ [center addObserver:self selector:@selector(_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_frameOrBoundsChanged
</span><span class="lines">@@ -267,6 +285,41 @@
</span><span class="cx"> return image.CGImage;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_keyboardChangedWithInfo:(NSDictionary *)keyboardInfo adjustScrollView:(BOOL)adjustScrollView
+{
+ // FIXME: We will also need to adjust the unobscured rect by taking into account the keyboard rect and the obscured insets.
+ if (adjustScrollView)
+ [_scrollView _adjustForAutomaticKeyboardInfo:keyboardInfo animated:YES lastAdjustment:&_lastAdjustmentForScroller];
+}
+
+- (void)_keyboardWillChangeFrame:(NSNotification *)notification
+{
+ if ([_contentView isAssistingNode])
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
+- (void)_keyboardDidChangeFrame:(NSNotification *)notification
+{
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:NO];
+}
+
+- (void)_keyboardWillShow:(NSNotification *)notification
+{
+ if ([_contentView isAssistingNode])
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
+- (void)_keyboardWillHide:(NSNotification *)notification
+{
+ // Ignore keyboard will hide notifications sent during rotation. They're just there for
+ // backwards compatibility reasons and processing the will hide notification would
+ // temporarily screw up the the unobscured view area.
+ if ([[UIPeripheralHost sharedInstance] rotationState])
+ return;
+
+ [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKView (Private)
</span></span></pre>
</div>
</div>
</body>
</html>