<!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>[166750] 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/166750">166750</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-03 15:55:39 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Add SPI to handle animated resize
https://bugs.webkit.org/show_bug.cgi?id=131141
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-04-03
Reviewed by Simon Fraser.
Set up a basic API to handle animated resize. The code does not do much at the moment,
it is mostly to have an interface we can implement later.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView setFrame:]):
(-[WKWebView setBounds:]):
(-[WKWebView _didCommitLayerTree:WebKit::]):
(-[WKWebView _frameOrBoundsChangedFrom:]):
(-[WKWebView _beginAnimatedResizeToSize:obscuredInsets:minimumLayoutSizeOverride:]):
(-[WKWebView _endAnimatedResize]):
(-[WKWebView _frameOrBoundsChanged]): Deleted.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:</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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166749 => 166750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-03 22:47:22 UTC (rev 166749)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-03 22:55:39 UTC (rev 166750)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-03 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Add SPI to handle animated resize
+ https://bugs.webkit.org/show_bug.cgi?id=131141
+
+ Reviewed by Simon Fraser.
+
+ Set up a basic API to handle animated resize. The code does not do much at the moment,
+ it is mostly to have an interface we can implement later.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView setFrame:]):
+ (-[WKWebView setBounds:]):
+ (-[WKWebView _didCommitLayerTree:WebKit::]):
+ (-[WKWebView _frameOrBoundsChangedFrom:]):
+ (-[WKWebView _beginAnimatedResizeToSize:obscuredInsets:minimumLayoutSizeOverride:]):
+ (-[WKWebView _endAnimatedResize]):
+ (-[WKWebView _frameOrBoundsChanged]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
</ins><span class="cx"> 2014-04-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Pixelated WebView when display is changed from hiDPI to regularDPI
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166749 => 166750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-03 22:47:22 UTC (rev 166749)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-03 22:55:39 UTC (rev 166750)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx">
</span><span class="cx"> UIEdgeInsets _obscuredInsets;
</span><span class="cx"> bool _isChangingObscuredInsetsInteractively;
</span><ins>+ BOOL _isAnimatingResize;
</ins><span class="cx"> CGFloat _lastAdjustmentForScroller;
</span><span class="cx"> CGFloat _keyboardVerticalOverlap;
</span><span class="cx">
</span><span class="lines">@@ -180,7 +181,7 @@
</span><span class="cx"> [_contentView setFrame:bounds];
</span><span class="cx"> [_scrollView addSubview:_contentView.get()];
</span><span class="cx">
</span><del>- [self _frameOrBoundsChanged];
</del><ins>+ [self _frameOrBoundsChangedFrom:self.bounds];
</ins><span class="cx">
</span><span class="cx"> NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
</span><span class="cx"> [center addObserver:self selector:@selector(_keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
</span><span class="lines">@@ -346,10 +347,11 @@
</span><span class="cx"> - (void)setFrame:(CGRect)frame
</span><span class="cx"> {
</span><span class="cx"> CGRect oldFrame = self.frame;
</span><ins>+ CGRect oldBounds = self.bounds;
</ins><span class="cx"> [super setFrame:frame];
</span><span class="cx">
</span><span class="cx"> if (!CGSizeEqualToSize(oldFrame.size, frame.size))
</span><del>- [self _frameOrBoundsChanged];
</del><ins>+ [self _frameOrBoundsChangedFrom:oldBounds];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setBounds:(CGRect)bounds
</span><span class="lines">@@ -358,7 +360,7 @@
</span><span class="cx"> [super setBounds:bounds];
</span><span class="cx">
</span><span class="cx"> if (!CGSizeEqualToSize(oldBounds.size, bounds.size))
</span><del>- [self _frameOrBoundsChanged];
</del><ins>+ [self _frameOrBoundsChangedFrom:oldBounds];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (UIScrollView *)scrollView
</span><span class="lines">@@ -447,6 +449,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!_customContentView);
</span><span class="cx">
</span><ins>+ if (_isAnimatingResize)
+ return;
+
</ins><span class="cx"> [_scrollView setContentSize:[_contentView frame].size];
</span><span class="cx"> [_scrollView setMinimumZoomScale:layerTreeTransaction.minimumScaleFactor()];
</span><span class="cx"> [_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
</span><span class="lines">@@ -667,7 +672,7 @@
</span><span class="cx"> [_contentView didZoomToScale:scale];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_frameOrBoundsChanged
</del><ins>+- (void)_frameOrBoundsChangedFrom:(CGRect)oldBounds
</ins><span class="cx"> {
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><span class="lines">@@ -677,6 +682,14 @@
</span><span class="cx"> [_contentView setMinimumSize:bounds.size];
</span><span class="cx"> [_customContentView web_setMinimumSize:bounds.size];
</span><span class="cx"> [self _updateVisibleContentRects];
</span><ins>+
+ if (_isAnimatingResize && !_customContentView) {
+ CGFloat oldWebViewWidthInContentCoordinate = oldBounds.size.width / contentZoomScale(self);
+ CGFloat visibleContentViewWidthInContentCoordinate = std::min([_contentView bounds].size.width, oldWebViewWidthInContentCoordinate);
+ CGFloat targetScale = bounds.size.width / visibleContentViewWidthInContentCoordinate;
+ [_scrollView setZoomScale:targetScale];
+ // FIXME: compute the real target offset based on the future exposed rect, the content and limit it to the valid range.
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Unobscured content rect where the user can interact. When the keyboard is up, this should be the area above or bellow the keyboard, wherever there is enough space.
</span><span class="lines">@@ -1184,6 +1197,30 @@
</span><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_beginAnimatedResizeToSize:(CGSize)futureSize obscuredInsets:(UIEdgeInsets)futureObscuredInsets minimumLayoutSizeOverride:(CGSize)futureMinimumLayoutSize
+{
+ _isAnimatingResize = YES;
+
+ if (_customContentView)
+ return;
+
+ [_scrollView setMinimumZoomScale:std::min(futureSize.width / [_contentView bounds].size.width, [_scrollView minimumZoomScale])];
+
+ _obscuredInsets = futureObscuredInsets;
+ if (_hasStaticMinimumLayoutSize)
+ _minimumLayoutSizeOverride = futureMinimumLayoutSize;
+
+ // FIXME: Send a single message to the WebProcess to layout and repaint instead.
+ // FIXME: Send resize event.
+ [_contentView setMinimumLayoutSize:futureMinimumLayoutSize];
+}
+
+- (void)_endAnimatedResize
+{
+ _isAnimatingResize = NO;
+ [self _updateVisibleContentRects];
+}
+
</ins><span class="cx"> - (void)_showInspectorIndication
</span><span class="cx"> {
</span><span class="cx"> [_contentView setShowingInspectorIndication:YES];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (166749 => 166750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-03 22:47:22 UTC (rev 166749)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2014-04-03 22:55:39 UTC (rev 166750)
</span><span class="lines">@@ -103,6 +103,9 @@
</span><span class="cx"> - (void)_beginInteractiveObscuredInsetsChange;
</span><span class="cx"> - (void)_endInteractiveObscuredInsetsChange;
</span><span class="cx">
</span><ins>+- (void)_beginAnimatedResizeToSize:(CGSize)futureSize obscuredInsets:(UIEdgeInsets)futureObscuredInsets minimumLayoutSizeOverride:(CGSize)futureMinimumLayoutSize;
+- (void)_endAnimatedResize;
+
</ins><span class="cx"> - (void)_showInspectorIndication;
</span><span class="cx"> - (void)_hideInspectorIndication;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>