<!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>[170218] 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/170218">170218</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 15:42:06 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS WebKit2: selection handles become too large when zooming a page.
https://bugs.webkit.org/show_bug.cgi?id=134084
<rdar://problem/16799164>
Reviewed by Benjamin Poulain.
Since the document view is zoomed, we add a subview that has the inverse transform
of the document view. This new view becomes the root for the selection hierarchy.
The new view has zero size, not to interfere with the existing gestures on the WKContenView
therefore we implement hitTest to detect interaction with the selection elements.
* UIProcess/ios/WKContentView.mm:
(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:]):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView cleanupInteraction]):
(-[WKContentView unscaledView]):
(-[WKContentView inverseScale]):
(-[WKContentView _updateUnscaledView]):
(-[WKContentView hitTest:withEvent:::]):
(-[WKContentView selectedTextRange]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170217 => 170218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-20 22:40:30 UTC (rev 170217)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 22:42:06 UTC (rev 170218)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-06-19 Enrica Casucci <enrica@apple.com>
+
+ iOS WebKit2: selection handles become too large when zooming a page.
+ https://bugs.webkit.org/show_bug.cgi?id=134084
+ <rdar://problem/16799164>
+
+ Reviewed by Benjamin Poulain.
+
+ Since the document view is zoomed, we add a subview that has the inverse transform
+ of the document view. This new view becomes the root for the selection hierarchy.
+ The new view has zero size, not to interfere with the existing gestures on the WKContenView
+ therefore we implement hitTest to detect interaction with the selection elements.
+
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView setupInteraction]):
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView unscaledView]):
+ (-[WKContentView inverseScale]):
+ (-[WKContentView _updateUnscaledView]):
+ (-[WKContentView hitTest:withEvent:::]):
+ (-[WKContentView selectedTextRange]):
+
</ins><span class="cx"> 2014-06-20 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Snapshotting WKThumbnailViews should not tell Web processes backing unparented WKViews that they're in window
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (170217 => 170218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-06-20 22:40:30 UTC (rev 170217)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-06-20 22:42:06 UTC (rev 170218)
</span><span class="lines">@@ -310,6 +310,7 @@
</span><span class="cx">
</span><span class="cx"> if (auto drawingArea = _page->drawingArea())
</span><span class="cx"> drawingArea->updateDebugIndicator();
</span><ins>+ [self _updateUnscaledView];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setMinimumSize:(CGSize)size
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (170217 => 170218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-06-20 22:40:30 UTC (rev 170217)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-06-20 22:42:06 UTC (rev 170218)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> RetainPtr<UIWebFormAccessory> _formAccessoryView;
</span><span class="cx"> RetainPtr<UIView> _highlightRootView;
</span><span class="cx"> RetainPtr<_UIHighlightView> _highlightView;
</span><ins>+ RetainPtr<UIView> _inverseScaleRootView;
</ins><span class="cx"> RetainPtr<NSString> _markedText;
</span><span class="cx"> RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
</span><span class="cx"> RetainPtr<WKAirPlayRoutePicker> _airPlayRoutePicker;
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> - (void)accessoryDone;
</span><span class="cx"> - (void)_didHandleKeyEvent:(WebIOSEvent *)event;
</span><span class="cx"> - (Vector<WebKit::WKOptionItem>&) assistedNodeSelectOptions;
</span><ins>+- (void)_updateUnscaledView;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170217 => 170218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-20 22:40:30 UTC (rev 170217)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-20 22:42:06 UTC (rev 170218)
</span><span class="lines">@@ -191,6 +191,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)setupInteraction
</span><span class="cx"> {
</span><ins>+ if (!_inverseScaleRootView) {
+ _inverseScaleRootView = adoptNS([[UIView alloc] init]);
+ [_inverseScaleRootView setOpaque:NO];
+ [_inverseScaleRootView layer].anchorPoint = CGPointMake(0, 0);
+ }
+ [self addSubview:_inverseScaleRootView.get()];
+ CGFloat inverseScale = 1 / [[self layer] transform].m11;
+ [_inverseScaleRootView setTransform:CGAffineTransformMakeScale(inverseScale, inverseScale)];
+
</ins><span class="cx"> _touchEventGestureRecognizer = adoptNS([[UIWebTouchEventsGestureRecognizer alloc] initWithTarget:self action:@selector(_webTouchEventsRecognized:) touchDelegate:self]);
</span><span class="cx"> [_touchEventGestureRecognizer setDelegate:self];
</span><span class="cx"> [self addGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="lines">@@ -243,7 +252,7 @@
</span><span class="cx"> _formInputSession = nil;
</span><span class="cx"> [_highlightView removeFromSuperview];
</span><span class="cx"> [_highlightRootView removeFromSuperview];
</span><del>-
</del><ins>+ [_inverseScaleRootView removeFromSuperview];
</ins><span class="cx"> [_touchEventGestureRecognizer setDelegate:nil];
</span><span class="cx"> [self removeGestureRecognizer:_touchEventGestureRecognizer.get()];
</span><span class="cx">
</span><span class="lines">@@ -271,6 +280,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (UIView*)unscaledView
+{
+ return _inverseScaleRootView.get();
+}
+
+- (CGFloat)inverseScale
+{
+ return [[_inverseScaleRootView layer] transform].m11;
+}
+
+- (void)_updateUnscaledView
+{
+ CGFloat inverseScale = 1 / [[self layer] transform].m11;
+ [_inverseScaleRootView setTransform:CGAffineTransformMakeScale(inverseScale, inverseScale)];
+ _selectionNeedsUpdate = YES;
+ [self _updateChangedSelection];
+}
+
+- (UIView *)hitTest:(CGPoint)point withEvent:(::UIEvent *)event
+{
+ for (UIView *subView in [_inverseScaleRootView.get() subviews]) {
+ UIView *hitView = [subView hitTest:[subView convertPoint:point fromView:self] withEvent:event];
+ if (hitView)
+ return hitView;
+ }
+ return [super hitTest:point withEvent:event];
+}
+
</ins><span class="cx"> - (const InteractionInformationAtPosition&)positionInformation
</span><span class="cx"> {
</span><span class="cx"> return _positionInformation;
</span><span class="lines">@@ -1670,11 +1707,34 @@
</span><span class="cx">
</span><span class="cx"> - (UITextRange *)selectedTextRange
</span><span class="cx"> {
</span><ins>+ FloatRect startRect = _page->editorState().caretRectAtStart;
+ FloatRect endRect = _page->editorState().caretRectAtEnd;
+ double inverseScale = [self inverseScale];
+ // We want to keep the original caret width, while the height scales with
+ // the content taking orientation into account.
+ // We achieve this by scaling the width with the inverse
+ // scale factor. This way, when it is converted from the content view
+ // the width remains unchanged.
+ if (startRect.width() < startRect.height())
+ startRect.setWidth(startRect.width() * inverseScale);
+ else
+ startRect.setHeight(startRect.height() * inverseScale);
+ if (endRect.width() < endRect.height()) {
+ double delta = endRect.width();
+ endRect.setWidth(endRect.width() * inverseScale);
+ delta = endRect.width() - delta;
+ endRect.move(delta, 0);
+ } else {
+ double delta = endRect.height();
+ endRect.setHeight(endRect.height() * inverseScale);
+ delta = endRect.height() - delta;
+ endRect.move(0, delta);
+ }
</ins><span class="cx"> return [WKTextRange textRangeWithState:_page->editorState().selectionIsNone
</span><span class="cx"> isRange:_page->editorState().selectionIsRange
</span><span class="cx"> isEditable:_page->editorState().isContentEditable
</span><del>- startRect:_page->editorState().caretRectAtStart
- endRect:_page->editorState().caretRectAtEnd
</del><ins>+ startRect:startRect
+ endRect:endRect
</ins><span class="cx"> selectionRects:[self webSelectionRects]
</span><span class="cx"> selectedTextLength:_page->editorState().selectedTextLength];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>