<!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>[174704] trunk/Source</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/174704">174704</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-10-14 15:23:37 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve debug description of WAKViews
https://bugs.webkit.org/show_bug.cgi?id=137716
Reviewed by Simon Fraser.
Source/WebCore:
No new tests because there is no behavior change.
* platform/ios/wak/WAKView.mm:
(-[WAKView description]):
* platform/ios/wak/WKView.h:
* platform/ios/wak/WKView.mm:
(WKViewGetOrigin):
Source/WebKit/mac:
* WebView/WebView.mm:
(-[WebView _touchEventRegions]): Adding a comment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKViewmm">trunk/Source/WebCore/platform/ios/wak/WAKView.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWKViewh">trunk/Source/WebCore/platform/ios/wak/WKView.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWKViewmm">trunk/Source/WebCore/platform/ios/wak/WKView.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebCore/ChangeLog        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-14 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Improve debug description of WAKViews
+ https://bugs.webkit.org/show_bug.cgi?id=137716
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * platform/ios/wak/WAKView.mm:
+ (-[WAKView description]):
+ * platform/ios/wak/WKView.h:
+ * platform/ios/wak/WKView.mm:
+ (WKViewGetOrigin):
+
</ins><span class="cx"> 2014-10-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce an isCSSAnimated flag on RenderElement for performance
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKView.mm (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WAKView.mm        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebCore/platform/ios/wak/WAKView.mm        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -754,7 +754,20 @@
</span><span class="cx"> {
</span><span class="cx"> NSMutableString *description = [NSMutableString stringWithFormat:@"<%@: WAK: %p (WK: %p); ", [self class], self, viewRef];
</span><span class="cx">
</span><ins>+ float scale = [self scale];
+ if (scale != 1)
+ [description appendFormat:@"scale = %g ", scale];
+
+ CGPoint origin = WKViewGetOrigin(viewRef);
+ if (origin.x || origin.y)
+ [description appendFormat:@"origin = (%g %g) ", origin.x, origin.y];
+
+ CGRect bounds = [self bounds];
</ins><span class="cx"> CGRect frame = [self frame];
</span><ins>+
+ if (frame.origin.x != bounds.origin.x || frame.origin.y != bounds.origin.y || frame.size.width != bounds.size.width || frame.size.height != bounds.size.height)
+ [description appendFormat:@"bounds = (%g %g; %g %g) ", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height];
+
</ins><span class="cx"> [description appendFormat:@"frame = (%g %g; %g %g)>", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height];
</span><span class="cx">
</span><span class="cx"> return description;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWKViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WKView.h (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WKView.h        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.h        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -112,6 +112,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT CGRect WKViewGetFrame (WKViewRef view);
</span><span class="cx">
</span><ins>+CGPoint WKViewGetOrigin(WKViewRef);
+
</ins><span class="cx"> WEBCORE_EXPORT void WKViewSetScale (WKViewRef view, float scale);
</span><span class="cx"> WEBCORE_EXPORT float WKViewGetScale (WKViewRef view);
</span><span class="cx"> CGAffineTransform _WKViewGetTransform(WKViewRef view);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WKView.mm (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WKView.mm        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.mm        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -143,6 +143,16 @@
</span><span class="cx"> return WKViewConvertRectToSuperview(view, view->bounds);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CGPoint WKViewGetOrigin(WKViewRef view)
+{
+ if (!view) {
+ WKError("invalid parameter");
+ return CGPointZero;
+ }
+
+ return view->origin;
+}
+
</ins><span class="cx"> static void _WKViewRecursivelyInvalidateGState(WKViewRef view)
</span><span class="cx"> {
</span><span class="cx"> if (!view) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-10-14 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Improve debug description of WAKViews
+ https://bugs.webkit.org/show_bug.cgi?id=137716
+
+ Reviewed by Simon Fraser.
+
+ * WebView/WebView.mm:
+ (-[WebView _touchEventRegions]): Adding a comment.
+
+2014-10-14 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Addressing post-review comment.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137550
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (174703 => 174704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2014-10-14 21:50:28 UTC (rev 174703)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2014-10-14 22:23:37 UTC (rev 174704)
</span><span class="lines">@@ -3658,6 +3658,11 @@
</span><span class="cx"> if (rect.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ // Note that these rectangles are in the coordinate system of the document (inside the WebHTMLView), which is not
+ // the same as the coordinate system of the WebView. If you want to do comparisons with locations in the WebView,
+ // you must convert between the two using WAKView's convertRect:toView: selector. This will take care of scaling
+ // and translations (which are relevant for right-to-left column layout).
+
</ins><span class="cx"> // The event region wants this points in this order:
</span><span class="cx"> // p2------p3
</span><span class="cx"> // | |
</span></span></pre>
</div>
</div>
</body>
</html>