<!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>[191216] 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/191216">191216</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 15:31:26 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make TextStream the canonical way to log classes in WebCore
https://bugs.webkit.org/show_bug.cgi?id=150256
Reviewed by Sam Weinig.
We vacillated between PrintStream and TextStream as being the canonical way
to stringify WebCore data structures. This patch solidifies TextStream
as the solution, since it has convenient stream syntax, and is what we
use for render tree dumps.
Remove TextStream member functions that output non-simple structs
(sizes, points and rects), replacing them with free operator<< functions
in the .cpp file for the relevant class. Formatting is currently consistent
with RenderTreeAsText output, to avoid breaking tests.
Remove custom FloatRect outputting in SVG and RemoteLayerTreeTransaction.
Source/WebCore:
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/graphics/FloatPoint.cpp:
(WebCore::operator<<):
(WebCore::FloatPoint::dump): Deleted.
* platform/graphics/FloatPoint.h:
* platform/graphics/FloatRect.cpp:
(WebCore::operator<<):
(WebCore::FloatRect::dump): Deleted.
* platform/graphics/FloatRect.h:
* platform/graphics/FloatSize.cpp:
(WebCore::FloatSize::FloatSize):
(WebCore::operator<<):
(WebCore::FloatSize::dump): Deleted.
* platform/graphics/FloatSize.h:
* platform/graphics/IntPoint.cpp:
(WebCore::operator<<):
(WebCore::IntPoint::dump): Deleted.
* platform/graphics/IntPoint.h:
* platform/graphics/IntRect.cpp:
(WebCore::operator<<):
(WebCore::IntRect::dump): Deleted.
* platform/graphics/IntRect.h:
* platform/graphics/IntSize.cpp:
(WebCore::operator<<):
(WebCore::IntSize::dump): Deleted.
* platform/graphics/IntSize.h:
* platform/graphics/LayoutPoint.cpp: Copied from Source/WebCore/platform/graphics/IntPoint.cpp.
(WebCore::operator<<):
* platform/graphics/LayoutPoint.h:
* platform/graphics/LayoutRect.cpp:
(WebCore::operator<<):
* platform/graphics/LayoutRect.h:
* platform/graphics/LayoutSize.cpp: Copied from Source/WebCore/platform/graphics/IntPoint.cpp.
(WebCore::operator<<):
* platform/graphics/LayoutSize.h:
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(WebCore::MediaSampleAVFObjC::dump):
* platform/text/TextStream.cpp:
(WebCore::TextStream::operator<<):
* platform/text/TextStream.h:
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::operator<<): Deleted.
Source/WebKit2:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::RemoteScrollingTreeTextStream::operator<<): Deleted.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTextStream::operator<<): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointcpp">trunk/Source/WebCore/platform/graphics/FloatPoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRectcpp">trunk/Source/WebCore/platform/graphics/FloatRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizecpp">trunk/Source/WebCore/platform/graphics/FloatSize.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointcpp">trunk/Source/WebCore/platform/graphics/IntPoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointh">trunk/Source/WebCore/platform/graphics/IntPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRectcpp">trunk/Source/WebCore/platform/graphics/IntRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizecpp">trunk/Source/WebCore/platform/graphics/IntSize.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointh">trunk/Source/WebCore/platform/graphics/LayoutPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRectcpp">trunk/Source/WebCore/platform/graphics/LayoutRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutSizeh">trunk/Source/WebCore/platform/graphics/LayoutSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextStreamcpp">trunk/Source/WebCore/platform/text/TextStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextStreamh">trunk/Source/WebCore/platform/text/TextStream.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutPointcpp">trunk/Source/WebCore/platform/graphics/LayoutPoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutSizecpp">trunk/Source/WebCore/platform/graphics/LayoutSize.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -2213,7 +2213,9 @@
</span><span class="cx"> platform/graphics/IntPoint.cpp
</span><span class="cx"> platform/graphics/IntRect.cpp
</span><span class="cx"> platform/graphics/IntSize.cpp
</span><ins>+ platform/graphics/LayoutPoint.cpp
</ins><span class="cx"> platform/graphics/LayoutRect.cpp
</span><ins>+ platform/graphics/LayoutSize.cpp
</ins><span class="cx"> platform/graphics/MediaPlayer.cpp
</span><span class="cx"> platform/graphics/NamedImageGeneratedImage.cpp
</span><span class="cx"> platform/graphics/Path.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/ChangeLog 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2015-10-16 Simon Fraser <simon.fraser@apple.com>
+
+ Make TextStream the canonical way to log classes in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=150256
+
+ Reviewed by Sam Weinig.
+
+ We vacillated between PrintStream and TextStream as being the canonical way
+ to stringify WebCore data structures. This patch solidifies TextStream
+ as the solution, since it has convenient stream syntax, and is what we
+ use for render tree dumps.
+
+ Remove TextStream member functions that output non-simple structs
+ (sizes, points and rects), replacing them with free operator<< functions
+ in the .cpp file for the relevant class. Formatting is currently consistent
+ with RenderTreeAsText output, to avoid breaking tests.
+
+ Remove custom FloatRect outputting in SVG and RemoteLayerTreeTransaction.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/FloatPoint.cpp:
+ (WebCore::operator<<):
+ (WebCore::FloatPoint::dump): Deleted.
+ * platform/graphics/FloatPoint.h:
+ * platform/graphics/FloatRect.cpp:
+ (WebCore::operator<<):
+ (WebCore::FloatRect::dump): Deleted.
+ * platform/graphics/FloatRect.h:
+ * platform/graphics/FloatSize.cpp:
+ (WebCore::FloatSize::FloatSize):
+ (WebCore::operator<<):
+ (WebCore::FloatSize::dump): Deleted.
+ * platform/graphics/FloatSize.h:
+ * platform/graphics/IntPoint.cpp:
+ (WebCore::operator<<):
+ (WebCore::IntPoint::dump): Deleted.
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.cpp:
+ (WebCore::operator<<):
+ (WebCore::IntRect::dump): Deleted.
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.cpp:
+ (WebCore::operator<<):
+ (WebCore::IntSize::dump): Deleted.
+ * platform/graphics/IntSize.h:
+ * platform/graphics/LayoutPoint.cpp: Copied from Source/WebCore/platform/graphics/IntPoint.cpp.
+ (WebCore::operator<<):
+ * platform/graphics/LayoutPoint.h:
+ * platform/graphics/LayoutRect.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/LayoutRect.h:
+ * platform/graphics/LayoutSize.cpp: Copied from Source/WebCore/platform/graphics/IntPoint.cpp.
+ (WebCore::operator<<):
+ * platform/graphics/LayoutSize.h:
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ (WebCore::MediaSampleAVFObjC::dump):
+ * platform/text/TextStream.cpp:
+ (WebCore::TextStream::operator<<):
+ * platform/text/TextStream.h:
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::operator<<): Deleted.
+
</ins><span class="cx"> 2015-10-16 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Hide all plugin names except Flash, Java, and QuickTime
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -480,6 +480,8 @@
</span><span class="cx"> 0F15ED5C1B7EC7C500EDDFEB /* WillChangeData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F1774801378B772009DA76A /* ScrollAnimatorIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */; };
</span><span class="cx"> 0F1774811378B772009DA76A /* ScrollAnimatorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */; };
</span><ins>+ 0F36E7371BD1837A002DB891 /* LayoutPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */; settings = {ASSET_TAGS = (); }; };
+ 0F36E7391BD184B9002DB891 /* LayoutSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> 0F3C725E1974874B00AEDD0C /* ImageSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F3C725D1974874B00AEDD0C /* ImageSource.cpp */; };
</span><span class="cx"> 0F3DD44F12F5EA1B000D9190 /* ShadowBlur.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F3DD44D12F5EA1B000D9190 /* ShadowBlur.cpp */; };
</span><span class="cx"> 0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F3DD44E12F5EA1B000D9190 /* ShadowBlur.h */; };
</span><span class="lines">@@ -7709,6 +7711,8 @@
</span><span class="cx"> 0F15ED5A1B7EC7C500EDDFEB /* WillChangeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WillChangeData.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F17747E1378B771009DA76A /* ScrollAnimatorIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimatorIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F17747F1378B772009DA76A /* ScrollAnimatorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollAnimatorIOS.mm; sourceTree = "<group>"; };
</span><ins>+ 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutPoint.cpp; sourceTree = "<group>"; };
+ 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutSize.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0F3C725D1974874B00AEDD0C /* ImageSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageSource.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F3DD44D12F5EA1B000D9190 /* ShadowBlur.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowBlur.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F3DD44E12F5EA1B000D9190 /* ShadowBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowBlur.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -21431,9 +21435,11 @@
</span><span class="cx"> 07AC46FF1952102100EE9723 /* ISOVTTCue.cpp */,
</span><span class="cx"> 07AC47001952102100EE9723 /* ISOVTTCue.h */,
</span><span class="cx"> 65CC6BED16014EC0000ED27D /* Latin1TextIterator.h */,
</span><ins>+ 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */,
</ins><span class="cx"> 141DC04B164834B900371E5A /* LayoutPoint.h */,
</span><span class="cx"> 141DC04C164834B900371E5A /* LayoutRect.cpp */,
</span><span class="cx"> 141DC04D164834B900371E5A /* LayoutRect.h */,
</span><ins>+ 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */,
</ins><span class="cx"> 141DC04E164834B900371E5A /* LayoutSize.h */,
</span><span class="cx"> 07E3DFD01A9E786500764CA8 /* MediaPlaybackTarget.h */,
</span><span class="cx"> 079216531AA560AA00A3C049 /* MediaPlaybackTargetClient.h */,
</span><span class="lines">@@ -29371,6 +29377,7 @@
</span><span class="cx"> E157A8E01817331C009F821D /* JSCryptoKey.cpp in Sources */,
</span><span class="cx"> E157A8E818184C67009F821D /* JSCryptoKeyCustom.cpp in Sources */,
</span><span class="cx"> E1F80B8D183172B5007885C3 /* JSCryptoKeyPair.cpp in Sources */,
</span><ins>+ 0F36E7391BD184B9002DB891 /* LayoutSize.cpp in Sources */,
</ins><span class="cx"> E1F80B8A183172A2007885C3 /* JSCryptoKeyPairCustom.cpp in Sources */,
</span><span class="cx"> E125F85118283A5600D84CD9 /* JSCryptoKeySerializationJWK.cpp in Sources */,
</span><span class="cx"> E125F83D182411E700D84CD9 /* JSCryptoOperationData.cpp in Sources */,
</span><span class="lines">@@ -29417,6 +29424,7 @@
</span><span class="cx"> 659DDC8209E198BA001BF3C6 /* JSDocument.cpp in Sources */,
</span><span class="cx"> 49C7BA8D1042F5B10009D447 /* JSDocumentCustom.cpp in Sources */,
</span><span class="cx"> 1A494EDE0A123F4C00FDAFC1 /* JSDocumentFragment.cpp in Sources */,
</span><ins>+ 0F36E7371BD1837A002DB891 /* LayoutPoint.cpp in Sources */,
</ins><span class="cx"> 7C33F3621B4A050400502CAF /* JSDocumentFragmentCustom.cpp in Sources */,
</span><span class="cx"> 65DF31F509D1CC60000BE325 /* JSDocumentType.cpp in Sources */,
</span><span class="cx"> 7C33F35E1B4A04CE00502CAF /* JSDocumentTypeCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -30,10 +30,10 @@
</span><span class="cx"> #include "AffineTransform.h"
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "IntPoint.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <math.h>
</span><del>-#include <wtf/PrintStream.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -80,9 +80,9 @@
</span><span class="cx"> return FloatPoint(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FloatPoint::dump(PrintStream& out) const
</del><ins>+TextStream& operator<<(TextStream& ts, const FloatPoint& p)
</ins><span class="cx"> {
</span><del>- out.printf("(%f, %f)", x(), y());
</del><ins>+ return ts << "(" << TextStream::FormatNumberRespectingIntegers(p.x()) << "," << TextStream::FormatNumberRespectingIntegers(p.y()) << ")";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> class TransformationMatrix;
</span><span class="cx"> class IntPoint;
</span><span class="cx"> class IntSize;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class FloatPoint {
</span><span class="cx"> public:
</span><span class="lines">@@ -148,8 +149,6 @@
</span><span class="cx"> FloatPoint matrixTransform(const TransformationMatrix&) const;
</span><span class="cx"> FloatPoint matrixTransform(const AffineTransform&) const;
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> private:
</span><span class="cx"> float m_x, m_y;
</span><span class="cx"> };
</span><span class="lines">@@ -259,6 +258,8 @@
</span><span class="cx"> return WTF::areEssentiallyEqual(a.x(), b.x()) && WTF::areEssentiallyEqual(a.y(), b.y());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatPoint&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -29,10 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "IntRect.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <math.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/PrintStream.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -226,9 +226,10 @@
</span><span class="cx"> return IntRect(roundedIntPoint(rect.location()), roundedIntSize(rect.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FloatRect::dump(PrintStream& out) const
</del><ins>+TextStream& operator<<(TextStream& ts, const FloatRect &r)
</ins><span class="cx"> {
</span><del>- out.print(location(), " ", size());
</del><ins>+ return ts << "at (" << TextStream::FormatNumberRespectingIntegers(r.x()) << "," << TextStream::FormatNumberRespectingIntegers(r.y())
+ << ") size " << TextStream::FormatNumberRespectingIntegers(r.width()) << "x" << TextStream::FormatNumberRespectingIntegers(r.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx">
</span><span class="cx"> class IntRect;
</span><span class="cx"> class IntPoint;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class FloatRect {
</span><span class="cx"> public:
</span><span class="lines">@@ -181,8 +182,6 @@
</span><span class="cx"> operator cairo_rectangle_t() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> static FloatRect infiniteRect();
</span><span class="cx"> bool isInfinite() const;
</span><span class="cx">
</span><span class="lines">@@ -252,6 +251,8 @@
</span><span class="cx"> WEBCORE_EXPORT IntRect enclosingIntRect(const FloatRect&);
</span><span class="cx"> WEBCORE_EXPORT IntRect roundedIntRect(const FloatRect&);
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatRect&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -29,13 +29,15 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "IntSize.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <limits>
</span><span class="cx"> #include <math.h>
</span><del>-#include <wtf/PrintStream.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-FloatSize::FloatSize(const IntSize& size) : m_width(size.width()), m_height(size.height())
</del><ins>+FloatSize::FloatSize(const IntSize& size)
+ : m_width(size.width())
+ , m_height(size.height())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -59,9 +61,10 @@
</span><span class="cx"> return FloatSize(narrowPrecisionToFloat(width), narrowPrecisionToFloat(height));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FloatSize::dump(PrintStream& out) const
</del><ins>+TextStream& operator<<(TextStream& ts, const FloatSize& size)
</ins><span class="cx"> {
</span><del>- out.printf("(%f x %f)", width(), height());
</del><ins>+ return ts << "width=" << TextStream::FormatNumberRespectingIntegers(size.width())
+ << " height=" << TextStream::FormatNumberRespectingIntegers(size.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class IntSize;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class FloatSize {
</span><span class="cx"> public:
</span><span class="lines">@@ -118,10 +119,9 @@
</span><span class="cx"> operator NSSize() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> private:
</span><del>- float m_width, m_height;
</del><ins>+ float m_width;
+ float m_height;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline FloatSize& operator+=(FloatSize& a, const FloatSize& b)
</span><span class="lines">@@ -208,6 +208,8 @@
</span><span class="cx"> return IntPoint(clampToInteger(floorf(p.width())), clampToInteger(floorf(p.height())));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatSize&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FloatSize_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntPoint.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -27,19 +27,19 @@
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatPoint.h"
</span><del>-#include <wtf/PrintStream.h>
</del><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void IntPoint::dump(PrintStream& out) const
-{
- out.printf("(%d, %d)", x(), y());
-}
-
</del><span class="cx"> IntPoint::IntPoint(const FloatPoint& p)
</span><span class="cx"> : m_x(clampToInteger(p.x()))
</span><span class="cx"> , m_y(clampToInteger(p.y()))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const IntPoint& p)
+{
+ return ts << "(" << p.x() << "," << p.y() << ")";
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatPoint;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class IntPoint {
</span><span class="cx"> public:
</span><span class="lines">@@ -127,8 +128,6 @@
</span><span class="cx"> operator Evas_Point() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> private:
</span><span class="cx"> int m_x, m_y;
</span><span class="cx"> };
</span><span class="lines">@@ -190,6 +189,8 @@
</span><span class="cx"> return ((*this) - point).diagonalLengthSquared();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntPoint&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // IntPoint_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntRect.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <algorithm>
</span><del>-#include <wtf/PrintStream.h>
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx"> return IntSize(xdistance, ydistance);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IntRect::dump(PrintStream& out) const
</del><ins>+TextStream& operator<<(TextStream& ts, const IntRect& r)
</ins><span class="cx"> {
</span><del>- out.print(location(), " ", size());
</del><ins>+ return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> class FloatRect;
</span><span class="cx"> class LayoutRect;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class IntRect {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -185,8 +186,6 @@
</span><span class="cx"> WEBCORE_EXPORT operator NSRect() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> private:
</span><span class="cx"> IntPoint m_location;
</span><span class="cx"> IntSize m_size;
</span><span class="lines">@@ -236,6 +235,8 @@
</span><span class="cx"> WEBCORE_EXPORT IntRect enclosingIntRect(const NSRect&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntRect&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // IntRect_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntSize.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -27,19 +27,19 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatSize.h"
</span><del>-#include <wtf/PrintStream.h>
</del><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void IntSize::dump(PrintStream& out) const
-{
- out.printf("(%d x %d)", width(), height());
-}
-
</del><span class="cx"> IntSize::IntSize(const FloatSize& s)
</span><span class="cx"> : m_width(clampToInteger(s.width()))
</span><span class="cx"> , m_height(clampToInteger(s.height()))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const IntSize& size)
+{
+ return ts << "width=" << size.width() << " height=" << size.height();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntSize.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -55,13 +55,10 @@
</span><span class="cx"> typedef struct tagSIZE SIZE;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-namespace WTF {
-class PrintStream;
-}
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatSize;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> class IntSize {
</span><span class="cx"> public:
</span><span class="lines">@@ -156,8 +153,6 @@
</span><span class="cx"> operator SIZE() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void dump(WTF::PrintStream& out) const;
-
</del><span class="cx"> private:
</span><span class="cx"> int m_width, m_height;
</span><span class="cx"> };
</span><span class="lines">@@ -201,6 +196,8 @@
</span><span class="cx"> return a.width() != b.width() || a.height() != b.height();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const IntSize&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // IntSize_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointcppfromrev191215trunkSourceWebCoreplatformgraphicsIntPointcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/graphics/LayoutPoint.cpp (from rev 191215, trunk/Source/WebCore/platform/graphics/IntPoint.cpp) (0 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutPoint.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LayoutPoint.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, const LayoutPoint& p)
+{
+ // FIXME: These should be printed as floats. Keeping them ints for consistency with pervious test expectations.
+ return ts << "(" << p.x().toInt() << "," << p.y().toInt() << ")";
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutPoint.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/LayoutPoint.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -212,6 +212,8 @@
</span><span class="cx"> return FloatSize(snap(size.width(), location.x()), snap(size.height(), location.y()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const LayoutPoint&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutPoint_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx">
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <algorithm>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -153,4 +154,10 @@
</span><span class="cx"> return FloatRect(location, maxPoint - location);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const LayoutRect& r)
+{
+ // FIXME: These should be printed as floats. Keeping them ints for consistency with previous test expectations.
+ return ts << snappedIntRect(r);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class TextStream;
+
</ins><span class="cx"> class LayoutRect {
</span><span class="cx"> public:
</span><span class="cx"> LayoutRect() { }
</span><span class="lines">@@ -235,6 +237,8 @@
</span><span class="cx">
</span><span class="cx"> FloatRect encloseRectToDevicePixels(const LayoutRect&, float pixelSnappingFactor);
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const LayoutRect&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutRect_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutSizecppfromrev191215trunkSourceWebCoreplatformgraphicsIntPointcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/graphics/LayoutSize.cpp (from rev 191215, trunk/Source/WebCore/platform/graphics/IntPoint.cpp) (0 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutSize.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/LayoutSize.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LayoutSize.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, const LayoutSize& size)
+{
+ return ts << "width=" << size.width().toFloat() << " height=" << size.height().toFloat();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutSize.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutSize.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/LayoutSize.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class LayoutPoint;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> enum AspectRatioFit {
</span><span class="cx"> AspectRatioFitShrink,
</span><span class="lines">@@ -188,6 +189,8 @@
</span><span class="cx"> return FloatSize(floorToDevicePixel(size.width(), pixelSnappingFactor), floorToDevicePixel(size.height(), pixelSnappingFactor));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const LayoutSize&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutSize_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcSourceBufferPrivateAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaSampleAVFObjC::dump(PrintStream& out) const
</span><span class="cx"> {
</span><del>- out.print("{PTS(", presentationTime(), "), DTS(", decodeTime(), "), duration(", duration(), "), flags(", (int)flags(), "), presentationSize(", presentationSize(), ")}");
</del><ins>+ out.print("{PTS(", presentationTime(), "), DTS(", decodeTime(), "), duration(", duration(), "), flags(", (int)flags(), "), presentationSize(", presentationSize().width(), "x", presentationSize().height(), ")}");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaSampleAVFObjC::offsetTimestampsBy(const MediaTime& offset)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextStream.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextStream.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/text/TextStream.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -27,9 +27,7 @@
</span><span class="cx"> #include "TextStream.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatPoint.h"
</span><del>-#include "FloatRect.h"
</del><span class="cx"> #include "IntPoint.h"
</span><del>-#include "IntRect.h"
</del><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "LayoutUnit.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="lines">@@ -129,45 +127,11 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextStream& TextStream::operator<<(const IntPoint& p)
</del><ins>+TextStream& TextStream::operator<<(LayoutUnit v)
</ins><span class="cx"> {
</span><del>- return *this << "(" << p.x() << "," << p.y() << ")";
-}
-
-TextStream& TextStream::operator<<(const IntRect& r)
-{
- return *this << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
-}
-
-TextStream& TextStream::operator<<(const FloatPoint& p)
-{
- return *this << "(" << TextStream::FormatNumberRespectingIntegers(p.x())
- << "," << TextStream::FormatNumberRespectingIntegers(p.y()) << ")";
-}
-
-TextStream& TextStream::operator<<(const FloatSize& s)
-{
- return *this << "width=" << TextStream::FormatNumberRespectingIntegers(s.width())
- << " height=" << TextStream::FormatNumberRespectingIntegers(s.height());
-}
-
-TextStream& TextStream::operator<<(const LayoutUnit& v)
-{
</del><span class="cx"> return *this << TextStream::FormatNumberRespectingIntegers(v.toFloat());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextStream& TextStream::operator<<(const LayoutPoint& p)
-{
- // FIXME: These should be printed as floats. Keeping them ints for consistency with pervious test expectations.
- return *this << "(" << p.x().toInt() << "," << p.y().toInt() << ")";
-}
-
-TextStream& TextStream::operator<<(const LayoutRect& r)
-{
- // FIXME: These should be printed as floats. Keeping them ints for consistency with previous test expectations.
- return *this << snappedIntRect(r);
-}
-
</del><span class="cx"> String TextStream::release()
</span><span class="cx"> {
</span><span class="cx"> String result = m_text.toString();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextStream.h (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextStream.h 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/platform/text/TextStream.h 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -31,10 +31,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class IntPoint;
-class IntRect;
</del><span class="cx"> class FloatPoint;
</span><del>-class FloatSize;
</del><ins>+class IntPoint;
</ins><span class="cx"> class LayoutPoint;
</span><span class="cx"> class LayoutRect;
</span><span class="cx"> class LayoutUnit;
</span><span class="lines">@@ -60,13 +58,7 @@
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(const String&);
</span><span class="cx"> TextStream& operator<<(const FormatNumberRespectingIntegers&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT TextStream& operator<<(const IntPoint&);
- WEBCORE_EXPORT TextStream& operator<<(const IntRect&);
- WEBCORE_EXPORT TextStream& operator<<(const FloatPoint&);
- WEBCORE_EXPORT TextStream& operator<<(const FloatSize&);
- TextStream& operator<<(const LayoutUnit&);
- TextStream& operator<<(const LayoutPoint&);
- TextStream& operator<<(const LayoutRect&);
</del><ins>+ TextStream& operator<<(LayoutUnit);
</ins><span class="cx">
</span><span class="cx"> template<typename Item>
</span><span class="cx"> TextStream& operator<<(const Vector<Item>& vector)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -118,15 +118,6 @@
</span><span class="cx"> writeNameValuePair(ts, name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextStream& operator<<(TextStream& ts, const FloatRect& r)
-{
- ts << "at (" << TextStream::FormatNumberRespectingIntegers(r.x());
- ts << "," << TextStream::FormatNumberRespectingIntegers(r.y());
- ts << ") size " << TextStream::FormatNumberRespectingIntegers(r.width());
- ts << "x" << TextStream::FormatNumberRespectingIntegers(r.height());
- return ts;
-}
-
</del><span class="cx"> TextStream& operator<<(TextStream& ts, const AffineTransform& transform)
</span><span class="cx"> {
</span><span class="cx"> if (transform.isIdentity())
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-10-16 Simon Fraser <simon.fraser@apple.com>
+
+ Make TextStream the canonical way to log classes in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=150256
+
+ Reviewed by Sam Weinig.
+
+ We vacillated between PrintStream and TextStream as being the canonical way
+ to stringify WebCore data structures. This patch solidifies TextStream
+ as the solution, since it has convenient stream syntax, and is what we
+ use for render tree dumps.
+
+ Remove TextStream member functions that output non-simple structs
+ (sizes, points and rects), replacing them with free operator<< functions
+ in the .cpp file for the relevant class. Formatting is currently consistent
+ with RenderTreeAsText output, to avoid breaking tests.
+
+ Remove custom FloatRect outputting in SVG and RemoteLayerTreeTransaction.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::RemoteScrollingTreeTextStream::operator<<): Deleted.
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTextStream::operator<<): Deleted.
+
</ins><span class="cx"> 2015-10-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some dead menu code
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -463,7 +463,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RemoteScrollingTreeTextStream& operator<<(FloatRect);
</del><span class="cx"> RemoteScrollingTreeTextStream& operator<<(ScrollingNodeType);
</span><span class="cx">
</span><span class="cx"> RemoteScrollingTreeTextStream& operator<<(const FixedPositionViewportConstraints&);
</span><span class="lines">@@ -506,13 +505,6 @@
</span><span class="cx"> ts.decreaseIndent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RemoteScrollingTreeTextStream& RemoteScrollingTreeTextStream::operator<<(FloatRect rect)
-{
- RemoteScrollingTreeTextStream& ts = *this;
- ts << rect.x() << " " << rect.y() << " " << rect.width() << " " << rect.height();
- return ts;
-}
-
</del><span class="cx"> RemoteScrollingTreeTextStream& RemoteScrollingTreeTextStream::operator<<(ScrollingNodeType nodeType)
</span><span class="cx"> {
</span><span class="cx"> RemoteScrollingTreeTextStream& ts = *this;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (191215 => 191216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-10-16 22:18:42 UTC (rev 191215)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-10-16 22:31:26 UTC (rev 191216)
</span><span class="lines">@@ -662,7 +662,6 @@
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const FloatRoundedRect&);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(FloatPoint3D);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(Color);
</span><del>- RemoteLayerTreeTextStream& operator<<(FloatRect);
</del><span class="cx"> RemoteLayerTreeTextStream& operator<<(const Vector<WebCore::GraphicsLayer::PlatformLayerID>&);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const FilterOperation&);
</span><span class="cx"> RemoteLayerTreeTextStream& operator<<(const FilterOperations&);
</span><span class="lines">@@ -1059,13 +1058,6 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(FloatRect rect)
-{
- RemoteLayerTreeTextStream& ts = *this;
- ts << rect.x() << " " << rect.y() << " " << rect.width() << " " << rect.height();
- return ts;
-}
-
</del><span class="cx"> RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const Vector<GraphicsLayer::PlatformLayerID>& layers)
</span><span class="cx"> {
</span><span class="cx"> RemoteLayerTreeTextStream& ts = *this;
</span></span></pre>
</div>
</div>
</body>
</html>