<!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>[168660] trunk/Source/WebCore</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/168660">168660</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 17:13:58 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add debug dumping for ViewportConfiguration
https://bugs.webkit.org/show_bug.cgi?id=132843
Reviewed by Benjamin Poulain.
Add some TextStream-based dumping for ViewportConfiguration.
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::updateConfiguration):
(WebCore::ViewportConfigurationTextStream::ViewportConfigurationTextStream):
(WebCore::ViewportConfigurationTextStream::increaseIndent):
(WebCore::ViewportConfigurationTextStream::decreaseIndent):
(WebCore::dumpProperty):
(WebCore::ViewportConfigurationTextStream::writeIndent):
(WebCore::ViewportConfigurationTextStream::operator<<):
(WebCore::ViewportConfiguration::description):
(WebCore::ViewportConfiguration::dump):
* page/ViewportConfiguration.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationh">trunk/Source/WebCore/page/ViewportConfiguration.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168659 => 168660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-13 00:11:19 UTC (rev 168659)
+++ trunk/Source/WebCore/ChangeLog 2014-05-13 00:13:58 UTC (rev 168660)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-12 Simon Fraser <simon.fraser@apple.com>
+
+ Add debug dumping for ViewportConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=132843
+
+ Reviewed by Benjamin Poulain.
+
+ Add some TextStream-based dumping for ViewportConfiguration.
+
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::updateConfiguration):
+ (WebCore::ViewportConfigurationTextStream::ViewportConfigurationTextStream):
+ (WebCore::ViewportConfigurationTextStream::increaseIndent):
+ (WebCore::ViewportConfigurationTextStream::decreaseIndent):
+ (WebCore::dumpProperty):
+ (WebCore::ViewportConfigurationTextStream::writeIndent):
+ (WebCore::ViewportConfigurationTextStream::operator<<):
+ (WebCore::ViewportConfiguration::description):
+ (WebCore::ViewportConfiguration::dump):
+ * page/ViewportConfiguration.h:
+
</ins><span class="cx"> 2014-05-12 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Followup to "Teach Editor to support more direct replacement of a Node"
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (168659 => 168660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-05-13 00:11:19 UTC (rev 168659)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-05-13 00:13:58 UTC (rev 168660)
</span><span class="lines">@@ -26,8 +26,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ViewportConfiguration.h"
</span><span class="cx">
</span><ins>+#include <WebCore/TextStream.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #include "WebCoreSystemInterface.h"
</span><span class="lines">@@ -313,4 +315,147 @@
</span><span class="cx"> return m_minimumLayoutSize.height();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifndef NDEBUG
+class ViewportConfigurationTextStream : public TextStream {
+public:
+ ViewportConfigurationTextStream()
+ : m_indent(0)
+ {
+ }
+
+ using TextStream::operator<<;
+
+ ViewportConfigurationTextStream& operator<<(const ViewportConfiguration::Parameters&);
+ ViewportConfigurationTextStream& operator<<(const ViewportArguments&);
+
+ void increaseIndent() { ++m_indent; }
+ void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
+
+ void writeIndent();
+
+private:
+ int m_indent;
+};
+
+template <typename T>
+static void dumpProperty(ViewportConfigurationTextStream& ts, String name, T value)
+{
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(" << name << " ";
+ ts << value << ")";
+ ts.decreaseIndent();
+}
+
+void ViewportConfigurationTextStream::writeIndent()
+{
+ for (int i = 0; i < m_indent; ++i)
+ *this << " ";
+}
+
+ViewportConfigurationTextStream& ViewportConfigurationTextStream::operator<<(const ViewportConfiguration::Parameters& parameters)
+{
+ ViewportConfigurationTextStream& ts = *this;
+
+ ts.increaseIndent();
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(width " << parameters.width << ", set: " << (parameters.widthIsSet ? "true" : "false") << ")";
+
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(height " << parameters.height << ", set: " << (parameters.heightIsSet ? "true" : "false") << ")";
+
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(initialScale " << parameters.width << ", set: " << (parameters.initialScaleIsSet ? "true" : "false") << ")";
+ ts.decreaseIndent();
+
+ dumpProperty(ts, "minimumScale", parameters.minimumScale);
+ dumpProperty(ts, "maximumScale", parameters.maximumScale);
+ dumpProperty(ts, "allowsUserScaling", parameters.allowsUserScaling);
+
+ return ts;
+}
+
+ViewportConfigurationTextStream& ViewportConfigurationTextStream::operator<<(const ViewportArguments& viewportArguments)
+{
+ ViewportConfigurationTextStream& ts = *this;
+
+ ts.increaseIndent();
+
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(width " << viewportArguments.width << ", minWidth " << viewportArguments.minWidth << ", maxWidth " << viewportArguments.maxWidth << ")";
+
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(height " << viewportArguments.height << ", minHeight " << viewportArguments.minHeight << ", maxHeight " << viewportArguments.maxHeight << ")";
+
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(zoom " << viewportArguments.zoom << ", minZoom " << viewportArguments.minZoom << ", maxZoom " << viewportArguments.maxZoom << ")";
+ ts.decreaseIndent();
+
+#if PLATFORM(IOS)
+ dumpProperty(ts, "minimalUI", viewportArguments.minimalUI);
+#endif
+ return ts;
+}
+
+CString ViewportConfiguration::description() const
+{
+ ViewportConfigurationTextStream ts;
+
+ ts << "(viewport-configuration " << (void*)this;
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(viewport arguments";
+ ts << m_viewportArguments;
+ ts << ")";
+ ts.decreaseIndent();
+
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(configuration";
+ ts << m_configuration;
+ ts << ")";
+ ts.decreaseIndent();
+
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(default configuration";
+ ts << m_defaultConfiguration;
+ ts << ")";
+ ts.decreaseIndent();
+
+ dumpProperty(ts, "contentSize", m_contentSize);
+ dumpProperty(ts, "minimumLayoutSize", m_minimumLayoutSize);
+
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(computed initial scale " << initialScale() << ")\n";
+ ts.writeIndent();
+ ts << "(computed minimum scale " << minimumScale() << ")\n";
+ ts.writeIndent();
+ ts << "(computed layout size " << layoutSize() << ")";
+ ts.decreaseIndent();
+
+ ts << ")\n";
+
+ return ts.release().utf8();
+}
+
+void ViewportConfiguration::dump() const
+{
+ fprintf(stderr, "%s", description().data());
+}
+
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (168659 => 168660)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2014-05-13 00:11:19 UTC (rev 168659)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2014-05-13 00:13:58 UTC (rev 168660)
</span><span class="lines">@@ -87,7 +87,12 @@
</span><span class="cx"> static Parameters textDocumentParameters();
</span><span class="cx"> static Parameters imageDocumentParameters();
</span><span class="cx"> static Parameters xhtmlMobileParameters();
</span><del>-
</del><ins>+
+#ifndef NDEBUG
+ WTF::CString description() const;
+ void dump() const;
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> void updateConfiguration();
</span><span class="cx"> int layoutWidth() const;
</span></span></pre>
</div>
</div>
</body>
</html>