<!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>[191243] 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/191243">191243</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-17 11:34:19 -0700 (Sat, 17 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enhance TextStream for logging, remove subclasses, log more things
https://bugs.webkit.org/show_bug.cgi?id=150269
Reviewed by Zalan Bujtas.
Remove the various TextStream subclasses that only existed to support indenting,
and output additional types. Add output for more WebCore and WebKit2 types, and
just use TextStream everywhere.
TextStream is enhance to support grouping (open paren and intent), with a
stack-based class to open/end a group.
Remove some SVG-specific duplicate output functions.
Outdent namespace contents of GraphicsTypes.h.
Source/WebCore:
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* dom/ViewportArguments.cpp:
(WebCore::operator<<):
* dom/ViewportArguments.h:
* page/ViewportConfiguration.cpp:
(WebCore::operator<<):
(WebCore::ViewportConfiguration::description):
(WebCore::ViewportConfigurationTextStream::ViewportConfigurationTextStream): Deleted.
(WebCore::ViewportConfigurationTextStream::increaseIndent): Deleted.
(WebCore::ViewportConfigurationTextStream::decreaseIndent): Deleted.
(WebCore::dumpProperty): Deleted.
(WebCore::ViewportConfigurationTextStream::writeIndent): Deleted.
(WebCore::ViewportConfigurationTextStream::operator<<): Deleted.
* page/ViewportConfiguration.h:
* page/scrolling/ScrollingConstraints.cpp:
(WebCore::operator<<):
* page/scrolling/ScrollingConstraints.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::operator<<):
* page/scrolling/ScrollingCoordinator.h:
* platform/animation/TimingFunction.cpp: Added.
(WebCore::operator<<):
* platform/animation/TimingFunction.h:
* platform/graphics/Color.cpp:
(WebCore::operator<<):
* platform/graphics/Color.h:
* platform/graphics/FloatPoint3D.cpp:
(WebCore::operator<<):
* platform/graphics/FloatPoint3D.h:
* platform/graphics/FloatRoundedRect.cpp:
(WebCore::operator<<):
* platform/graphics/FloatRoundedRect.h:
* platform/graphics/GraphicsLayer.cpp:
(WebCore::operator<<):
* platform/graphics/GraphicsLayer.h:
* platform/graphics/GraphicsTypes.cpp:
(WebCore::operator<<):
* platform/graphics/GraphicsTypes.h:
* platform/graphics/ca/PlatformCAAnimation.cpp: Added.
(WebCore::operator<<):
* platform/graphics/ca/PlatformCAAnimation.h:
* platform/graphics/ca/PlatformCALayer.cpp:
(WebCore::operator<<):
* platform/graphics/ca/PlatformCALayer.h:
* platform/graphics/filters/FilterOperation.cpp:
(WebCore::operator<<):
* platform/graphics/filters/FilterOperation.h:
* platform/graphics/filters/FilterOperations.cpp:
(WebCore::operator<<):
* platform/graphics/filters/FilterOperations.h:
* platform/graphics/filters/PointLightSource.cpp:
(WebCore::operator<<): Deleted.
* platform/graphics/filters/SpotLightSource.cpp:
(WebCore::operator<<): Deleted.
* platform/graphics/transforms/AffineTransform.cpp:
(WebCore::operator<<):
* platform/graphics/transforms/AffineTransform.h:
* platform/graphics/transforms/TransformationMatrix.cpp:
(WebCore::operator<<):
* platform/graphics/transforms/TransformationMatrix.h:
* platform/text/TextStream.cpp:
(WebCore::TextStream::startGroup):
(WebCore::TextStream::endGroup):
(WebCore::TextStream::nextLine):
(WebCore::TextStream::writeIndent):
* platform/text/TextStream.h:
(WebCore::TextStream::operator<<):
(WebCore::TextStream::dumpProperty):
(WebCore::TextStream::increaseIndent):
(WebCore::TextStream::decreaseIndent):
(WebCore::TextStream::GroupScope::GroupScope):
(WebCore::TextStream::GroupScope::~GroupScope):
* rendering/svg/SVGRenderTreeAsText.cpp:
(WebCore::operator<<): Deleted.
* rendering/svg/SVGRenderTreeAsText.h:
Source/WebKit2:
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::dump):
(WebKit::recursiveDumpNodes):
(WebKit::RemoteScrollingCoordinatorTransaction::description):
(WebKit::RemoteScrollingTreeTextStream::RemoteScrollingTreeTextStream): Deleted.
(WebKit::RemoteScrollingTreeTextStream::increaseIndent): Deleted.
(WebKit::RemoteScrollingTreeTextStream::decreaseIndent): Deleted.
(WebKit::RemoteScrollingTreeTextStream::writeIndent): Deleted.
(WebKit::dumpProperty): Deleted.
(WebKit::RemoteScrollingTreeTextStream::operator<<): Deleted.
(WebKit::RemoteScrollingTreeTextStream::dump): Deleted.
(WebKit::RemoteScrollingTreeTextStream::recursiveDumpNodes): Deleted.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::operator<<):
(WebKit::dumpChangedLayers):
(WebKit::RemoteLayerTreeTransaction::description):
(WebKit::RemoteLayerTreeTextStream::RemoteLayerTreeTextStream): Deleted.
(WebKit::RemoteLayerTreeTextStream::increaseIndent): Deleted.
(WebKit::RemoteLayerTreeTextStream::decreaseIndent): Deleted.
(WebKit::dumpProperty): Deleted.
(WebKit::RemoteLayerTreeTextStream::operator<<): Deleted.
(WebKit::RemoteLayerTreeTextStream::writeIndent): Deleted.
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
(WebKit::operator<<):</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="#trunkSourceWebCoredomViewportArgumentscpp">trunk/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#trunkSourceWebCoredomViewportArgumentsh">trunk/Source/WebCore/dom/ViewportArguments.h</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>
<li><a href="#trunkSourceWebCorepagescrollingScrollingConstraintscpp">trunk/Source/WebCore/page/scrolling/ScrollingConstraints.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingConstraintsh">trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformanimationTimingFunctionh">trunk/Source/WebCore/platform/animation/TimingFunction.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorcpp">trunk/Source/WebCore/platform/graphics/Color.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPoint3Dcpp">trunk/Source/WebCore/platform/graphics/FloatPoint3D.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPoint3Dh">trunk/Source/WebCore/platform/graphics/FloatPoint3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRoundedRecth">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsTypescpp">trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsTypesh">trunk/Source/WebCore/platform/graphics/GraphicsTypes.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh">trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationcpp">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh">trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh">trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersPointLightSourcecpp">trunk/Source/WebCore/platform/graphics/filters/PointLightSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfiltersSpotLightSourcecpp">trunk/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformh">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h</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="#trunkSourceWebCorerenderingsvgSVGRenderTreeAsTexth">trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h</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>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformanimationTimingFunctioncpp">trunk/Source/WebCore/platform/animation/TimingFunction.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationcpp">trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.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 (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -2139,6 +2139,7 @@
</span><span class="cx">
</span><span class="cx"> platform/animation/Animation.cpp
</span><span class="cx"> platform/animation/AnimationList.cpp
</span><ins>+ platform/animation/TimingFunction.cpp
</ins><span class="cx">
</span><span class="cx"> platform/audio/AudioBus.cpp
</span><span class="cx"> platform/audio/AudioChannel.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/ChangeLog 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -1,3 +1,98 @@
</span><ins>+2015-10-16 Simon Fraser <simon.fraser@apple.com>
+
+ Enhance TextStream for logging, remove subclasses, log more things
+ https://bugs.webkit.org/show_bug.cgi?id=150269
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the various TextStream subclasses that only existed to support indenting,
+ and output additional types. Add output for more WebCore and WebKit2 types, and
+ just use TextStream everywhere.
+
+ TextStream is enhance to support grouping (open paren and intent), with a
+ stack-based class to open/end a group.
+
+ Remove some SVG-specific duplicate output functions.
+
+ Outdent namespace contents of GraphicsTypes.h.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/ViewportArguments.cpp:
+ (WebCore::operator<<):
+ * dom/ViewportArguments.h:
+ * page/ViewportConfiguration.cpp:
+ (WebCore::operator<<):
+ (WebCore::ViewportConfiguration::description):
+ (WebCore::ViewportConfigurationTextStream::ViewportConfigurationTextStream): Deleted.
+ (WebCore::ViewportConfigurationTextStream::increaseIndent): Deleted.
+ (WebCore::ViewportConfigurationTextStream::decreaseIndent): Deleted.
+ (WebCore::dumpProperty): Deleted.
+ (WebCore::ViewportConfigurationTextStream::writeIndent): Deleted.
+ (WebCore::ViewportConfigurationTextStream::operator<<): Deleted.
+ * page/ViewportConfiguration.h:
+ * page/scrolling/ScrollingConstraints.cpp:
+ (WebCore::operator<<):
+ * page/scrolling/ScrollingConstraints.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::operator<<):
+ * page/scrolling/ScrollingCoordinator.h:
+ * platform/animation/TimingFunction.cpp: Added.
+ (WebCore::operator<<):
+ * platform/animation/TimingFunction.h:
+ * platform/graphics/Color.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/Color.h:
+ * platform/graphics/FloatPoint3D.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/FloatPoint3D.h:
+ * platform/graphics/FloatRoundedRect.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/FloatRoundedRect.h:
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/GraphicsTypes.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/GraphicsTypes.h:
+ * platform/graphics/ca/PlatformCAAnimation.cpp: Added.
+ (WebCore::operator<<):
+ * platform/graphics/ca/PlatformCAAnimation.h:
+ * platform/graphics/ca/PlatformCALayer.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/ca/PlatformCALayer.h:
+ * platform/graphics/filters/FilterOperation.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/filters/FilterOperation.h:
+ * platform/graphics/filters/FilterOperations.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/filters/FilterOperations.h:
+ * platform/graphics/filters/PointLightSource.cpp:
+ (WebCore::operator<<): Deleted.
+ * platform/graphics/filters/SpotLightSource.cpp:
+ (WebCore::operator<<): Deleted.
+ * platform/graphics/transforms/AffineTransform.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/transforms/AffineTransform.h:
+ * platform/graphics/transforms/TransformationMatrix.cpp:
+ (WebCore::operator<<):
+ * platform/graphics/transforms/TransformationMatrix.h:
+ * platform/text/TextStream.cpp:
+ (WebCore::TextStream::startGroup):
+ (WebCore::TextStream::endGroup):
+ (WebCore::TextStream::nextLine):
+ (WebCore::TextStream::writeIndent):
+ * platform/text/TextStream.h:
+ (WebCore::TextStream::operator<<):
+ (WebCore::TextStream::dumpProperty):
+ (WebCore::TextStream::increaseIndent):
+ (WebCore::TextStream::decreaseIndent):
+ (WebCore::TextStream::GroupScope::GroupScope):
+ (WebCore::TextStream::GroupScope::~GroupScope):
+ * rendering/svg/SVGRenderTreeAsText.cpp:
+ (WebCore::operator<<): Deleted.
+ * rendering/svg/SVGRenderTreeAsText.h:
+
</ins><span class="cx"> 2015-10-17 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Finalize bug 149952 patch
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -480,8 +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><del>- 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 = (); }; };
</del><ins>+ 0F36E7371BD1837A002DB891 /* LayoutPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7361BD1837A002DB891 /* LayoutPoint.cpp */; };
+ 0F36E7391BD184B9002DB891 /* LayoutSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F36E7381BD184B9002DB891 /* LayoutSize.cpp */; };
</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">@@ -566,6 +566,8 @@
</span><span class="cx"> 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
</span><span class="cx"> 0FDA7C261883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */; };
</span><span class="cx"> 0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */; };
</span><ins>+ 0FDF45A71BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */; };
+ 0FDF45A91BD1C82500E4FA8C /* TimingFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */; };
</ins><span class="cx"> 0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */; };
</span><span class="cx"> 0FE5806419327A6200DE32EB /* ScrollingTreeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */; };
</span><span class="cx"> 0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */; };
</span><span class="lines">@@ -5285,10 +5287,10 @@
</span><span class="cx"> BC128B01137C8D4600CAC845 /* RenderGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC128B00137C8D4600CAC845 /* RenderGrid.cpp */; };
</span><span class="cx"> BC14028A0E83680800319717 /* ScrollbarThemeComposite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1402880E83680800319717 /* ScrollbarThemeComposite.cpp */; };
</span><span class="cx"> BC14028B0E83680800319717 /* ScrollbarThemeComposite.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1402890E83680800319717 /* ScrollbarThemeComposite.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC1790BB1BB5AB3F0006D13E /* CSSVariableDependentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BA1BB5AB3F0006D13E /* CSSVariableDependentValue.h */; settings = {ASSET_TAGS = (); }; };
- BC1790BD1BBB36A80006D13E /* CSSVariableDependentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BC1BBB36A80006D13E /* CSSVariableDependentValue.cpp */; settings = {ASSET_TAGS = (); }; };
- BC1790C01BBF2C430006D13E /* CSSVariableValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BE1BBF2C430006D13E /* CSSVariableValue.cpp */; settings = {ASSET_TAGS = (); }; };
- BC1790C11BBF2C430006D13E /* CSSVariableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BF1BBF2C430006D13E /* CSSVariableValue.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ BC1790BB1BB5AB3F0006D13E /* CSSVariableDependentValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BA1BB5AB3F0006D13E /* CSSVariableDependentValue.h */; };
+ BC1790BD1BBB36A80006D13E /* CSSVariableDependentValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BC1BBB36A80006D13E /* CSSVariableDependentValue.cpp */; };
+ BC1790C01BBF2C430006D13E /* CSSVariableValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1790BE1BBF2C430006D13E /* CSSVariableValue.cpp */; };
+ BC1790C11BBF2C430006D13E /* CSSVariableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1790BF1BBF2C430006D13E /* CSSVariableValue.h */; };
</ins><span class="cx"> BC17F9660B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC17F9650B64EBB8004A65CB /* JSHTMLSelectElementCustom.cpp */; };
</span><span class="cx"> BC1A37AD097C715F0019F3D8 /* DOM.h in Headers */ = {isa = PBXBuildFile; fileRef = BC1A3797097C715F0019F3D8 /* DOM.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC1A37AE097C715F0019F3D8 /* DOM.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC1A3798097C715F0019F3D8 /* DOM.mm */; };
</span><span class="lines">@@ -5489,8 +5491,8 @@
</span><span class="cx"> BC772E16133162C2001EC9CE /* CSSLineBoxContainValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC772E15133162C2001EC9CE /* CSSLineBoxContainValue.cpp */; };
</span><span class="cx"> BC779E141BB215BB00CAA8BF /* CSSCustomPropertyValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E131BB215BB00CAA8BF /* CSSCustomPropertyValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC779E171BB227CA00CAA8BF /* StyleCustomPropertyData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC779E151BB226A200CAA8BF /* StyleCustomPropertyData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC7D8FEF1BD03B6400FFE540 /* CSSUnsetValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */; settings = {ASSET_TAGS = (); }; };
- BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ BC7D8FEF1BD03B6400FFE540 /* CSSUnsetValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7D8FED1BD03B6400FFE540 /* CSSUnsetValue.cpp */; };
+ BC7D8FF01BD03B6400FFE540 /* CSSUnsetValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7D8FEE1BD03B6400FFE540 /* CSSUnsetValue.h */; };
</ins><span class="cx"> BC7F44A80B9E324E00A9D081 /* ImageObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7F44A70B9E324E00A9D081 /* ImageObserver.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC7FA6200D1F0CBD00DB22A9 /* LiveNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC7FA61E0D1F0CBD00DB22A9 /* LiveNodeList.cpp */; };
</span><span class="cx"> BC7FA6210D1F0CBD00DB22A9 /* LiveNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7FA61F0D1F0CBD00DB22A9 /* LiveNodeList.h */; };
</span><span class="lines">@@ -6477,7 +6479,7 @@
</span><span class="cx"> E4B65A5A132FAAF90070E7BE /* LegacyTileGrid.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A59132FAAF90070E7BE /* LegacyTileGrid.mm */; };
</span><span class="cx"> E4B65A5C132FACB00070E7BE /* LegacyTileLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4B65A5B132FACB00070E7BE /* LegacyTileLayer.h */; };
</span><span class="cx"> E4B65A5E132FADB60070E7BE /* LegacyTileLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4B65A5D132FADB60070E7BE /* LegacyTileLayer.mm */; };
</span><del>- E4BA50901BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4BA508F1BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ E4BA50901BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4BA508F1BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h */; };
</ins><span class="cx"> E4BBED0E14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4BBED0C14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.cpp */; };
</span><span class="cx"> E4BBED0F14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = E4BBED0D14F4025D003F0B98 /* PropertySetCSSStyleDeclaration.h */; };
</span><span class="cx"> E4BBED4C14FCDBA1003F0B98 /* StyleRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4BBED4A14FCDBA1003F0B98 /* StyleRule.cpp */; };
</span><span class="lines">@@ -7797,6 +7799,8 @@
</span><span class="cx"> 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitPlaybackTargetAvailabilityEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitPlaybackTargetAvailabilityEvent.h; sourceTree = "<group>"; };
</span><ins>+ 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCAAnimation.cpp; sourceTree = "<group>"; };
+ 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimingFunction.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeMac.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarThemeMock.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16643,6 +16647,7 @@
</span><span class="cx"> 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */,
</span><span class="cx"> 7AA3A69D194B59B6001CBD24 /* LayerPool.cpp */,
</span><span class="cx"> 7AA3A69E194B59B6001CBD24 /* LayerPool.h */,
</span><ins>+ 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */,
</ins><span class="cx"> 499B3EDC128DB50100E726C2 /* PlatformCAAnimation.h */,
</span><span class="cx"> 0F13163D16ED0CC80035CC04 /* PlatformCAFilters.h */,
</span><span class="cx"> 2D70BA1418074F850001908A /* PlatformCALayer.cpp */,
</span><span class="lines">@@ -16699,6 +16704,7 @@
</span><span class="cx"> 49E912A80EFAC906009D0CAF /* AnimationList.h */,
</span><span class="cx"> 31DCD29C1AB4FBDE0072E817 /* AnimationTrigger.h */,
</span><span class="cx"> 0F580FAE149800D400FB5BD8 /* AnimationUtilities.h */,
</span><ins>+ 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */,
</ins><span class="cx"> 49E912A90EFAC906009D0CAF /* TimingFunction.h */,
</span><span class="cx"> );
</span><span class="cx"> path = animation;
</span><span class="lines">@@ -28674,6 +28680,7 @@
</span><span class="cx"> BCD0FBD00DBD625E00B2F630 /* DOMAbstractView.mm in Sources */,
</span><span class="cx"> 319848091A1E6CBF00A13318 /* DOMAnimationEvent.mm in Sources */,
</span><span class="cx"> 1A8F6BC20DB55CDC001DB794 /* DOMApplicationCache.cpp in Sources */,
</span><ins>+ 0FDF45A71BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp in Sources */,
</ins><span class="cx"> 85D389B30A991A7F00282145 /* DOMAttr.mm in Sources */,
</span><span class="cx"> 76FB9FEC19A7284B00420562 /* DOMAutocompleteErrorEvent.mm in Sources */,
</span><span class="cx"> BC946EF0107FDBAC00857193 /* DOMBeforeLoadEvent.mm in Sources */,
</span><span class="lines">@@ -29533,6 +29540,7 @@
</span><span class="cx"> BC6D44BE0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp in Sources */,
</span><span class="cx"> 1AE2AA260A1CDAB400B42B25 /* JSHTMLFieldSetElement.cpp in Sources */,
</span><span class="cx"> 1AE2AA280A1CDAB400B42B25 /* JSHTMLFontElement.cpp in Sources */,
</span><ins>+ 0FDF45A91BD1C82500E4FA8C /* TimingFunction.cpp in Sources */,
</ins><span class="cx"> 9BF9A8801648DD2F001C6B23 /* JSHTMLFormControlsCollection.cpp in Sources */,
</span><span class="cx"> 9B1AB07C1648C7C40051F3F2 /* JSHTMLFormControlsCollectionCustom.cpp in Sources */,
</span><span class="cx"> A8D064FB0A23C0CC005E7203 /* JSHTMLFormElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -450,4 +451,24 @@
</span><span class="cx"> document->addConsoleMessage(MessageSource::Rendering, viewportErrorMessageLevel(errorCode), message);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const ViewportArguments& viewportArguments)
+{
+ 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();
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -135,6 +135,8 @@
</span><span class="cx"> void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
</span><span class="cx"> void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const ViewportArguments&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ViewportArguments_h
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -399,49 +399,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>-class ViewportConfigurationTextStream : public TextStream {
-public:
- ViewportConfigurationTextStream()
- : m_indent(0)
- {
- }
</del><span class="cx">
</span><del>- 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)
</del><ins>+TextStream& operator<<(TextStream& ts, const ViewportConfiguration::Parameters& parameters)
</ins><span class="cx"> {
</span><del>- ts << "\n";
</del><span class="cx"> ts.increaseIndent();
</span><del>- 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();
</del><span class="cx"> ts << "\n";
</span><span class="cx"> ts.writeIndent();
</span><span class="cx"> ts << "(width " << parameters.width << ", set: " << (parameters.widthIsSet ? "true" : "false") << ")";
</span><span class="lines">@@ -455,39 +416,17 @@
</span><span class="cx"> ts << "(initialScale " << parameters.initialScale << ", set: " << (parameters.initialScaleIsSet ? "true" : "false") << ")";
</span><span class="cx"> ts.decreaseIndent();
</span><span class="cx">
</span><del>- dumpProperty(ts, "minimumScale", parameters.minimumScale);
- dumpProperty(ts, "maximumScale", parameters.maximumScale);
- dumpProperty(ts, "allowsUserScaling", parameters.allowsUserScaling);
- dumpProperty(ts, "allowsShrinkToFit", parameters.allowsShrinkToFit);
</del><ins>+ ts.dumpProperty("minimumScale", parameters.minimumScale);
+ ts.dumpProperty("maximumScale", parameters.maximumScale);
+ ts.dumpProperty("allowsUserScaling", parameters.allowsUserScaling);
+ ts.dumpProperty("allowsShrinkToFit", parameters.allowsShrinkToFit);
</ins><span class="cx">
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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();
-
- return ts;
-}
-
</del><span class="cx"> CString ViewportConfiguration::description() const
</span><span class="cx"> {
</span><del>- ViewportConfigurationTextStream ts;
</del><ins>+ TextStream ts;
</ins><span class="cx">
</span><span class="cx"> ts << "(viewport-configuration " << (void*)this;
</span><span class="cx"> ts << "\n";
</span><span class="lines">@@ -514,8 +453,8 @@
</span><span class="cx"> ts << ")";
</span><span class="cx"> ts.decreaseIndent();
</span><span class="cx">
</span><del>- dumpProperty(ts, "contentSize", m_contentSize);
- dumpProperty(ts, "minimumLayoutSize", m_minimumLayoutSize);
</del><ins>+ ts.dumpProperty("contentSize", m_contentSize);
+ ts.dumpProperty("minimumLayoutSize", m_minimumLayoutSize);
</ins><span class="cx">
</span><span class="cx"> ts << "\n";
</span><span class="cx"> ts.increaseIndent();
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class TextStream;
+
</ins><span class="cx"> class ViewportConfiguration {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ViewportConfiguration); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -122,6 +124,8 @@
</span><span class="cx"> bool m_forceAlwaysUserScalable;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const ViewportConfiguration::Parameters&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ViewportConfiguration_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingConstraintscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingConstraints.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingConstraints.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/scrolling/ScrollingConstraints.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollingConstraints.h"
</span><span class="cx">
</span><ins>+#include "TextStream.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> FloatPoint FixedPositionViewportConstraints::layerPositionForViewportRect(const FloatRect& viewportRect) const
</span><span class="lines">@@ -98,4 +100,20 @@
</span><span class="cx"> return m_layerPositionAtLastLayout + offset - m_stickyOffsetAtLastLayout;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const FixedPositionViewportConstraints& constraints)
+{
+ ts.dumpProperty("viewport-rect-at-last-layout", constraints.viewportRectAtLastLayout());
+ ts.dumpProperty("layer-position-at-last-layout", constraints.layerPositionAtLastLayout());
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const StickyPositionViewportConstraints& constraints)
+{
+ ts.dumpProperty("sticky-position-at-last-layout", constraints.stickyOffsetAtLastLayout());
+ ts.dumpProperty("layer-position-at-last-layout", constraints.layerPositionAtLastLayout());
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/scrolling/ScrollingConstraints.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -196,6 +196,9 @@
</span><span class="cx"> FloatPoint m_layerPositionAtLastLayout;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FixedPositionViewportConstraints&);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const StickyPositionViewportConstraints&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ScrollingConstraints_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "ScrollAnimator.h"
</span><span class="cx"> #include "Settings.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -421,4 +422,23 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, ScrollingNodeType nodeType)
+{
+ switch (nodeType) {
+ case FrameScrollingNode:
+ ts << "frame-scrolling";
+ break;
+ case OverflowScrollingNode:
+ ts << "overflow-scrolling";
+ break;
+ case FixedNode:
+ ts << "fixed";
+ break;
+ case StickyNode:
+ ts << "sticky";
+ break;
+ }
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> class Page;
</span><span class="cx"> class Region;
</span><span class="cx"> class ScrollableArea;
</span><ins>+class TextStream;
</ins><span class="cx"> class ViewportConstraints;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="lines">@@ -233,6 +234,8 @@
</span><span class="cx"> bool m_forceSynchronousScrollLayerPositionUpdates { false };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollingNodeType);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_SCROLLING_COORDINATOR(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformanimationTimingFunctioncpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/animation/TimingFunction.cpp (0 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/animation/TimingFunction.cpp (rev 0)
+++ trunk/Source/WebCore/platform/animation/TimingFunction.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -0,0 +1,53 @@
</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 "TimingFunction.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, const TimingFunction& timingFunction)
+{
+ switch (timingFunction.type()) {
+ case TimingFunction::LinearFunction:
+ ts << "linear";
+ break;
+ case TimingFunction::CubicBezierFunction: {
+ const CubicBezierTimingFunction& cubicBezierFunction = static_cast<const CubicBezierTimingFunction&>(timingFunction);
+ ts << "cubic-bezier(" << cubicBezierFunction.x1() << ", " << cubicBezierFunction.y1() << ", " << cubicBezierFunction.x2() << ", " << cubicBezierFunction.y2() << ")";
+ break;
+ }
+ case TimingFunction::StepsFunction: {
+ const StepsTimingFunction& stepsFunction = static_cast<const StepsTimingFunction&>(timingFunction);
+ ts << "steps(" << stepsFunction.numberOfSteps() << ", " << (stepsFunction.stepAtStart() ? "start" : "end") << ")";
+ break;
+ }
+ }
+ return ts;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformanimationTimingFunctionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/animation/TimingFunction.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/animation/TimingFunction.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/animation/TimingFunction.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #ifndef TimingFunction_h
</span><span class="cx"> #define TimingFunction_h
</span><span class="cx">
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -230,6 +231,9 @@
</span><span class="cx"> bool m_stepAtStart;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class TextStream;
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const TimingFunction&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // TimingFunction_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/Color.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AnimationUtilities.h"
</span><span class="cx"> #include "HashTools.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/DecimalNumber.h>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="lines">@@ -488,5 +489,9 @@
</span><span class="cx"> blend(from.alpha(), to.alpha(), progress));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const Color& color)
+{
+ return ts << color.nameForRenderTreeAsText();
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class TextStream;
+
</ins><span class="cx"> typedef unsigned RGBA32; // Deprecated: Type for an RGBA quadruplet. Use RGBA class instead.
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RGBA32 makeRGB(int r, int g, int b);
</span><span class="lines">@@ -292,6 +294,8 @@
</span><span class="cx"> return approximation + (remainder >> 8);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const Color&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // Color_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPoint3Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint3D.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint3D.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint3D.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "FloatPoint3D.h"
</span><span class="cx">
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <math.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -38,5 +38,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const FloatPoint3D& point)
+{
+ return ts << point.x() << " " << point.y() << " " << point.z();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPoint3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint3D.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint3D.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint3D.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -182,6 +182,8 @@
</span><span class="cx"> return (*this - a).length();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatPoint3D&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FloatPoint3D_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FloatRoundedRect.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">@@ -196,5 +197,24 @@
</span><span class="cx"> m_radii.scale(widthRatio < heightRatio ? widthRatio : heightRatio);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const FloatRoundedRect& roundedRect)
+{
+ ts << roundedRect.rect().x() << " " << roundedRect.rect().y() << " " << roundedRect.rect().width() << " " << roundedRect.rect().height() << "\n";
</ins><span class="cx">
</span><ins>+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "topLeft=" << roundedRect.topLeftCorner().width() << " " << roundedRect.topLeftCorner().height() << "\n";
+ ts.writeIndent();
+ ts << "topRight=" << roundedRect.topRightCorner().width() << " " << roundedRect.topRightCorner().height() << "\n";
+ ts.writeIndent();
+ ts << "bottomLeft=" << roundedRect.bottomLeftCorner().width() << " " << roundedRect.bottomLeftCorner().height() << "\n";
+ ts.writeIndent();
+ ts << "bottomRight=" << roundedRect.bottomRightCorner().width() << " " << roundedRect.bottomRightCorner().height();
+ ts.decreaseIndent();
+
+ return ts;
+}
+
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -178,6 +178,8 @@
</span><span class="cx"> return factor;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FloatRoundedRect&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FloatRoundedRect_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -875,6 +875,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const Vector<GraphicsLayer::PlatformLayerID>& layers)
+{
+ for (size_t i = 0; i < layers.size(); ++i) {
+ if (i)
+ ts << " ";
+ ts << layers[i];
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const WebCore::GraphicsLayer::CustomAppearance& customAppearance)
+{
+ switch (customAppearance) {
+ case GraphicsLayer::CustomAppearance::NoCustomAppearance: ts << "none"; break;
+ case GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
+ case GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
+ case GraphicsLayer::CustomAppearance::LightBackdropAppearance: ts << "light-backdrop"; break;
+ case GraphicsLayer::CustomAppearance::DarkBackdropAppearance: ts << "dark-backdrop"; break;
+ }
+ return ts;
+}
+
</ins><span class="cx"> String GraphicsLayer::layerTreeAsText(LayerTreeAsTextBehavior behavior) const
</span><span class="cx"> {
</span><span class="cx"> TextStream ts;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -640,6 +640,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const Vector<GraphicsLayer::PlatformLayerID>&);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const GraphicsLayer::CustomAppearance&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_GRAPHICSLAYER(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsTypescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GraphicsTypes.h"
</span><span class="cx">
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -236,4 +237,76 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, BlendMode blendMode)
+{
+ switch (blendMode) {
+ case BlendModeNormal: ts << "normal"; break;
+ case BlendModeMultiply: ts << "multiply"; break;
+ case BlendModeScreen: ts << "screen"; break;
+ case BlendModeOverlay: ts << "overlay"; break;
+ case BlendModeDarken: ts << "darken"; break;
+ case BlendModeLighten: ts << "lighten"; break;
+ case BlendModeColorDodge: ts << "color-dodge"; break;
+ case BlendModeColorBurn: ts << "color-burn"; break;
+ case BlendModeHardLight: ts << "hard-light"; break;
+ case BlendModeSoftLight: ts << "soft-light"; break;
+ case BlendModeDifference: ts << "difference"; break;
+ case BlendModeExclusion: ts << "exclusion"; break;
+ case BlendModeHue: ts << "hue"; break;
+ case BlendModeSaturation: ts << "saturation"; break;
+ case BlendModeColor: ts << "color"; break;
+ case BlendModeLuminosity: ts << "luminosity"; break;
+ case BlendModePlusDarker: ts << "plus-darker"; break;
+ case BlendModePlusLighter: ts << "plus-lighter"; break;
+ }
+ return ts;
</ins><span class="cx"> }
</span><ins>+
+TextStream& operator<<(TextStream& ts, WindRule rule)
+{
+ switch (rule) {
+ case RULE_NONZERO:
+ ts << "NON-ZERO";
+ break;
+ case RULE_EVENODD:
+ ts << "EVEN-ODD";
+ break;
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, LineCap capStyle)
+{
+ switch (capStyle) {
+ case ButtCap:
+ ts << "BUTT";
+ break;
+ case RoundCap:
+ ts << "ROUND";
+ break;
+ case SquareCap:
+ ts << "SQUARE";
+ break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, LineJoin joinStyle)
+{
+ switch (joinStyle) {
+ case MiterJoin:
+ ts << "MITER";
+ break;
+ case RoundJoin:
+ ts << "ROUND";
+ break;
+ case BevelJoin:
+ ts << "BEVEL";
+ break;
+ }
+ return ts;
+}
+
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -26,86 +26,93 @@
</span><span class="cx"> #ifndef GraphicsTypes_h
</span><span class="cx"> #define GraphicsTypes_h
</span><span class="cx">
</span><ins>+#include "WindRule.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- enum CompositeOperator {
- CompositeClear,
- CompositeCopy,
- CompositeSourceOver,
- CompositeSourceIn,
- CompositeSourceOut,
- CompositeSourceAtop,
- CompositeDestinationOver,
- CompositeDestinationIn,
- CompositeDestinationOut,
- CompositeDestinationAtop,
- CompositeXOR,
- CompositePlusDarker,
- CompositePlusLighter,
- CompositeDifference
- };
</del><ins>+enum CompositeOperator {
+ CompositeClear,
+ CompositeCopy,
+ CompositeSourceOver,
+ CompositeSourceIn,
+ CompositeSourceOut,
+ CompositeSourceAtop,
+ CompositeDestinationOver,
+ CompositeDestinationIn,
+ CompositeDestinationOut,
+ CompositeDestinationAtop,
+ CompositeXOR,
+ CompositePlusDarker,
+ CompositePlusLighter,
+ CompositeDifference
+};
</ins><span class="cx">
</span><del>- enum BlendMode {
- BlendModeNormal = 1, // Start with 1 to match SVG's blendmode enumeration.
- BlendModeMultiply,
- BlendModeScreen,
- BlendModeDarken,
- BlendModeLighten,
- BlendModeOverlay,
- BlendModeColorDodge,
- BlendModeColorBurn,
- BlendModeHardLight,
- BlendModeSoftLight,
- BlendModeDifference,
- BlendModeExclusion,
- BlendModeHue,
- BlendModeSaturation,
- BlendModeColor,
- BlendModeLuminosity,
- BlendModePlusDarker,
- BlendModePlusLighter
- };
</del><ins>+enum BlendMode {
+ BlendModeNormal = 1, // Start with 1 to match SVG's blendmode enumeration.
+ BlendModeMultiply,
+ BlendModeScreen,
+ BlendModeDarken,
+ BlendModeLighten,
+ BlendModeOverlay,
+ BlendModeColorDodge,
+ BlendModeColorBurn,
+ BlendModeHardLight,
+ BlendModeSoftLight,
+ BlendModeDifference,
+ BlendModeExclusion,
+ BlendModeHue,
+ BlendModeSaturation,
+ BlendModeColor,
+ BlendModeLuminosity,
+ BlendModePlusDarker,
+ BlendModePlusLighter
+};
</ins><span class="cx">
</span><del>- enum GradientSpreadMethod {
- SpreadMethodPad,
- SpreadMethodReflect,
- SpreadMethodRepeat
- };
</del><ins>+enum GradientSpreadMethod {
+ SpreadMethodPad,
+ SpreadMethodReflect,
+ SpreadMethodRepeat
+};
</ins><span class="cx">
</span><del>- enum LineCap { ButtCap, RoundCap, SquareCap };
</del><ins>+enum LineCap { ButtCap, RoundCap, SquareCap };
</ins><span class="cx">
</span><del>- enum LineJoin { MiterJoin, RoundJoin, BevelJoin };
</del><ins>+enum LineJoin { MiterJoin, RoundJoin, BevelJoin };
</ins><span class="cx">
</span><del>- enum HorizontalAlignment { AlignLeft, AlignRight, AlignHCenter };
</del><ins>+enum HorizontalAlignment { AlignLeft, AlignRight, AlignHCenter };
</ins><span class="cx">
</span><del>- enum TextBaseline { AlphabeticTextBaseline, TopTextBaseline, MiddleTextBaseline, BottomTextBaseline, IdeographicTextBaseline, HangingTextBaseline };
-
- enum TextAlign { StartTextAlign, EndTextAlign, LeftTextAlign, CenterTextAlign, RightTextAlign };
</del><ins>+enum TextBaseline { AlphabeticTextBaseline, TopTextBaseline, MiddleTextBaseline, BottomTextBaseline, IdeographicTextBaseline, HangingTextBaseline };
</ins><span class="cx">
</span><del>- enum RenderingMode {
- Unaccelerated,
- UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
- Accelerated
- };
</del><ins>+enum TextAlign { StartTextAlign, EndTextAlign, LeftTextAlign, CenterTextAlign, RightTextAlign };
</ins><span class="cx">
</span><del>- String compositeOperatorName(CompositeOperator, BlendMode);
- bool parseBlendMode(const String&, BlendMode&);
- bool parseCompositeAndBlendOperator(const String&, CompositeOperator&, BlendMode&);
</del><ins>+enum RenderingMode {
+ Unaccelerated,
+ UnacceleratedNonPlatformBuffer, // Use plain memory allocation rather than platform API to allocate backing store.
+ Accelerated
+};
</ins><span class="cx">
</span><del>- String lineCapName(LineCap);
- bool parseLineCap(const String&, LineCap&);
</del><ins>+String compositeOperatorName(CompositeOperator, BlendMode);
+bool parseBlendMode(const String&, BlendMode&);
+bool parseCompositeAndBlendOperator(const String&, CompositeOperator&, BlendMode&);
</ins><span class="cx">
</span><del>- String lineJoinName(LineJoin);
- bool parseLineJoin(const String&, LineJoin&);
</del><ins>+String lineCapName(LineCap);
+bool parseLineCap(const String&, LineCap&);
</ins><span class="cx">
</span><del>- String textAlignName(TextAlign);
- bool parseTextAlign(const String&, TextAlign&);
-
- String textBaselineName(TextBaseline);
- bool parseTextBaseline(const String&, TextBaseline&);
</del><ins>+String lineJoinName(LineJoin);
+bool parseLineJoin(const String&, LineJoin&);
</ins><span class="cx">
</span><ins>+String textAlignName(TextAlign);
+bool parseTextAlign(const String&, TextAlign&);
+
+String textBaselineName(TextBaseline);
+bool parseTextBaseline(const String&, TextBaseline&);
+
+class TextStream;
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, BlendMode);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, WindRule);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineCap);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineJoin);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp (0 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+ * Copyright (C) 2010 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 "PlatformCAAnimation.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, PlatformCAAnimation::AnimationType type)
+{
+ switch (type) {
+ case PlatformCAAnimation::Basic: ts << "basic"; break;
+ case PlatformCAAnimation::Keyframe: ts << "keyframe"; break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, PlatformCAAnimation::FillModeType fillMode)
+{
+ switch (fillMode) {
+ case PlatformCAAnimation::NoFillMode: ts << "none"; break;
+ case PlatformCAAnimation::Forwards: ts << "forwards"; break;
+ case PlatformCAAnimation::Backwards: ts << "backwards"; break;
+ case PlatformCAAnimation::Both: ts << "both"; break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, PlatformCAAnimation::ValueFunctionType valueFunctionType)
+{
+ switch (valueFunctionType) {
+ case PlatformCAAnimation::NoValueFunction: ts << "none"; break;
+ case PlatformCAAnimation::RotateX: ts << "rotateX"; break;
+ case PlatformCAAnimation::RotateY: ts << "rotateY"; break;
+ case PlatformCAAnimation::RotateZ: ts << "rotateX"; break;
+ case PlatformCAAnimation::ScaleX: ts << "scaleX"; break;
+ case PlatformCAAnimation::ScaleY: ts << "scaleY"; break;
+ case PlatformCAAnimation::ScaleZ: ts << "scaleX"; break;
+ case PlatformCAAnimation::Scale: ts << "scale"; break;
+ case PlatformCAAnimation::TranslateX: ts << "translateX"; break;
+ case PlatformCAAnimation::TranslateY: ts << "translateY"; break;
+ case PlatformCAAnimation::TranslateZ: ts << "translateZ"; break;
+ case PlatformCAAnimation::Translate: ts << "translate"; break;
+ }
+ return ts;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCAAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAAnimation.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -136,6 +136,10 @@
</span><span class="cx"> AnimationType m_type;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::AnimationType);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::FillModeType);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCAAnimation::ValueFunctionType);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_CAANIMATION(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -24,8 +24,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "PlatformCALayer.h"
+
</ins><span class="cx"> #include "LayerPool.h"
</span><del>-#include "PlatformCALayer.h"
</del><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/StringExtras.h>
</span><span class="cx">
</span><span class="cx"> #if USE(CA)
</span><span class="lines">@@ -133,6 +135,79 @@
</span><span class="cx"> return *sharedPool;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, PlatformCALayer::LayerType layerType)
+{
+ switch (layerType) {
+ case PlatformCALayer::LayerTypeLayer:
+ case PlatformCALayer::LayerTypeWebLayer:
+ case PlatformCALayer::LayerTypeSimpleLayer:
+ ts << "layer";
+ break;
+ case PlatformCALayer::LayerTypeTransformLayer:
+ ts << "transform-layer";
+ break;
+ case PlatformCALayer::LayerTypeWebTiledLayer:
+ ts << "tiled-layer";
+ break;
+ case PlatformCALayer::LayerTypeTiledBackingLayer:
+ ts << "tiled-backing-layer";
+ break;
+ case PlatformCALayer::LayerTypePageTiledBackingLayer:
+ ts << "page-tiled-backing-layer";
+ break;
+ case PlatformCALayer::LayerTypeTiledBackingTileLayer:
+ ts << "tiled-backing-tile";
+ break;
+ case PlatformCALayer::LayerTypeRootLayer:
+ ts << "root-layer";
+ break;
+ case PlatformCALayer::LayerTypeBackdropLayer:
+ ts << "backdrop-layer";
+ break;
+ case PlatformCALayer::LayerTypeAVPlayerLayer:
+ ts << "av-player-layer";
+ break;
+ case PlatformCALayer::LayerTypeWebGLLayer:
+ ts << "web-gl-layer";
+ break;
+ case PlatformCALayer::LayerTypeShapeLayer:
+ ts << "shape-layer";
+ break;
+ case PlatformCALayer::LayerTypeScrollingLayer:
+ ts << "scrolling-layer";
+ break;
+ case PlatformCALayer::LayerTypeCustom:
+ ts << "custom-layer";
+ break;
+ case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
+ ts << "light-system-backdrop-layer";
+ break;
+ case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
+ ts << "dark-system-backdrop-layer";
+ break;
+ }
+ return ts;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, PlatformCALayer::FilterType filterType)
+{
+ switch (filterType) {
+ case PlatformCALayer::Linear:
+ ts << "linear";
+ break;
+ case PlatformCALayer::Nearest:
+ ts << "nearest";
+ break;
+ case PlatformCALayer::Trilinear:
+ ts << "trilinear";
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ return ts;
+}
+
+}
+
</ins><span class="cx"> #endif // USE(CA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -280,6 +280,9 @@
</span><span class="cx"> PlatformCALayerClient* m_owner;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCALayer::LayerType);
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, PlatformCALayer::FilterType);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_PLATFORM_CALAYER(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "AnimationUtilities.h"
</span><span class="cx"> #include "CachedSVGDocumentReference.h"
</span><span class="cx"> #include "FilterEffect.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -198,4 +199,76 @@
</span><span class="cx"> WebCore::blend(fromColor, m_color, progress));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const FilterOperation& filter)
+{
+ switch (filter.type()) {
+ case FilterOperation::REFERENCE:
+ ts << "reference";
+ break;
+ case FilterOperation::GRAYSCALE: {
+ const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
+ ts << "grayscale(" << colorMatrixFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::SEPIA: {
+ const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
+ ts << "sepia(" << colorMatrixFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::SATURATE: {
+ const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
+ ts << "saturate(" << colorMatrixFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::HUE_ROTATE: {
+ const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
+ ts << "hue-rotate(" << colorMatrixFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::INVERT: {
+ const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
+ ts << "invert(" << componentTransferFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::OPACITY: {
+ const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
+ ts << "opacity(" << componentTransferFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::BRIGHTNESS: {
+ const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
+ ts << "brightness(" << componentTransferFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::CONTRAST: {
+ const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
+ ts << "contrast(" << componentTransferFilter.amount() << ")";
+ break;
+ }
+ case FilterOperation::BLUR: {
+ const auto& blurFilter = downcast<BlurFilterOperation>(filter);
+ ts << "blur(" << blurFilter.stdDeviation().value() << ")"; // FIXME: should call floatValueForLength() but that's outisde of platform/.
+ break;
+ }
+ case FilterOperation::DROP_SHADOW: {
+ const auto& dropShadowFilter = downcast<DropShadowFilterOperation>(filter);
+ ts << "drop-shadow(" << dropShadowFilter.x() << " " << dropShadowFilter.y() << " " << dropShadowFilter.location() << " ";
+ ts << dropShadowFilter.color() << ")";
+ break;
+ }
+ case FilterOperation::PASSTHROUGH:
+ ts << "passthrough";
+ break;
+ case FilterOperation::DEFAULT: {
+ const auto& defaultFilter = downcast<DefaultFilterOperation>(filter);
+ ts << "default type=" << (int)defaultFilter.representedType();
+ break;
+ }
+ case FilterOperation::NONE:
+ ts << "none";
+ break;
+ }
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -336,6 +336,8 @@
</span><span class="cx"> Color m_color;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FilterOperation&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #define SPECIALIZE_TYPE_TRAITS_FILTEROPERATION(ToValueTypeName, predicate) \
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "FEGaussianBlur.h"
</span><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "LengthFunctions.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -151,4 +152,18 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const FilterOperations& filters)
+{
+ for (size_t i = 0; i < filters.size(); ++i) {
+ const auto filter = filters.at(i);
+ if (filter)
+ ts << *filter;
+ else
+ ts << "(null)";
+ if (i < filters.size() - 1)
+ ts << " ";
+ }
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersFilterOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/FilterOperations.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> Vector<RefPtr<FilterOperation>> m_operations;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const FilterOperations&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FilterOperations_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersPointLightSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/PointLightSource.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/PointLightSource.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/PointLightSource.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -71,12 +71,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextStream& operator<<(TextStream& ts, const FloatPoint3D& p)
-{
- ts << "x=" << p.x() << " y=" << p.y() << " z=" << p.z();
- return ts;
-}
-
</del><span class="cx"> TextStream& PointLightSource::externalRepresentation(TextStream& ts) const
</span><span class="cx"> {
</span><span class="cx"> ts << "[type=POINT-LIGHT] ";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfiltersSpotLightSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/filters/SpotLightSource.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -175,12 +175,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static TextStream& operator<<(TextStream& ts, const FloatPoint3D& p)
-{
- ts << "x=" << p.x() << " y=" << p.y() << " z=" << p.z();
- return ts;
-}
-
</del><span class="cx"> TextStream& SpotLightSource::externalRepresentation(TextStream& ts) const
</span><span class="cx"> {
</span><span class="cx"> ts << "[type=SPOT-LIGHT] ";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "IntRect.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include "TransformationMatrix.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="lines">@@ -425,4 +426,20 @@
</span><span class="cx"> this->scale(decomp.scaleX, decomp.scaleY);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const AffineTransform& transform)
+{
+ if (transform.isIdentity())
+ ts << "identity";
+ else
+ ts << "{m=(("
+ << transform.a() << "," << transform.b()
+ << ")("
+ << transform.c() << "," << transform.d()
+ << ")) t=("
+ << transform.e() << "," << transform.f()
+ << ")}";
+
+ return ts;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class IntPoint;
</span><span class="cx"> class IntSize;
</span><span class="cx"> class IntRect;
</span><ins>+class TextStream;
</ins><span class="cx"> class TransformationMatrix;
</span><span class="cx">
</span><span class="cx"> class AffineTransform {
</span><span class="lines">@@ -193,6 +194,8 @@
</span><span class="cx">
</span><span class="cx"> AffineTransform makeMapBetweenRects(const FloatRect& source, const FloatRect& dest);
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const AffineTransform&);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><del>-
</del><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="lines">@@ -1742,4 +1742,20 @@
</span><span class="cx"> return zComponentOfTransformedNormal < 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, const TransformationMatrix& transform)
+{
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "[" << transform.m11() << " " << transform.m12() << " " << transform.m13() << " " << transform.m14() << "]\n";
+ ts.writeIndent();
+ ts << "[" << transform.m21() << " " << transform.m22() << " " << transform.m23() << " " << transform.m24() << "]\n";
+ ts.writeIndent();
+ ts << "[" << transform.m31() << " " << transform.m32() << " " << transform.m33() << " " << transform.m34() << "]\n";
+ ts.writeIndent();
+ ts << "[" << transform.m41() << " " << transform.m42() << " " << transform.m43() << " " << transform.m44() << "]";
+ ts.decreaseIndent();
+ return ts;
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> class LayoutRect;
</span><span class="cx"> class FloatRect;
</span><span class="cx"> class FloatQuad;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86_64)
</span><span class="cx"> #define TRANSFORMATION_MATRIX_USE_X86_64_SSE2
</span><span class="lines">@@ -413,6 +414,8 @@
</span><span class="cx"> Matrix4 m_matrix;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, const TransformationMatrix&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // TransformationMatrix_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextStream.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextStream.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/text/TextStream.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -139,6 +139,34 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TextStream::startGroup()
+{
+ TextStream& ts = *this;
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(";
+ ts.increaseIndent();
+}
+
+void TextStream::endGroup()
+{
+ TextStream& ts = *this;
+ ts << ")";
+ ts.decreaseIndent();
+}
+
+void TextStream::nextLine()
+{
+ TextStream& ts = *this;
+ ts << "\n";
+ ts.writeIndent();
+}
+
+void TextStream::writeIndent()
+{
+ WebCore::writeIndent(*this, m_indent);
+}
+
</ins><span class="cx"> void writeIndent(TextStream& ts, int indent)
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i != indent; ++i)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextStream.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextStream.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/platform/text/TextStream.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -47,40 +47,75 @@
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(bool);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(int);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(unsigned);
</span><del>- TextStream& operator<<(long);
- TextStream& operator<<(unsigned long);
- TextStream& operator<<(long long);
</del><ins>+ WEBCORE_EXPORT TextStream& operator<<(long);
+ WEBCORE_EXPORT TextStream& operator<<(unsigned long);
+ WEBCORE_EXPORT TextStream& operator<<(long long);
+ WEBCORE_EXPORT TextStream& operator<<(LayoutUnit);
+
</ins><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(unsigned long long);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(float);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(double);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(const char*);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(const void*);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(const String&);
</span><del>- TextStream& operator<<(const FormatNumberRespectingIntegers&);
</del><ins>+ WEBCORE_EXPORT TextStream& operator<<(const FormatNumberRespectingIntegers&);
</ins><span class="cx">
</span><del>- TextStream& operator<<(LayoutUnit);
-
- template<typename Item>
- TextStream& operator<<(const Vector<Item>& vector)
</del><ins>+ template<typename T>
+ void dumpProperty(const String& name, const T& value)
</ins><span class="cx"> {
</span><del>- *this << "[";
</del><ins>+ TextStream& ts = *this;
+ ts.startGroup();
+ ts << name << " " << value;
+ ts.endGroup();
+ }
</ins><span class="cx">
</span><del>- unsigned size = vector.size();
- for (unsigned i = 0; i < size; ++i) {
- *this << vector[i];
- if (i < size - 1)
- *this << ", ";
</del><ins>+ WEBCORE_EXPORT String release();
+
+ WEBCORE_EXPORT void startGroup();
+ WEBCORE_EXPORT void endGroup();
+ WEBCORE_EXPORT void nextLine(); // Output newline and indent.
+
+ WEBCORE_EXPORT void increaseIndent() { ++m_indent; }
+ WEBCORE_EXPORT void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
+
+ WEBCORE_EXPORT void writeIndent();
+
+ class GroupScope {
+ public:
+ GroupScope(TextStream& ts)
+ : m_stream(ts)
+ {
+ m_stream.startGroup();
</ins><span class="cx"> }
</span><ins>+ ~GroupScope()
+ {
+ m_stream.endGroup();
+ }
</ins><span class="cx">
</span><del>- return *this << "]";
- }
</del><ins>+ private:
+ TextStream& m_stream;
+ };
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT String release();
-
</del><span class="cx"> private:
</span><span class="cx"> StringBuilder m_text;
</span><ins>+ int m_indent { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename Item>
+TextStream& operator<<(TextStream& ts, const Vector<Item>& vector)
+{
+ ts << "[";
+
+ unsigned size = vector.size();
+ for (unsigned i = 0; i < size; ++i) {
+ ts << vector[i];
+ if (i < size - 1)
+ ts << ", ";
+ }
+
+ return ts << "]";
+}
+
</ins><span class="cx"> void writeIndent(TextStream&, int indent);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -118,36 +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 AffineTransform& transform)
-{
- if (transform.isIdentity())
- ts << "identity";
- else
- ts << "{m=(("
- << transform.a() << "," << transform.b()
- << ")("
- << transform.c() << "," << transform.d()
- << ")) t=("
- << transform.e() << "," << transform.f()
- << ")}";
-
- return ts;
-}
-
-static TextStream& operator<<(TextStream& ts, const WindRule rule)
-{
- switch (rule) {
- case RULE_NONZERO:
- ts << "NON-ZERO";
- break;
- case RULE_EVENODD:
- ts << "EVEN-ODD";
- break;
- }
-
- return ts;
-}
-
</del><span class="cx"> static TextStream& operator<<(TextStream& ts, const SVGUnitTypes::SVGUnitType& unitType)
</span><span class="cx"> {
</span><span class="cx"> ts << SVGPropertyTraits<SVGUnitTypes::SVGUnitType>::toString(unitType);
</span><span class="lines">@@ -160,11 +130,6 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextStream& operator<<(TextStream& ts, const Color& c)
-{
- return ts << c.nameForRenderTreeAsText();
-}
-
</del><span class="cx"> // FIXME: Maybe this should be in KCanvasRenderingStyle.cpp
</span><span class="cx"> static TextStream& operator<<(TextStream& ts, const DashArray& a)
</span><span class="cx"> {
</span><span class="lines">@@ -179,40 +144,6 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: Maybe this should be in GraphicsTypes.cpp
-static TextStream& operator<<(TextStream& ts, LineCap style)
-{
- switch (style) {
- case ButtCap:
- ts << "BUTT";
- break;
- case RoundCap:
- ts << "ROUND";
- break;
- case SquareCap:
- ts << "SQUARE";
- break;
- }
- return ts;
-}
-
-// FIXME: Maybe this should be in GraphicsTypes.cpp
-static TextStream& operator<<(TextStream& ts, LineJoin style)
-{
- switch (style) {
- case MiterJoin:
- ts << "MITER";
- break;
- case RoundJoin:
- ts << "ROUND";
- break;
- case BevelJoin:
- ts << "BEVEL";
- break;
- }
- return ts;
-}
-
</del><span class="cx"> static TextStream& operator<<(TextStream& ts, const SVGSpreadMethodType& type)
</span><span class="cx"> {
</span><span class="cx"> ts << SVGPropertyTraits<SVGSpreadMethodType>::toString(type).upper();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderTreeAsTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -58,11 +58,6 @@
</span><span class="cx"> void writeSVGText(TextStream&, const RenderSVGText&, int indent);
</span><span class="cx"> void writeResources(TextStream&, const RenderObject&, int indent);
</span><span class="cx">
</span><del>-// helper operators defined used in various classes to dump the render tree.
-TextStream& operator<<(TextStream&, const AffineTransform&);
-TextStream& operator<<(TextStream&, const Color&);
-TextStream& operator<<(TextStream&, const FloatRect&);
-
</del><span class="cx"> // helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
</span><span class="cx"> // these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-10-16 Simon Fraser <simon.fraser@apple.com>
+
+ Enhance TextStream for logging, remove subclasses, log more things
+ https://bugs.webkit.org/show_bug.cgi?id=150269
+
+ Reviewed by Zalan Bujtas.
+
+ Remove the various TextStream subclasses that only existed to support indenting,
+ and output additional types. Add output for more WebCore and WebKit2 types, and
+ just use TextStream everywhere.
+
+ TextStream is enhance to support grouping (open paren and intent), with a
+ stack-based class to open/end a group.
+
+ Remove some SVG-specific duplicate output functions.
+
+ Outdent namespace contents of GraphicsTypes.h.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::dump):
+ (WebKit::recursiveDumpNodes):
+ (WebKit::RemoteScrollingCoordinatorTransaction::description):
+ (WebKit::RemoteScrollingTreeTextStream::RemoteScrollingTreeTextStream): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::increaseIndent): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::decreaseIndent): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::writeIndent): Deleted.
+ (WebKit::dumpProperty): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::operator<<): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::dump): Deleted.
+ (WebKit::RemoteScrollingTreeTextStream::recursiveDumpNodes): Deleted.
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::operator<<):
+ (WebKit::dumpChangedLayers):
+ (WebKit::RemoteLayerTreeTransaction::description):
+ (WebKit::RemoteLayerTreeTextStream::RemoteLayerTreeTextStream): Deleted.
+ (WebKit::RemoteLayerTreeTextStream::increaseIndent): Deleted.
+ (WebKit::RemoteLayerTreeTextStream::decreaseIndent): Deleted.
+ (WebKit::dumpProperty): Deleted.
+ (WebKit::RemoteLayerTreeTextStream::operator<<): Deleted.
+ (WebKit::RemoteLayerTreeTextStream::writeIndent): Deleted.
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
+ * WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
+ (WebKit::operator<<):
+
</ins><span class="cx"> 2015-10-17 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> URTBF after r191194 to fix EFL build.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -454,166 +454,44 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG) || !LOG_DISABLED
</span><span class="cx">
</span><del>-class RemoteScrollingTreeTextStream : public TextStream {
-public:
- using TextStream::operator<<;
-
- RemoteScrollingTreeTextStream()
- : m_indent(0)
- {
- }
-
- RemoteScrollingTreeTextStream& operator<<(ScrollingNodeType);
-
- RemoteScrollingTreeTextStream& operator<<(const FixedPositionViewportConstraints&);
- RemoteScrollingTreeTextStream& operator<<(const StickyPositionViewportConstraints&);
-
- void dump(const ScrollingStateTree&, bool changedPropertiesOnly = true);
-
- void dump(const ScrollingStateNode&, bool changedPropertiesOnly = true);
- void dump(const ScrollingStateScrollingNode&, bool changedPropertiesOnly = true);
- void dump(const ScrollingStateFrameScrollingNode&, bool changedPropertiesOnly = true);
- void dump(const ScrollingStateOverflowScrollingNode&, bool changedPropertiesOnly = true);
- void dump(const ScrollingStateFixedNode&, bool changedPropertiesOnly = true);
- void dump(const ScrollingStateStickyNode&, bool changedPropertiesOnly = true);
-
- void increaseIndent() { ++m_indent; }
- void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
-
- void writeIndent();
-
-private:
- void recursiveDumpNodes(const ScrollingStateNode&, bool changedPropertiesOnly);
-
- int m_indent;
-};
-
-void RemoteScrollingTreeTextStream::writeIndent()
</del><ins>+static void dump(TextStream& ts, const ScrollingStateScrollingNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- for (int i = 0; i < m_indent; ++i)
- *this << " ";
-}
-
-template <class T>
-static void dumpProperty(RemoteScrollingTreeTextStream& ts, String name, T value)
-{
- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(" << name << " ";
- ts << value << ")";
- ts.decreaseIndent();
-}
-
-RemoteScrollingTreeTextStream& RemoteScrollingTreeTextStream::operator<<(ScrollingNodeType nodeType)
-{
- RemoteScrollingTreeTextStream& ts = *this;
-
- switch (nodeType) {
- case FrameScrollingNode: ts << "frame-scrolling"; break;
- case OverflowScrollingNode: ts << "overflow-scrolling"; break;
- case FixedNode: ts << "fixed"; break;
- case StickyNode: ts << "sticky"; break;
- }
-
- return ts;
-}
-
-RemoteScrollingTreeTextStream& RemoteScrollingTreeTextStream::operator<<(const FixedPositionViewportConstraints& constraints)
-{
- RemoteScrollingTreeTextStream& ts = *this;
-
- dumpProperty(ts, "viewport-rect-at-last-layout", constraints.viewportRectAtLastLayout());
- dumpProperty(ts, "layer-position-at-last-layout", constraints.layerPositionAtLastLayout());
-
- return ts;
-}
-
-RemoteScrollingTreeTextStream& RemoteScrollingTreeTextStream::operator<<(const StickyPositionViewportConstraints& constraints)
-{
- RemoteScrollingTreeTextStream& ts = *this;
-
- dumpProperty(ts, "sticky-position-at-last-layout", constraints.stickyOffsetAtLastLayout());
- dumpProperty(ts, "layer-position-at-last-layout", constraints.layerPositionAtLastLayout());
-
- return ts;
-}
-
-void RemoteScrollingTreeTextStream::dump(const ScrollingStateNode& node, bool changedPropertiesOnly)
-{
- RemoteScrollingTreeTextStream& ts = *this;
-
- ts << "(node " << node.scrollingNodeID();
-
- dumpProperty(ts, "type", node.nodeType());
-
- if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateNode::ScrollLayer))
- dumpProperty(ts, "layer", static_cast<GraphicsLayer::PlatformLayerID>(node.layer()));
-
- switch (node.nodeType()) {
- case FrameScrollingNode:
- dump(downcast<ScrollingStateFrameScrollingNode>(node), changedPropertiesOnly);
- break;
- case OverflowScrollingNode:
- dump(downcast<ScrollingStateOverflowScrollingNode>(node), changedPropertiesOnly);
- break;
- case FixedNode:
- dump(downcast<ScrollingStateFixedNode>(node), changedPropertiesOnly);
- break;
- case StickyNode:
- dump(downcast<ScrollingStateStickyNode>(node), changedPropertiesOnly);
- break;
- }
-}
-
-void RemoteScrollingTreeTextStream::dump(const ScrollingStateScrollingNode& node, bool changedPropertiesOnly)
-{
- RemoteScrollingTreeTextStream& ts = *this;
-
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ScrollableAreaSize))
</span><del>- dumpProperty(ts, "scrollable-area-size", node.scrollableAreaSize());
</del><ins>+ ts.dumpProperty("scrollable-area-size", node.scrollableAreaSize());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize))
</span><del>- dumpProperty(ts, "total-contents-size", node.totalContentsSize());
</del><ins>+ ts.dumpProperty("total-contents-size", node.totalContentsSize());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ReachableContentsSize))
</span><del>- dumpProperty(ts, "reachable-contents-size", node.reachableContentsSize());
</del><ins>+ ts.dumpProperty("reachable-contents-size", node.reachableContentsSize());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ScrollPosition))
</span><del>- dumpProperty(ts, "scroll-position", node.scrollPosition());
</del><ins>+ ts.dumpProperty("scroll-position", node.scrollPosition());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin))
</span><del>- dumpProperty(ts, "scroll-origin", node.scrollOrigin());
</del><ins>+ ts.dumpProperty("scroll-origin", node.scrollOrigin());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition)) {
</span><del>- dumpProperty(ts, "requested-scroll-position", node.requestedScrollPosition());
- dumpProperty(ts, "requested-scroll-position-is-programatic", node.requestedScrollPositionRepresentsProgrammaticScroll());
</del><ins>+ ts.dumpProperty("requested-scroll-position", node.requestedScrollPosition());
+ ts.dumpProperty("requested-scroll-position-is-programatic", node.requestedScrollPositionRepresentsProgrammaticScroll());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::dump(const ScrollingStateFrameScrollingNode& node, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateFrameScrollingNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
</del><ins>+ dump(ts, static_cast<const ScrollingStateScrollingNode&>(node), changedPropertiesOnly);
</ins><span class="cx">
</span><del>- dump(static_cast<const ScrollingStateScrollingNode&>(node), changedPropertiesOnly);
-
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
</span><del>- dumpProperty(ts, "frame-scale-factor", node.frameScaleFactor());
</del><ins>+ ts.dumpProperty("frame-scale-factor", node.frameScaleFactor());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::NonFastScrollableRegion)) {
</span><del>- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(non-fast-scrollable-region";
- ts.increaseIndent();
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << "non-fast-scrollable-region";
</ins><span class="cx"> for (auto rect : node.nonFastScrollableRegion().rects()) {
</span><span class="cx"> ts << "\n";
</span><span class="cx"> ts.writeIndent();
</span><span class="cx"> ts << rect;
</span><span class="cx"> }
</span><del>- ts << ")\n";
- ts.decreaseIndent();
- ts.decreaseIndent();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: dump synchronousScrollingReasons
</span><span class="lines">@@ -621,123 +499,122 @@
</span><span class="cx"> // FIXME: dump scrollBehaviorForFixedElements
</span><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderHeight))
</span><del>- dumpProperty(ts, "header-height", node.headerHeight());
</del><ins>+ ts.dumpProperty("header-height", node.headerHeight());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FooterHeight))
</span><del>- dumpProperty(ts, "footer-height", node.footerHeight());
</del><ins>+ ts.dumpProperty("footer-height", node.footerHeight());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::TopContentInset))
</span><del>- dumpProperty(ts, "top-content-inset", node.topContentInset());
</del><ins>+ ts.dumpProperty("top-content-inset", node.topContentInset());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
</span><del>- dumpProperty(ts, "frame-scale-factor", node.frameScaleFactor());
</del><ins>+ ts.dumpProperty("frame-scale-factor", node.frameScaleFactor());
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrolledContentsLayer))
</span><del>- dumpProperty(ts, "scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</del><ins>+ ts.dumpProperty("scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::InsetClipLayer))
</span><del>- dumpProperty(ts, "clip-inset-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer()));
</del><ins>+ ts.dumpProperty("clip-inset-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.insetClipLayer()));
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::ContentShadowLayer))
</span><del>- dumpProperty(ts, "content-shadow-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer()));
</del><ins>+ ts.dumpProperty("content-shadow-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.contentShadowLayer()));
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::HeaderLayer))
</span><del>- dumpProperty(ts, "header-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.headerLayer()));
</del><ins>+ ts.dumpProperty("header-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.headerLayer()));
</ins><span class="cx">
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FooterLayer))
</span><del>- dumpProperty(ts, "footer-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.footerLayer()));
</del><ins>+ ts.dumpProperty("footer-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.footerLayer()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::dump(const ScrollingStateOverflowScrollingNode& node, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateOverflowScrollingNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
</del><ins>+ dump(ts, static_cast<const ScrollingStateScrollingNode&>(node), changedPropertiesOnly);
</ins><span class="cx">
</span><del>- dump(static_cast<const ScrollingStateScrollingNode&>(node), changedPropertiesOnly);
-
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateOverflowScrollingNode::ScrolledContentsLayer))
</span><del>- dumpProperty(ts, "scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</del><ins>+ ts.dumpProperty("scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::dump(const ScrollingStateFixedNode& node, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateFixedNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
-
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFixedNode::ViewportConstraints))
</span><span class="cx"> ts << node.viewportConstraints();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::dump(const ScrollingStateStickyNode& node, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateStickyNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
-
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFixedNode::ViewportConstraints))
</span><span class="cx"> ts << node.viewportConstraints();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::recursiveDumpNodes(const ScrollingStateNode& node, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateNode& node, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
</del><ins>+ ts.dumpProperty("type", node.nodeType());
</ins><span class="cx">
</span><del>- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- dump(node, changedPropertiesOnly);
</del><ins>+ if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ ts.dumpProperty("layer", static_cast<GraphicsLayer::PlatformLayerID>(node.layer()));
+
+ switch (node.nodeType()) {
+ case FrameScrollingNode:
+ dump(ts, downcast<ScrollingStateFrameScrollingNode>(node), changedPropertiesOnly);
+ break;
+ case OverflowScrollingNode:
+ dump(ts, downcast<ScrollingStateOverflowScrollingNode>(node), changedPropertiesOnly);
+ break;
+ case FixedNode:
+ dump(ts, downcast<ScrollingStateFixedNode>(node), changedPropertiesOnly);
+ break;
+ case StickyNode:
+ dump(ts, downcast<ScrollingStateStickyNode>(node), changedPropertiesOnly);
+ break;
+ }
+}
</ins><span class="cx">
</span><ins>+static void recursiveDumpNodes(TextStream& ts, const ScrollingStateNode& node, bool changedPropertiesOnly)
+{
+ TextStream::GroupScope group(ts);
+ ts << "node " << node.scrollingNodeID();
+ dump(ts, node, changedPropertiesOnly);
+
</ins><span class="cx"> if (node.children()) {
</span><del>- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(children";
- ts.increaseIndent();
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << "children";
</ins><span class="cx">
</span><span class="cx"> for (auto& childNode : *node.children())
</span><del>- recursiveDumpNodes(*childNode, changedPropertiesOnly);
-
- ts << ")";
- ts.decreaseIndent();
- ts.decreaseIndent();
</del><ins>+ recursiveDumpNodes(ts, *childNode, changedPropertiesOnly);
</ins><span class="cx"> }
</span><del>-
- ts << ")";
- ts.decreaseIndent();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingTreeTextStream::dump(const ScrollingStateTree& stateTree, bool changedPropertiesOnly)
</del><ins>+static void dump(TextStream& ts, const ScrollingStateTree& stateTree, bool changedPropertiesOnly)
</ins><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream& ts = *this;
</del><ins>+ ts.dumpProperty("has changed properties", stateTree.hasChangedProperties());
+ ts.dumpProperty("has new root node", stateTree.hasNewRootStateNode());
</ins><span class="cx">
</span><del>- dumpProperty(ts, "has changed properties", stateTree.hasChangedProperties());
- dumpProperty(ts, "has new root node", stateTree.hasNewRootStateNode());
-
</del><span class="cx"> if (stateTree.rootStateNode())
</span><del>- recursiveDumpNodes(*stateTree.rootStateNode(), changedPropertiesOnly);
</del><ins>+ recursiveDumpNodes(ts, *stateTree.rootStateNode(), changedPropertiesOnly);
</ins><span class="cx">
</span><span class="cx"> if (!stateTree.removedNodes().isEmpty()) {
</span><span class="cx"> Vector<ScrollingNodeID> removedNodes;
</span><span class="cx"> copyToVector(stateTree.removedNodes(), removedNodes);
</span><del>- dumpProperty<Vector<ScrollingNodeID>>(ts, "removed-nodes", removedNodes);
</del><ins>+ ts.dumpProperty<Vector<ScrollingNodeID>>("removed-nodes", removedNodes);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WTF::CString RemoteScrollingCoordinatorTransaction::description() const
</span><span class="cx"> {
</span><del>- RemoteScrollingTreeTextStream ts;
</del><ins>+ TextStream ts;
</ins><span class="cx">
</span><del>- ts << "(\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(scrolling state tree";
</del><ins>+ ts.startGroup();
+ ts << "scrolling state tree";
</ins><span class="cx">
</span><span class="cx"> if (m_scrollingStateTree) {
</span><span class="cx"> if (!m_scrollingStateTree->hasChangedProperties())
</span><span class="cx"> ts << " - no changes";
</span><span class="cx"> else
</span><del>- ts.dump(*m_scrollingStateTree.get());
</del><ins>+ WebKit::dump(ts, *m_scrollingStateTree.get(), true);
</ins><span class="cx"> } else
</span><span class="cx"> ts << " - none";
</span><span class="cx">
</span><del>- ts << ")\n";
- ts.decreaseIndent();
</del><ins>+ ts.endGroup();
</ins><span class="cx">
</span><span class="cx"> return ts.release().utf8();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerTreeTransactionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -647,433 +647,8 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG) || !LOG_DISABLED
</span><span class="cx">
</span><del>-class RemoteLayerTreeTextStream : public TextStream
</del><ins>+static TextStream& operator<<(TextStream& ts, const RemoteLayerBackingStore& backingStore)
</ins><span class="cx"> {
</span><del>-public:
- using TextStream::operator<<;
-
- RemoteLayerTreeTextStream()
- : m_indent(0)
- {
- }
-
- RemoteLayerTreeTextStream& operator<<(const TransformationMatrix&);
- RemoteLayerTreeTextStream& operator<<(PlatformCALayer::FilterType);
- RemoteLayerTreeTextStream& operator<<(const FloatRoundedRect&);
- RemoteLayerTreeTextStream& operator<<(FloatPoint3D);
- RemoteLayerTreeTextStream& operator<<(Color);
- RemoteLayerTreeTextStream& operator<<(const Vector<WebCore::GraphicsLayer::PlatformLayerID>&);
- RemoteLayerTreeTextStream& operator<<(const FilterOperation&);
- RemoteLayerTreeTextStream& operator<<(const FilterOperations&);
- RemoteLayerTreeTextStream& operator<<(const PlatformCAAnimationRemote::Properties&);
- RemoteLayerTreeTextStream& operator<<(const RemoteLayerBackingStore&);
- RemoteLayerTreeTextStream& operator<<(const WebCore::GraphicsLayer::CustomAppearance&);
- RemoteLayerTreeTextStream& operator<<(BlendMode);
- RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::AnimationType);
- RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::FillModeType);
- RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::ValueFunctionType);
- RemoteLayerTreeTextStream& operator<<(const TimingFunction&);
- RemoteLayerTreeTextStream& operator<<(const PlatformCAAnimationRemote::KeyframeValue&);
-
- void increaseIndent() { ++m_indent; }
- void decreaseIndent() { --m_indent; ASSERT(m_indent >= 0); }
-
- void writeIndent();
-
-private:
- int m_indent;
-};
-
-template <class T>
-static void dumpProperty(RemoteLayerTreeTextStream& ts, String name, T value)
-{
- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(" << name << " ";
- ts << value << ")";
- ts.decreaseIndent();
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const TransformationMatrix& transform)
-{
- RemoteLayerTreeTextStream& ts = *this;
- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "[" << transform.m11() << " " << transform.m12() << " " << transform.m13() << " " << transform.m14() << "]\n";
- ts.writeIndent();
- ts << "[" << transform.m21() << " " << transform.m22() << " " << transform.m23() << " " << transform.m24() << "]\n";
- ts.writeIndent();
- ts << "[" << transform.m31() << " " << transform.m32() << " " << transform.m33() << " " << transform.m34() << "]\n";
- ts.writeIndent();
- ts << "[" << transform.m41() << " " << transform.m42() << " " << transform.m43() << " " << transform.m44() << "]";
- ts.decreaseIndent();
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const FloatRoundedRect& roundedRect)
-{
- RemoteLayerTreeTextStream& ts = *this;
- ts << roundedRect.rect().x() << " " << roundedRect.rect().y() << " " << roundedRect.rect().width() << " " << roundedRect.rect().height() << "\n";
-
- ts.increaseIndent();
- ts.writeIndent();
- ts << "topLeft=" << roundedRect.topLeftCorner().width() << " " << roundedRect.topLeftCorner().height() << "\n";
- ts.writeIndent();
- ts << "topRight=" << roundedRect.topRightCorner().width() << " " << roundedRect.topRightCorner().height() << "\n";
- ts.writeIndent();
- ts << "bottomLeft=" << roundedRect.bottomLeftCorner().width() << " " << roundedRect.bottomLeftCorner().height() << "\n";
- ts.writeIndent();
- ts << "bottomRight=" << roundedRect.bottomRightCorner().width() << " " << roundedRect.bottomRightCorner().height();
- ts.decreaseIndent();
-
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(PlatformCALayer::FilterType filterType)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (filterType) {
- case PlatformCALayer::Linear:
- ts << "linear";
- break;
- case PlatformCALayer::Nearest:
- ts << "nearest";
- break;
- case PlatformCALayer::Trilinear:
- ts << "trilinear";
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const FilterOperations& filters)
-{
- RemoteLayerTreeTextStream& ts = *this;
- for (size_t i = 0; i < filters.size(); ++i) {
- const auto filter = filters.at(i);
- if (filter)
- ts << *filter;
- else
- ts << "(null)";
- if (i < filters.size() - 1)
- ts << " ";
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const FilterOperation& filter)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (filter.type()) {
- case FilterOperation::REFERENCE:
- ts << "reference";
- break;
- case FilterOperation::GRAYSCALE: {
- const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
- ts << "grayscale(" << colorMatrixFilter.amount() << ")";
- break;
- }
- case FilterOperation::SEPIA: {
- const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
- ts << "sepia(" << colorMatrixFilter.amount() << ")";
- break;
- }
- case FilterOperation::SATURATE: {
- const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
- ts << "saturate(" << colorMatrixFilter.amount() << ")";
- break;
- }
- case FilterOperation::HUE_ROTATE: {
- const auto& colorMatrixFilter = downcast<BasicColorMatrixFilterOperation>(filter);
- ts << "hue-rotate(" << colorMatrixFilter.amount() << ")";
- break;
- }
- case FilterOperation::INVERT: {
- const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
- ts << "invert(" << componentTransferFilter.amount() << ")";
- break;
- }
- case FilterOperation::OPACITY: {
- const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
- ts << "opacity(" << componentTransferFilter.amount() << ")";
- break;
- }
- case FilterOperation::BRIGHTNESS: {
- const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
- ts << "brightness(" << componentTransferFilter.amount() << ")";
- break;
- }
- case FilterOperation::CONTRAST: {
- const auto& componentTransferFilter = downcast<BasicComponentTransferFilterOperation>(filter);
- ts << "contrast(" << componentTransferFilter.amount() << ")";
- break;
- }
- case FilterOperation::BLUR: {
- const auto& blurFilter = downcast<BlurFilterOperation>(filter);
- ts << "blur(" << floatValueForLength(blurFilter.stdDeviation(), 0) << ")";
- break;
- }
- case FilterOperation::DROP_SHADOW: {
- const auto& dropShadowFilter = downcast<DropShadowFilterOperation>(filter);
- ts << "drop-shadow(" << dropShadowFilter.x() << " " << dropShadowFilter.y() << " " << dropShadowFilter.location() << " ";
- ts << dropShadowFilter.color() << ")";
- break;
- }
- case FilterOperation::PASSTHROUGH:
- ts << "passthrough";
- break;
- case FilterOperation::DEFAULT: {
- const auto& defaultFilter = downcast<DefaultFilterOperation>(filter);
- ts << "default type=" << (int)defaultFilter.representedType();
- break;
- }
- case FilterOperation::NONE:
- ts << "none";
- break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const WebCore::GraphicsLayer::CustomAppearance& customAppearance)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (customAppearance) {
- case WebCore::GraphicsLayer::CustomAppearance::NoCustomAppearance: ts << "none"; break;
- case WebCore::GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
- case WebCore::GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
- case WebCore::GraphicsLayer::CustomAppearance::LightBackdropAppearance: ts << "light-backdrop"; break;
- case WebCore::GraphicsLayer::CustomAppearance::DarkBackdropAppearance: ts << "dark-backdrop"; break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(BlendMode blendMode)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (blendMode) {
- case BlendModeNormal: ts << "normal"; break;
- case BlendModeMultiply: ts << "multiply"; break;
- case BlendModeScreen: ts << "screen"; break;
- case BlendModeOverlay: ts << "overlay"; break;
- case BlendModeDarken: ts << "darken"; break;
- case BlendModeLighten: ts << "lighten"; break;
- case BlendModeColorDodge: ts << "color-dodge"; break;
- case BlendModeColorBurn: ts << "color-burn"; break;
- case BlendModeHardLight: ts << "hard-light"; break;
- case BlendModeSoftLight: ts << "soft-light"; break;
- case BlendModeDifference: ts << "difference"; break;
- case BlendModeExclusion: ts << "exclusion"; break;
- case BlendModeHue: ts << "hue"; break;
- case BlendModeSaturation: ts << "saturation"; break;
- case BlendModeColor: ts << "color"; break;
- case BlendModeLuminosity: ts << "luminosity"; break;
- case BlendModePlusDarker: ts << "plus-darker"; break;
- case BlendModePlusLighter: ts << "plus-lighter"; break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(PlatformCAAnimation::AnimationType type)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (type) {
- case PlatformCAAnimation::Basic: ts << "basic"; break;
- case PlatformCAAnimation::Keyframe: ts << "keyframe"; break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(PlatformCAAnimation::FillModeType type)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (type) {
- case PlatformCAAnimation::NoFillMode: ts << "none"; break;
- case PlatformCAAnimation::Forwards: ts << "forwards"; break;
- case PlatformCAAnimation::Backwards: ts << "backwards"; break;
- case PlatformCAAnimation::Both: ts << "both"; break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(PlatformCAAnimation::ValueFunctionType type)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (type) {
- case PlatformCAAnimation::NoValueFunction: ts << "none"; break;
- case PlatformCAAnimation::RotateX: ts << "rotateX"; break;
- case PlatformCAAnimation::RotateY: ts << "rotateY"; break;
- case PlatformCAAnimation::RotateZ: ts << "rotateX"; break;
- case PlatformCAAnimation::ScaleX: ts << "scaleX"; break;
- case PlatformCAAnimation::ScaleY: ts << "scaleY"; break;
- case PlatformCAAnimation::ScaleZ: ts << "scaleX"; break;
- case PlatformCAAnimation::Scale: ts << "scale"; break;
- case PlatformCAAnimation::TranslateX: ts << "translateX"; break;
- case PlatformCAAnimation::TranslateY: ts << "translateY"; break;
- case PlatformCAAnimation::TranslateZ: ts << "translateZ"; break;
- case PlatformCAAnimation::Translate: ts << "translate"; break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const PlatformCAAnimationRemote::KeyframeValue& value)
-{
- RemoteLayerTreeTextStream& ts = *this;
-
- switch (value.keyframeType()) {
- case PlatformCAAnimationRemote::KeyframeValue::NumberKeyType:
- ts << "number=" << value.numberValue();
- break;
- case PlatformCAAnimationRemote::KeyframeValue::ColorKeyType:
- ts << "color=";
- ts << value.colorValue();
- break;
- case PlatformCAAnimationRemote::KeyframeValue::PointKeyType:
- ts << "point=";
- ts << value.pointValue();
- break;
- case PlatformCAAnimationRemote::KeyframeValue::TransformKeyType:
- ts << "transform=";
- ts << value.transformValue();
- break;
- case PlatformCAAnimationRemote::KeyframeValue::FilterKeyType:
- ts << "filter=";
- if (value.filterValue())
- ts << *value.filterValue();
- else
- ts << "null";
- break;
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const TimingFunction& timingFunction)
-{
- RemoteLayerTreeTextStream& ts = *this;
- switch (timingFunction.type()) {
- case TimingFunction::LinearFunction:
- ts << "linear";
- break;
- case TimingFunction::CubicBezierFunction: {
- const CubicBezierTimingFunction& cubicBezierFunction = static_cast<const CubicBezierTimingFunction&>(timingFunction);
- ts << "cubic-bezier(" << cubicBezierFunction.x1() << ", " << cubicBezierFunction.y1() << ", " << cubicBezierFunction.x2() << ", " << cubicBezierFunction.y2() << ")";
- break;
- }
- case TimingFunction::StepsFunction: {
- const StepsTimingFunction& stepsFunction = static_cast<const StepsTimingFunction&>(timingFunction);
- ts << "steps(" << stepsFunction.numberOfSteps() << ", " << (stepsFunction.stepAtStart() ? "start" : "end") << ")";
- break;
- }
- }
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const PlatformCAAnimationRemote::Properties& animation)
-{
- RemoteLayerTreeTextStream& ts = *this;
-
- ts << "type=";
- ts << animation.animationType;
- ts << " keyPath=";
- ts << animation.keyPath;
-
- if (animation.beginTime)
- dumpProperty(ts, "beginTime", animation.beginTime);
-
- if (animation.duration)
- dumpProperty(ts, "duration", animation.duration);
-
- if (animation.timeOffset)
- dumpProperty(ts, "timeOffset", animation.timeOffset);
-
- dumpProperty(ts, "repeatCount", animation.repeatCount);
-
- if (animation.speed != 1)
- dumpProperty(ts, "speed", animation.speed);
-
- dumpProperty(ts, "fillMode", animation.fillMode);
- dumpProperty(ts, "valueFunction", animation.valueFunction);
-
- if (animation.autoReverses)
- dumpProperty(ts, "autoReverses", animation.autoReverses);
-
- if (!animation.removedOnCompletion)
- dumpProperty(ts, "removedOnCompletion", animation.removedOnCompletion);
-
- if (animation.additive)
- dumpProperty(ts, "additive", animation.additive);
-
- if (animation.reverseTimingFunctions)
- dumpProperty(ts, "reverseTimingFunctions", animation.reverseTimingFunctions);
-
- if (animation.hasExplicitBeginTime)
- dumpProperty(ts, "hasExplicitBeginTime", animation.hasExplicitBeginTime);
-
- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(" << "keyframes";
- ts.increaseIndent();
-
- size_t maxFrames = std::max(animation.keyValues.size(), animation.keyTimes.size());
- maxFrames = std::max(maxFrames, animation.timingFunctions.size());
-
- for (size_t i = 0; i < maxFrames; ++i) {
- ts << "\n";
- ts.writeIndent();
- ts << "(keyframe " << unsigned(i);
- if (i < animation.keyTimes.size())
- dumpProperty(ts, "time", animation.keyTimes[i]);
-
- if (i < animation.timingFunctions.size() && animation.timingFunctions[i])
- dumpProperty<const TimingFunction&>(ts, "timing function", *animation.timingFunctions[i]);
-
- if (i < animation.keyValues.size())
- dumpProperty(ts, "value", animation.keyValues[i]);
-
- ts << ")";
- }
-
- ts.decreaseIndent();
- ts.decreaseIndent();
-
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(FloatPoint3D point)
-{
- RemoteLayerTreeTextStream& ts = *this;
- ts << point.x() << " " << point.y() << " " << point.z();
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(Color color)
-{
- RemoteLayerTreeTextStream& ts = *this;
- ts << color.serialized();
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const Vector<GraphicsLayer::PlatformLayerID>& layers)
-{
- RemoteLayerTreeTextStream& ts = *this;
-
- for (size_t i = 0; i < layers.size(); ++i) {
- if (i)
- ts << " ";
- ts << layers[i];
- }
-
- return ts;
-}
-
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const RemoteLayerBackingStore& backingStore)
-{
- RemoteLayerTreeTextStream& ts = *this;
</del><span class="cx"> ts << backingStore.size();
</span><span class="cx"> ts << " scale=" << backingStore.scale();
</span><span class="cx"> if (backingStore.isOpaque())
</span><span class="lines">@@ -1083,20 +658,13 @@
</span><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeTextStream::writeIndent()
</del><ins>+static void dumpChangedLayers(TextStream& ts, const RemoteLayerTreeTransaction::LayerPropertiesMap& changedLayerProperties)
</ins><span class="cx"> {
</span><del>- for (int i = 0; i < m_indent; ++i)
- *this << " ";
-}
-
-static void dumpChangedLayers(RemoteLayerTreeTextStream& ts, const RemoteLayerTreeTransaction::LayerPropertiesMap& changedLayerProperties)
-{
</del><span class="cx"> if (changedLayerProperties.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ts << "\n";
- ts.writeIndent();
- ts << "(changed-layers";
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << "changed-layers";
</ins><span class="cx">
</span><span class="cx"> // Dump the layer properties sorted by layer ID.
</span><span class="cx"> Vector<GraphicsLayer::PlatformLayerID> layerIDs;
</span><span class="lines">@@ -1106,125 +674,117 @@
</span><span class="cx"> for (auto& layerID : layerIDs) {
</span><span class="cx"> const RemoteLayerTreeTransaction::LayerProperties& layerProperties = *changedLayerProperties.get(layerID);
</span><span class="cx">
</span><del>- ts << "\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(layer " << layerID;
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << "layer " << layerID;
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::NameChanged)
</span><del>- dumpProperty(ts, "name", layerProperties.name);
</del><ins>+ ts.dumpProperty("name", layerProperties.name);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ChildrenChanged)
</span><del>- dumpProperty<Vector<GraphicsLayer::PlatformLayerID>>(ts, "children", layerProperties.children);
</del><ins>+ ts.dumpProperty<Vector<GraphicsLayer::PlatformLayerID>>("children", layerProperties.children);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::PositionChanged)
</span><del>- dumpProperty(ts, "position", layerProperties.position);
</del><ins>+ ts.dumpProperty("position", layerProperties.position);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BoundsChanged)
</span><del>- dumpProperty(ts, "bounds", layerProperties.bounds);
</del><ins>+ ts.dumpProperty("bounds", layerProperties.bounds);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::AnchorPointChanged)
</span><del>- dumpProperty(ts, "anchorPoint", layerProperties.anchorPoint);
</del><ins>+ ts.dumpProperty("anchorPoint", layerProperties.anchorPoint);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BackgroundColorChanged)
</span><del>- dumpProperty(ts, "backgroundColor", layerProperties.backgroundColor);
</del><ins>+ ts.dumpProperty("backgroundColor", layerProperties.backgroundColor);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BorderColorChanged)
</span><del>- dumpProperty(ts, "borderColor", layerProperties.borderColor);
</del><ins>+ ts.dumpProperty("borderColor", layerProperties.borderColor);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BorderWidthChanged)
</span><del>- dumpProperty(ts, "borderWidth", layerProperties.borderWidth);
</del><ins>+ ts.dumpProperty("borderWidth", layerProperties.borderWidth);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::OpacityChanged)
</span><del>- dumpProperty(ts, "opacity", layerProperties.opacity);
</del><ins>+ ts.dumpProperty("opacity", layerProperties.opacity);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::TransformChanged)
</span><del>- dumpProperty(ts, "transform", layerProperties.transform ? *layerProperties.transform : TransformationMatrix());
</del><ins>+ ts.dumpProperty("transform", layerProperties.transform ? *layerProperties.transform : TransformationMatrix());
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::SublayerTransformChanged)
</span><del>- dumpProperty(ts, "sublayerTransform", layerProperties.sublayerTransform ? *layerProperties.sublayerTransform : TransformationMatrix());
</del><ins>+ ts.dumpProperty("sublayerTransform", layerProperties.sublayerTransform ? *layerProperties.sublayerTransform : TransformationMatrix());
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::HiddenChanged)
</span><del>- dumpProperty(ts, "hidden", layerProperties.hidden);
</del><ins>+ ts.dumpProperty("hidden", layerProperties.hidden);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::GeometryFlippedChanged)
</span><del>- dumpProperty(ts, "geometryFlipped", layerProperties.geometryFlipped);
</del><ins>+ ts.dumpProperty("geometryFlipped", layerProperties.geometryFlipped);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::DoubleSidedChanged)
</span><del>- dumpProperty(ts, "doubleSided", layerProperties.doubleSided);
</del><ins>+ ts.dumpProperty("doubleSided", layerProperties.doubleSided);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::MasksToBoundsChanged)
</span><del>- dumpProperty(ts, "masksToBounds", layerProperties.masksToBounds);
</del><ins>+ ts.dumpProperty("masksToBounds", layerProperties.masksToBounds);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::OpaqueChanged)
</span><del>- dumpProperty(ts, "opaque", layerProperties.opaque);
</del><ins>+ ts.dumpProperty("opaque", layerProperties.opaque);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::MaskLayerChanged)
</span><del>- dumpProperty(ts, "maskLayer", layerProperties.maskLayerID);
</del><ins>+ ts.dumpProperty("maskLayer", layerProperties.maskLayerID);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ClonedContentsChanged)
</span><del>- dumpProperty(ts, "clonedLayer", layerProperties.clonedLayerID);
</del><ins>+ ts.dumpProperty("clonedLayer", layerProperties.clonedLayerID);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ContentsRectChanged)
</span><del>- dumpProperty(ts, "contentsRect", layerProperties.contentsRect);
</del><ins>+ ts.dumpProperty("contentsRect", layerProperties.contentsRect);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ContentsScaleChanged)
</span><del>- dumpProperty(ts, "contentsScale", layerProperties.contentsScale);
</del><ins>+ ts.dumpProperty("contentsScale", layerProperties.contentsScale);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CornerRadiusChanged)
</span><del>- dumpProperty(ts, "cornerRadius", layerProperties.cornerRadius);
</del><ins>+ ts.dumpProperty("cornerRadius", layerProperties.cornerRadius);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::ShapeRoundedRectChanged)
</span><del>- dumpProperty(ts, "shapeRect", layerProperties.shapeRoundedRect ? *layerProperties.shapeRoundedRect : FloatRoundedRect());
</del><ins>+ ts.dumpProperty("shapeRect", layerProperties.shapeRoundedRect ? *layerProperties.shapeRoundedRect : FloatRoundedRect());
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::MinificationFilterChanged)
</span><del>- dumpProperty(ts, "minificationFilter", layerProperties.minificationFilter);
</del><ins>+ ts.dumpProperty("minificationFilter", layerProperties.minificationFilter);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::MagnificationFilterChanged)
</span><del>- dumpProperty(ts, "magnificationFilter", layerProperties.magnificationFilter);
</del><ins>+ ts.dumpProperty("magnificationFilter", layerProperties.magnificationFilter);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BlendModeChanged)
</span><del>- dumpProperty(ts, "blendMode", layerProperties.blendMode);
</del><ins>+ ts.dumpProperty("blendMode", layerProperties.blendMode);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::SpeedChanged)
</span><del>- dumpProperty(ts, "speed", layerProperties.speed);
</del><ins>+ ts.dumpProperty("speed", layerProperties.speed);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::TimeOffsetChanged)
</span><del>- dumpProperty(ts, "timeOffset", layerProperties.timeOffset);
</del><ins>+ ts.dumpProperty("timeOffset", layerProperties.timeOffset);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BackingStoreChanged) {
</span><span class="cx"> if (const RemoteLayerBackingStore* backingStore = layerProperties.backingStore.get())
</span><del>- dumpProperty<const RemoteLayerBackingStore&>(ts, "backingStore", *backingStore);
</del><ins>+ ts.dumpProperty<const RemoteLayerBackingStore&>("backingStore", *backingStore);
</ins><span class="cx"> else
</span><del>- dumpProperty(ts, "backingStore", "removed");
</del><ins>+ ts.dumpProperty("backingStore", "removed");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::BackingStoreAttachmentChanged)
</span><del>- dumpProperty(ts, "backingStoreAttached", layerProperties.backingStoreAttached);
</del><ins>+ ts.dumpProperty("backingStoreAttached", layerProperties.backingStoreAttached);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::FiltersChanged)
</span><del>- dumpProperty(ts, "filters", layerProperties.filters ? *layerProperties.filters : FilterOperations());
</del><ins>+ ts.dumpProperty("filters", layerProperties.filters ? *layerProperties.filters : FilterOperations());
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::AnimationsChanged) {
</span><span class="cx"> for (const auto& keyAnimationPair : layerProperties.addedAnimations)
</span><del>- dumpProperty(ts, "animation " + keyAnimationPair.first, keyAnimationPair.second);
</del><ins>+ ts.dumpProperty("animation " + keyAnimationPair.first, keyAnimationPair.second);
</ins><span class="cx">
</span><span class="cx"> for (const auto& name : layerProperties.keyPathsOfAnimationsToRemove)
</span><del>- dumpProperty(ts, "removed animation", name);
</del><ins>+ ts.dumpProperty("removed animation", name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::EdgeAntialiasingMaskChanged)
</span><del>- dumpProperty(ts, "edgeAntialiasingMask", layerProperties.edgeAntialiasingMask);
</del><ins>+ ts.dumpProperty("edgeAntialiasingMask", layerProperties.edgeAntialiasingMask);
</ins><span class="cx">
</span><span class="cx"> if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomAppearanceChanged)
</span><del>- dumpProperty(ts, "customAppearance", layerProperties.customAppearance);
-
- ts << ")";
-
- ts.decreaseIndent();
</del><ins>+ ts.dumpProperty("customAppearance", layerProperties.customAppearance);
</ins><span class="cx"> }
</span><del>-
- ts.decreaseIndent();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeTransaction::dump() const
</span><span class="lines">@@ -1234,92 +794,49 @@
</span><span class="cx">
</span><span class="cx"> CString RemoteLayerTreeTransaction::description() const
</span><span class="cx"> {
</span><del>- RemoteLayerTreeTextStream ts;
</del><ins>+ TextStream ts;
</ins><span class="cx">
</span><del>- ts << "(";
- dumpProperty(ts, "transactionID", m_transactionID);
- dumpProperty(ts, "contentsSize", m_contentsSize);
</del><ins>+ ts.startGroup();
+ ts << "layer tree";
+
+ ts.dumpProperty("transactionID", m_transactionID);
+ ts.dumpProperty("contentsSize", m_contentsSize);
</ins><span class="cx"> if (m_scrollOrigin != IntPoint::zero())
</span><del>- dumpProperty(ts, "scrollOrigin", m_scrollOrigin);
</del><ins>+ ts.dumpProperty("scrollOrigin", m_scrollOrigin);
</ins><span class="cx">
</span><span class="cx"> if (m_pageScaleFactor != 1)
</span><del>- dumpProperty(ts, "pageScaleFactor", m_pageScaleFactor);
</del><ins>+ ts.dumpProperty("pageScaleFactor", m_pageScaleFactor);
</ins><span class="cx">
</span><del>- ts << "(\n";
- ts.increaseIndent();
- ts.writeIndent();
- ts << "(root-layer " << m_rootLayerID << ")";
</del><ins>+ ts << "root-layer " << m_rootLayerID << ")";
</ins><span class="cx">
</span><span class="cx"> if (!m_createdLayers.isEmpty()) {
</span><del>- ts << "\n";
- ts.writeIndent();
- ts << "(created-layers";
- ts.increaseIndent();
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << "created-layers";
</ins><span class="cx"> for (const auto& createdLayer : m_createdLayers) {
</span><del>- ts << "\n";
- ts.writeIndent();
- ts << "(";
</del><ins>+ TextStream::GroupScope group(ts);
+ ts << createdLayer.type <<" " << createdLayer.layerID;
</ins><span class="cx"> switch (createdLayer.type) {
</span><del>- case PlatformCALayer::LayerTypeLayer:
- case PlatformCALayer::LayerTypeWebLayer:
- case PlatformCALayer::LayerTypeSimpleLayer:
- ts << "layer";
- break;
- case PlatformCALayer::LayerTypeTransformLayer:
- ts << "transform-layer";
- break;
- case PlatformCALayer::LayerTypeWebTiledLayer:
- ts << "tiled-layer";
- break;
- case PlatformCALayer::LayerTypeTiledBackingLayer:
- ts << "tiled-backing-layer";
- break;
- case PlatformCALayer::LayerTypePageTiledBackingLayer:
- ts << "page-tiled-backing-layer";
- break;
- case PlatformCALayer::LayerTypeTiledBackingTileLayer:
- ts << "tiled-backing-tile";
- break;
- case PlatformCALayer::LayerTypeRootLayer:
- ts << "root-layer";
- break;
- case PlatformCALayer::LayerTypeBackdropLayer:
- ts << "backdrop-layer";
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeAVPlayerLayer:
</span><del>- ts << "av-player-layer (context-id " << createdLayer.hostingContextID << ")";
</del><ins>+ ts << " (context-id " << createdLayer.hostingContextID << ")";
</ins><span class="cx"> break;
</span><span class="cx"> case PlatformCALayer::LayerTypeWebGLLayer:
</span><del>- ts << "web-gl-layer (context-id " << createdLayer.hostingContextID << ")";
</del><ins>+ ts << " (context-id " << createdLayer.hostingContextID << ")";
</ins><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeShapeLayer:
- ts << "shape-layer";
- break;
- case PlatformCALayer::LayerTypeScrollingLayer:
- ts << "scrolling-layer";
- break;
</del><span class="cx"> case PlatformCALayer::LayerTypeCustom:
</span><del>- ts << "custom-layer (context-id " << createdLayer.hostingContextID << ")";
</del><ins>+ ts << " (context-id " << createdLayer.hostingContextID << ")";
</ins><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeLightSystemBackdropLayer:
- ts << "light-system-backdrop-layer";
</del><ins>+ default:
</ins><span class="cx"> break;
</span><del>- case PlatformCALayer::LayerTypeDarkSystemBackdropLayer:
- ts << "dark-system-backdrop-layer";
- break;
</del><span class="cx"> }
</span><del>- ts << " " << createdLayer.layerID << ")";
</del><span class="cx"> }
</span><del>- ts << ")";
- ts.decreaseIndent();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> dumpChangedLayers(ts, m_changedLayerProperties);
</span><span class="cx">
</span><span class="cx"> if (!m_destroyedLayerIDs.isEmpty())
</span><del>- dumpProperty<Vector<GraphicsLayer::PlatformLayerID>>(ts, "destroyed-layers", m_destroyedLayerIDs);
</del><ins>+ ts.dumpProperty<Vector<GraphicsLayer::PlatformLayerID>>("destroyed-layers", m_destroyedLayerIDs);
</ins><span class="cx">
</span><del>- ts << ")\n";
</del><ins>+ ts.endGroup();
</ins><span class="cx">
</span><span class="cx"> return ts.release().utf8();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -35,6 +35,10 @@
</span><span class="cx"> class ArgumentDecoder;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+namespace WebCore {
+class TextStream;
+};
+
</ins><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -297,6 +301,9 @@
</span><span class="cx"> Properties m_properties;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebCore::TextStream& operator<<(WebCore::TextStream&, const PlatformCAAnimationRemote::KeyframeValue&);
+WebCore::TextStream& operator<<(WebCore::TextStream&, const PlatformCAAnimationRemote::Properties&);
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CAANIMATION(WebKit::PlatformCAAnimationRemote, isPlatformCAAnimationRemote())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCAAnimationRemotemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm (191242 => 191243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2015-10-17 18:04:58 UTC (rev 191242)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm 2015-10-17 18:34:19 UTC (rev 191243)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import <WebCore/GraphicsLayer.h>
</span><span class="cx"> #import <WebCore/PlatformCAAnimationCocoa.h>
</span><span class="cx"> #import <WebCore/PlatformCAFilters.h>
</span><ins>+#import <WebCore/TextStream.h>
</ins><span class="cx"> #import <WebCore/TimingFunction.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="lines">@@ -798,4 +799,103 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&ts, const PlatformCAAnimationRemote::KeyframeValue& value)
+{
+ switch (value.keyframeType()) {
+ case PlatformCAAnimationRemote::KeyframeValue::NumberKeyType:
+ ts << "number=" << value.numberValue();
+ break;
+ case PlatformCAAnimationRemote::KeyframeValue::ColorKeyType:
+ ts << "color=";
+ ts << value.colorValue();
+ break;
+ case PlatformCAAnimationRemote::KeyframeValue::PointKeyType:
+ ts << "point=";
+ ts << value.pointValue();
+ break;
+ case PlatformCAAnimationRemote::KeyframeValue::TransformKeyType:
+ ts << "transform=";
+ ts << value.transformValue();
+ break;
+ case PlatformCAAnimationRemote::KeyframeValue::FilterKeyType:
+ ts << "filter=";
+ if (value.filterValue())
+ ts << *value.filterValue();
+ else
+ ts << "null";
+ break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const PlatformCAAnimationRemote::Properties& animation)
+{
+ ts << "type=";
+ ts << animation.animationType;
+ ts << " keyPath=";
+ ts << animation.keyPath;
+
+ if (animation.beginTime)
+ ts.dumpProperty("beginTime", animation.beginTime);
+
+ if (animation.duration)
+ ts.dumpProperty("duration", animation.duration);
+
+ if (animation.timeOffset)
+ ts.dumpProperty("timeOffset", animation.timeOffset);
+
+ ts.dumpProperty("repeatCount", animation.repeatCount);
+
+ if (animation.speed != 1)
+ ts.dumpProperty("speed", animation.speed);
+
+ ts.dumpProperty("fillMode", animation.fillMode);
+ ts.dumpProperty("valueFunction", animation.valueFunction);
+
+ if (animation.autoReverses)
+ ts.dumpProperty("autoReverses", animation.autoReverses);
+
+ if (!animation.removedOnCompletion)
+ ts.dumpProperty("removedOnCompletion", animation.removedOnCompletion);
+
+ if (animation.additive)
+ ts.dumpProperty("additive", animation.additive);
+
+ if (animation.reverseTimingFunctions)
+ ts.dumpProperty("reverseTimingFunctions", animation.reverseTimingFunctions);
+
+ if (animation.hasExplicitBeginTime)
+ ts.dumpProperty("hasExplicitBeginTime", animation.hasExplicitBeginTime);
+
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(" << "keyframes";
+ ts.increaseIndent();
+
+ size_t maxFrames = std::max(animation.keyValues.size(), animation.keyTimes.size());
+ maxFrames = std::max(maxFrames, animation.timingFunctions.size());
+
+ for (size_t i = 0; i < maxFrames; ++i) {
+ ts << "\n";
+ ts.writeIndent();
+ ts << "(keyframe " << unsigned(i);
+ if (i < animation.keyTimes.size())
+ ts.dumpProperty("time", animation.keyTimes[i]);
+
+ if (i < animation.timingFunctions.size() && animation.timingFunctions[i])
+ ts.dumpProperty<const TimingFunction&>("timing function", *animation.timingFunctions[i]);
+
+ if (i < animation.keyValues.size())
+ ts.dumpProperty("value", animation.keyValues[i]);
+
+ ts << ")";
+ }
+
+ ts.decreaseIndent();
+ ts.decreaseIndent();
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>