<!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>[168117] 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/168117">168117</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-01 13:32:57 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] The highlight view needs to be in WKWebView coordinates
https://bugs.webkit.org/show_bug.cgi?id=132435
<rdar://problem/16708861>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-01
Reviewed by Tim Horton.
_UIHighlightView needs to be in WKWebView coordinates so that it render unscaled for any page scale factor.
The view needs to be a child of WKContentView so that it moves/scales with the page.
To fix the issue, add an inverse transform root layer for the hightlight, and scale the coordinates to their
inverse scaled counterpart.
The scale is not updated live with the scaling of WKContentView but that should be fine since the view disappear
on any scaling operation (and I would prefer not add live painting during scaling animation).
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView cleanupInteraction]):
(-[WKContentView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
(-[WKContentView _cancelInteraction]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (168116 => 168117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-01 20:03:27 UTC (rev 168116)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-01 20:32:57 UTC (rev 168117)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-01 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] The highlight view needs to be in WKWebView coordinates
+ https://bugs.webkit.org/show_bug.cgi?id=132435
+ <rdar://problem/16708861>
+
+ Reviewed by Tim Horton.
+
+ _UIHighlightView needs to be in WKWebView coordinates so that it render unscaled for any page scale factor.
+ The view needs to be a child of WKContentView so that it moves/scales with the page.
+
+ To fix the issue, add an inverse transform root layer for the hightlight, and scale the coordinates to their
+ inverse scaled counterpart.
+
+ The scale is not updated live with the scaling of WKContentView but that should be fine since the view disappear
+ on any scaling operation (and I would prefer not add live painting during scaling animation).
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView cleanupInteraction]):
+ (-[WKContentView _didGetTapHighlightForRequest:color:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
+ (-[WKContentView _cancelInteraction]):
+
</ins><span class="cx"> 2014-05-01 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] There are many warnings with software backend
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (168116 => 168117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-05-01 20:03:27 UTC (rev 168116)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-05-01 20:32:57 UTC (rev 168117)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<UITextInputTraits> _traits;
</span><span class="cx"> RetainPtr<UIWebFormAccessory> _formAccessoryView;
</span><ins>+ RetainPtr<UIView> _highlightRootView;
</ins><span class="cx"> RetainPtr<_UIHighlightView> _highlightView;
</span><span class="cx"> RetainPtr<NSString> _markedText;
</span><span class="cx"> RetainPtr<WKActionSheetAssistant> _actionSheetAssistant;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (168116 => 168117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-01 20:03:27 UTC (rev 168116)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-05-01 20:32:57 UTC (rev 168117)
</span><span class="lines">@@ -230,6 +230,8 @@
</span><span class="cx"> _actionSheetAssistant = nil;
</span><span class="cx"> [_formInputSession invalidate];
</span><span class="cx"> _formInputSession = nil;
</span><ins>+ [_highlightView removeFromSuperview];
+ [_highlightRootView removeFromSuperview];
</ins><span class="cx"> [_touchEventGestureRecognizer setDelegate:nil];
</span><span class="cx"> [_singleTapGestureRecognizer setDelegate:nil];
</span><span class="cx"> [_doubleTapGestureRecognizer setDelegate:nil];
</span><span class="lines">@@ -353,15 +355,26 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const CGFloat UIWebViewMinimumHighlightRadius = 2.0;
</span><del>- if (!_highlightView) {
</del><ins>+
+ if (!_highlightRootView) {
+ _highlightRootView = adoptNS([[UIView alloc] init]);
+ [_highlightRootView setOpaque:NO];
+ [_highlightRootView layer].anchorPoint = CGPointMake(0, 0);
+
</ins><span class="cx"> _highlightView = adoptNS([[_UIHighlightView alloc] initWithFrame:CGRectZero]);
</span><span class="cx"> [_highlightView setOpaque:NO];
</span><span class="cx"> [_highlightView setCornerRadius:UIWebViewMinimumHighlightRadius];
</span><ins>+ [_highlightRootView addSubview:_highlightView.get()];
</ins><span class="cx"> }
</span><del>- [self addSubview:_highlightView.get()];
</del><ins>+ [self addSubview:_highlightRootView.get()];
+ CGFloat selfScale = [[self layer] transform].m11;
+ CGFloat highlightViewScale = 1 / selfScale;
+ [_highlightRootView setTransform:CGAffineTransformMakeScale(highlightViewScale, highlightViewScale)];
</ins><span class="cx">
</span><del>- RetainPtr<UIColor> highlightUIKitColor = adoptNS([[UIColor alloc] initWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)]);
- [_highlightView setColor:highlightUIKitColor.get()];
</del><ins>+ {
+ RetainPtr<UIColor> highlightUIKitColor = adoptNS([[UIColor alloc] initWithRed:(color.red() / 255.0) green:(color.green() / 255.0) blue:(color.blue() / 255.0) alpha:(color.alpha() / 255.0)]);
+ [_highlightView setColor:highlightUIKitColor.get()];
+ }
</ins><span class="cx">
</span><span class="cx"> bool allHighlightRectsAreRectilinear = true;
</span><span class="cx"> const size_t quadCount = highlightedQuads.size();
</span><span class="lines">@@ -369,7 +382,9 @@
</span><span class="cx"> for (size_t i = 0; i < quadCount; ++i) {
</span><span class="cx"> const FloatQuad& quad = highlightedQuads[i];
</span><span class="cx"> if (quad.isRectilinear()) {
</span><del>- CGRect rect = CGRectInset(quad.boundingBox(), -UIWebViewMinimumHighlightRadius, -UIWebViewMinimumHighlightRadius);
</del><ins>+ FloatRect boundingBox = quad.boundingBox();
+ boundingBox.scale(selfScale);
+ CGRect rect = CGRectInset(boundingBox, -UIWebViewMinimumHighlightRadius, -UIWebViewMinimumHighlightRadius);
</ins><span class="cx"> [rects addObject:[NSValue valueWithCGRect:rect]];
</span><span class="cx"> } else {
</span><span class="cx"> allHighlightRectsAreRectilinear = false;
</span><span class="lines">@@ -383,7 +398,8 @@
</span><span class="cx"> else {
</span><span class="cx"> RetainPtr<NSMutableArray> quads = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
</span><span class="cx"> for (size_t i = 0; i < quadCount; ++i) {
</span><del>- const FloatQuad& quad = highlightedQuads[i];
</del><ins>+ FloatQuad quad = highlightedQuads[i];
+ quad.scale(selfScale, selfScale);
</ins><span class="cx"> FloatQuad extendedQuad = inflateQuad(quad, UIWebViewMinimumHighlightRadius);
</span><span class="cx"> [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p1()]];
</span><span class="cx"> [quads addObject:[NSValue valueWithCGPoint:extendedQuad.p2()]];
</span><span class="lines">@@ -600,7 +616,7 @@
</span><span class="cx"> - (void)_cancelInteraction
</span><span class="cx"> {
</span><span class="cx"> _isTapHighlightIDValid = NO;
</span><del>- [_highlightView removeFromSuperview];
</del><ins>+ [_highlightRootView removeFromSuperview];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)hasSelectablePositionAtPoint:(CGPoint)point
</span></span></pre>
</div>
</div>
</body>
</html>