<!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>[208799] 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/208799">208799</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-11-16 11:13:04 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add logging support to VisibleContentRectUpdateInfo
https://bugs.webkit.org/show_bug.cgi?id=164825
Reviewed by Zalan Bujtas.
Add TextStream output to VisibleContentRectUpdateInfo. Just piping it into a logging
stream does single-line output, so also make a convenience dump() function that will
product multiline output. Result look like:
(VisibleContentRectUpdateInfo
(lastLayerTreeTransactionID 54)
(exposedContentRect (523.44,1258.63) width=676.20 height=901.60)
(unobscuredContentRect (523.44,1293.41) width=676.20 height=866.82)
(unobscuredRectInScrollViewCoordinates (0,39.50) width=768 height=984.50)
(customFixedPositionRect (219.64,935) width=980 height=1225)
(obscuredInset width=0 height=39.50)
(scale 1.14)
(inStableState 0)
(timestamp 736446.61)
(verticalVelocity -11.36))
* Shared/VisibleContentRectUpdateInfo.cpp:
(WebKit::VisibleContentRectUpdateInfo::dump):
(WebKit::operator<<):
* Shared/VisibleContentRectUpdateInfo.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh">trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208798 => 208799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-16 19:03:02 UTC (rev 208798)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-16 19:13:04 UTC (rev 208799)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-11-16 Simon Fraser <simon.fraser@apple.com>
+
+ Add logging support to VisibleContentRectUpdateInfo
+ https://bugs.webkit.org/show_bug.cgi?id=164825
+
+ Reviewed by Zalan Bujtas.
+
+ Add TextStream output to VisibleContentRectUpdateInfo. Just piping it into a logging
+ stream does single-line output, so also make a convenience dump() function that will
+ product multiline output. Result look like:
+
+ (VisibleContentRectUpdateInfo
+ (lastLayerTreeTransactionID 54)
+ (exposedContentRect (523.44,1258.63) width=676.20 height=901.60)
+ (unobscuredContentRect (523.44,1293.41) width=676.20 height=866.82)
+ (unobscuredRectInScrollViewCoordinates (0,39.50) width=768 height=984.50)
+ (customFixedPositionRect (219.64,935) width=980 height=1225)
+ (obscuredInset width=0 height=39.50)
+ (scale 1.14)
+ (inStableState 0)
+ (timestamp 736446.61)
+ (verticalVelocity -11.36))
+
+ * Shared/VisibleContentRectUpdateInfo.cpp:
+ (WebKit::VisibleContentRectUpdateInfo::dump):
+ (WebKit::operator<<):
+ * Shared/VisibleContentRectUpdateInfo.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:unobscuredRectInScrollViewCoordinates:obscuredInset:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]):
+
</ins><span class="cx"> 2016-11-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Scroll view scrolling and zooming animations can keep running across page loads
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp (208798 => 208799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2016-11-16 19:03:02 UTC (rev 208798)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.cpp 2016-11-16 19:13:04 UTC (rev 208799)
</span><span class="lines">@@ -27,7 +27,10 @@
</span><span class="cx"> #include "VisibleContentRectUpdateInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include <WebCore/TextStream.h>
</ins><span class="cx">
</span><ins>+using namespace WebCore;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> void VisibleContentRectUpdateInfo::encode(IPC::Encoder& encoder) const
</span><span class="lines">@@ -85,4 +88,43 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String VisibleContentRectUpdateInfo::dump() const
+{
+ TextStream stream;
+ stream << *this;
+ return stream.release();
+}
+
+TextStream& operator<<(TextStream& ts, const VisibleContentRectUpdateInfo& info)
+{
+ TextStream::GroupScope scope(ts);
+
+ ts << "VisibleContentRectUpdateInfo";
+
+ ts.dumpProperty("lastLayerTreeTransactionID", info.lastLayerTreeTransactionID());
+
+ ts.dumpProperty("exposedContentRect", info.exposedContentRect());
+ ts.dumpProperty("unobscuredContentRect", info.unobscuredContentRect());
+ ts.dumpProperty("unobscuredRectInScrollViewCoordinates", info.unobscuredRectInScrollViewCoordinates());
+ ts.dumpProperty("customFixedPositionRect", info.customFixedPositionRect());
+ ts.dumpProperty("obscuredInset", info.obscuredInset());
+
+ ts.dumpProperty("scale", info.scale());
+ ts.dumpProperty("inStableState", info.inStableState());
+ if (info.isChangingObscuredInsetsInteractively())
+ ts.dumpProperty("isChangingObscuredInsetsInteractively", info.isChangingObscuredInsetsInteractively());
+ if (info.enclosedInScrollableAncestorView())
+ ts.dumpProperty("enclosedInScrollableAncestorView", info.enclosedInScrollableAncestorView());
+
+ ts.dumpProperty("timestamp", info.timestamp());
+ if (info.horizontalVelocity())
+ ts.dumpProperty("horizontalVelocity", info.horizontalVelocity());
+ if (info.verticalVelocity())
+ ts.dumpProperty("verticalVelocity", info.verticalVelocity());
+ if (info.scaleChangeRate())
+ ts.dumpProperty("scaleChangeRate", info.scaleChangeRate());
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedVisibleContentRectUpdateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h (208798 => 208799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2016-11-16 19:03:02 UTC (rev 208798)
+++ trunk/Source/WebKit2/Shared/VisibleContentRectUpdateInfo.h 2016-11-16 19:13:04 UTC (rev 208799)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define VisibleContentRectUpdateInfo_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class Decoder;
</span><span class="lines">@@ -33,6 +34,10 @@
</span><span class="cx"> class Encoder;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace WebCore {
+class TextStream;
+}
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class VisibleContentRectUpdateInfo {
</span><span class="lines">@@ -83,6 +88,8 @@
</span><span class="cx"> void encode(IPC::Encoder&) const;
</span><span class="cx"> static bool decode(IPC::Decoder&, VisibleContentRectUpdateInfo&);
</span><span class="cx">
</span><ins>+ String dump() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> WebCore::FloatRect m_exposedContentRect;
</span><span class="cx"> WebCore::FloatRect m_unobscuredContentRect;
</span><span class="lines">@@ -117,6 +124,8 @@
</span><span class="cx"> && a.enclosedInScrollableAncestorView() == b.enclosedInScrollableAncestorView();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebCore::TextStream& operator<<(WebCore::TextStream&, const VisibleContentRectUpdateInfo&);
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // VisibleContentRectUpdateInfo_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (208798 => 208799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-11-16 19:03:02 UTC (rev 208798)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2016-11-16 19:13:04 UTC (rev 208799)
</span><span class="lines">@@ -380,8 +380,6 @@
</span><span class="cx"> RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy();
</span><span class="cx"> FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredRect, _page->customFixedPositionRect(), zoomScale, WebPageProxy::UnobscuredRectConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled());
</span><span class="cx">
</span><del>- LOG_WITH_STREAM(VisibleRects, stream << "didUpdateVisibleRect: visibleRect:" << visibleRect << " unobscuredRect:" << unobscuredRect << " fixedPositionRectForLayout:" << fixedPositionRectForLayout << " stable: " << isStableState);
-
</del><span class="cx"> VisibleContentRectUpdateInfo visibleContentRectUpdateInfo(
</span><span class="cx"> visibleRect,
</span><span class="cx"> unobscuredRect,
</span><span class="lines">@@ -399,6 +397,8 @@
</span><span class="cx"> velocityData.scaleChangeRate,
</span><span class="cx"> downcast<RemoteLayerTreeDrawingAreaProxy>(*drawingArea).lastCommittedLayerTreeTransactionID());
</span><span class="cx">
</span><ins>+ LOG_WITH_STREAM(VisibleRects, stream << "-[WKContentView didUpdateVisibleRect]" << visibleContentRectUpdateInfo.dump());
+
</ins><span class="cx"> _page->updateVisibleContentRects(visibleContentRectUpdateInfo);
</span><span class="cx">
</span><span class="cx"> FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->customFixedPositionRect(), zoomScale, WebPageProxy::UnobscuredRectConstraint::Unconstrained, scrollingCoordinator->visualViewportEnabled());
</span></span></pre>
</div>
</div>
</body>
</html>