<!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>[191310] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191310">191310</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-19 13:07:37 -0700 (Mon, 19 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add TextStream formatters for FillLayer and all it entails
https://bugs.webkit.org/show_bug.cgi?id=150312
Reviewed by Tim Horton.
Add TextStream output formatters for FillLayer, and all the enum
types used by it.
Drive-by fixes for CompositeOperator and BlendMode string conversions.
compositeOperatorNames was missing the "difference" string, and compositeOperatorName()
would do an OOB memory access if blendOp was zero.
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* platform/Length.cpp:
(WebCore::operator<<):
* platform/Length.h:
* platform/LengthSize.cpp: Added.
(WebCore::operator<<):
* platform/LengthSize.h:
* platform/text/TextStream.h:
* rendering/style/FillLayer.cpp:
(WebCore::operator<<):
* rendering/style/FillLayer.h:
* rendering/style/RenderStyleConstants.cpp: Added.
(WebCore::operator<<):
* rendering/style/RenderStyleConstants.h:</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="#trunkSourceWebCoreplatformLengthcpp">trunk/Source/WebCore/platform/Length.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthh">trunk/Source/WebCore/platform/Length.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthSizeh">trunk/Source/WebCore/platform/LengthSize.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="#trunkSourceWebCoreplatformtextTextStreamh">trunk/Source/WebCore/platform/text/TextStream.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleFillLayercpp">trunk/Source/WebCore/rendering/style/FillLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleFillLayerh">trunk/Source/WebCore/rendering/style/FillLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformLengthSizecpp">trunk/Source/WebCore/platform/LengthSize.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantscpp">trunk/Source/WebCore/rendering/style/RenderStyleConstants.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 (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -2110,6 +2110,7 @@
</span><span class="cx"> platform/KillRingNone.cpp
</span><span class="cx"> platform/Language.cpp
</span><span class="cx"> platform/Length.cpp
</span><ins>+ platform/LengthSize.cpp
</ins><span class="cx"> platform/LinkHash.cpp
</span><span class="cx"> platform/Logging.cpp
</span><span class="cx"> platform/MIMETypeRegistry.cpp
</span><span class="lines">@@ -2534,6 +2535,7 @@
</span><span class="cx"> rendering/style/NinePieceImage.cpp
</span><span class="cx"> rendering/style/QuotesData.cpp
</span><span class="cx"> rendering/style/RenderStyle.cpp
</span><ins>+ rendering/style/RenderStyleConstants.cpp
</ins><span class="cx"> rendering/style/SVGRenderStyle.cpp
</span><span class="cx"> rendering/style/SVGRenderStyleDefs.cpp
</span><span class="cx"> rendering/style/ShadowData.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/ChangeLog 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-10-19 Simon Fraser <simon.fraser@apple.com>
+
+ Add TextStream formatters for FillLayer and all it entails
+ https://bugs.webkit.org/show_bug.cgi?id=150312
+
+ Reviewed by Tim Horton.
+
+ Add TextStream output formatters for FillLayer, and all the enum
+ types used by it.
+
+ Drive-by fixes for CompositeOperator and BlendMode string conversions.
+ compositeOperatorNames was missing the "difference" string, and compositeOperatorName()
+ would do an OOB memory access if blendOp was zero.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/Length.cpp:
+ (WebCore::operator<<):
+ * platform/Length.h:
+ * platform/LengthSize.cpp: Added.
+ (WebCore::operator<<):
+ * platform/LengthSize.h:
+ * platform/text/TextStream.h:
+ * rendering/style/FillLayer.cpp:
+ (WebCore::operator<<):
+ * rendering/style/FillLayer.h:
+ * rendering/style/RenderStyleConstants.cpp: Added.
+ (WebCore::operator<<):
+ * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2015-10-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKView being inside WKWebView leads to weird API issues
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -580,6 +580,8 @@
</span><span class="cx"> 0FEA3E84191B31BF000F1B55 /* ScrollingStateOverflowScrollingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEA3E82191B31BF000F1B55 /* ScrollingStateOverflowScrollingNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FEA3E87191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEA3E85191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.cpp */; };
</span><span class="cx"> 0FEA3E88191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEA3E86191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0FEF20CE1BD4A24100128E5D /* LengthSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEF20CD1BD4A24100128E5D /* LengthSize.cpp */; };
+ 0FEF20D01BD4A64F00128E5D /* RenderStyleConstants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEF20CF1BD4A64F00128E5D /* RenderStyleConstants.cpp */; };
</ins><span class="cx"> 0FF5025B102BA9010066F39A /* DOMStyleMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF50259102BA9010066F39A /* DOMStyleMedia.h */; };
</span><span class="cx"> 0FF5025C102BA9010066F39A /* DOMStyleMedia.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FF5025A102BA9010066F39A /* DOMStyleMedia.mm */; };
</span><span class="cx"> 0FF50263102BA92C0066F39A /* DOMStyleMediaInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF50262102BA92B0066F39A /* DOMStyleMediaInternal.h */; };
</span><span class="lines">@@ -7827,6 +7829,8 @@
</span><span class="cx"> 0FEA3E82191B31BF000F1B55 /* ScrollingStateOverflowScrollingNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingStateOverflowScrollingNode.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FEA3E85191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeFrameScrollingNode.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FEA3E86191B3BD7000F1B55 /* ScrollingTreeFrameScrollingNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeFrameScrollingNode.h; sourceTree = "<group>"; };
</span><ins>+ 0FEF20CD1BD4A24100128E5D /* LengthSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LengthSize.cpp; sourceTree = "<group>"; };
+ 0FEF20CF1BD4A64F00128E5D /* RenderStyleConstants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderStyleConstants.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 0FF50259102BA9010066F39A /* DOMStyleMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStyleMedia.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FF5025A102BA9010066F39A /* DOMStyleMedia.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMStyleMedia.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FF50262102BA92B0066F39A /* DOMStyleMediaInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStyleMediaInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22056,6 +22060,7 @@
</span><span class="cx"> 5A574F27131DB96D00471B88 /* QuotesData.h */,
</span><span class="cx"> BC8C8FAB0DDCD31B00B592F4 /* RenderStyle.cpp */,
</span><span class="cx"> BC8C8FAC0DDCD31B00B592F4 /* RenderStyle.h */,
</span><ins>+ 0FEF20CF1BD4A64F00128E5D /* RenderStyleConstants.cpp */,
</ins><span class="cx"> BC5EB6670E81CB7100B25965 /* RenderStyleConstants.h */,
</span><span class="cx"> BC5EB8C10E82031B00B25965 /* ShadowData.cpp */,
</span><span class="cx"> BC5EB8C20E82031B00B25965 /* ShadowData.h */,
</span><span class="lines">@@ -22398,6 +22403,7 @@
</span><span class="cx"> BCE65BE80EACDF16007E4533 /* Length.cpp */,
</span><span class="cx"> BCE65BE90EACDF16007E4533 /* Length.h */,
</span><span class="cx"> BCFF648F0EAD15C200C1D6F7 /* LengthBox.h */,
</span><ins>+ 0FEF20CD1BD4A24100128E5D /* LengthSize.cpp */,
</ins><span class="cx"> BCFF64900EAD15C200C1D6F7 /* LengthSize.h */,
</span><span class="cx"> A7AD2F850EC89D07008AB002 /* LinkHash.cpp */,
</span><span class="cx"> A7AD2F860EC89D07008AB002 /* LinkHash.h */,
</span><span class="lines">@@ -29733,6 +29739,7 @@
</span><span class="cx"> 0705853317FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp in Sources */,
</span><span class="cx"> 0705853517FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp in Sources */,
</span><span class="cx"> E107400D0E77BDC00033AF24 /* JSMessageChannel.cpp in Sources */,
</span><ins>+ 0FEF20CE1BD4A24100128E5D /* LengthSize.cpp in Sources */,
</ins><span class="cx"> E1A5F99B0E7EAA2500AF85EA /* JSMessageChannelCustom.cpp in Sources */,
</span><span class="cx"> 75793EC80D0CE72D007FC0AC /* JSMessageEvent.cpp in Sources */,
</span><span class="cx"> 410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */,
</span><span class="lines">@@ -30475,6 +30482,7 @@
</span><span class="cx"> D302754912A5FE84004BD828 /* RenderDetailsMarker.cpp in Sources */,
</span><span class="cx"> 9B32CDAA13DF7FA900F34D13 /* RenderedPosition.cpp in Sources */,
</span><span class="cx"> E43A023D17EB3713004CDD25 /* RenderElement.cpp in Sources */,
</span><ins>+ 0FEF20D01BD4A64F00128E5D /* RenderStyleConstants.cpp in Sources */,
</ins><span class="cx"> 0F5B7A5410F65D7A00376302 /* RenderEmbeddedObject.cpp in Sources */,
</span><span class="cx"> A8EA73C30A1900E300A8EF5F /* RenderFieldset.cpp in Sources */,
</span><span class="cx"> 066C77300AB603FD00238CC4 /* RenderFileUploadControl.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.cpp (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.cpp 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/Length.cpp 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "Length.h"
</span><span class="cx">
</span><span class="cx"> #include "CalculationValue.h"
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -301,4 +302,54 @@
</span><span class="cx"> };
</span><span class="cx"> COMPILE_ASSERT(sizeof(Length) == sizeof(SameSizeAsLength), length_should_stay_small);
</span><span class="cx">
</span><ins>+static TextStream& operator<<(TextStream& ts, LengthType type)
+{
+ switch (type) {
+ case Auto: ts << "auto"; break;
+ case Relative: ts << "relative"; break;
+ case Percent: ts << "percent"; break;
+ case Fixed: ts << "fixed"; break;
+ case Intrinsic: ts << "intrinsic"; break;
+ case MinIntrinsic: ts << "min-intrinsic"; break;
+ case MinContent: ts << "min-content"; break;
+ case MaxContent: ts << "max-content"; break;
+ case FillAvailable: ts << "fill-available"; break;
+ case FitContent: ts << "fit-content"; break;
+ case Calculated: ts << "calc"; break;
+ case Undefined: ts << "undefined"; break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, Length length)
+{
+ switch (length.type()) {
+ case Auto:
+ case Undefined:
+ ts << length.type();
+ break;
+ case Relative:
+ case Fixed:
+ case Intrinsic:
+ case MinIntrinsic:
+ case MinContent:
+ case MaxContent:
+ case FillAvailable:
+ case FitContent:
+ ts << length.type() << " " << TextStream::FormatNumberRespectingIntegers(length.value());
+ break;
+ case Percent:
+ ts << TextStream::FormatNumberRespectingIntegers(length.percent()) << "%";
+ break;
+ case Calculated:
+ // FIXME: dump CalculationValue.
+ break;
+ }
+
+ if (length.hasQuirk())
+ ts << " has-quirk";
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/Length.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class CalculationValue;
</span><ins>+class TextStream;
</ins><span class="cx">
</span><span class="cx"> struct Length {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -74,7 +75,6 @@
</span><span class="cx"> float value() const;
</span><span class="cx"> int intValue() const;
</span><span class="cx"> float percent() const;
</span><del>- float viewportPercentageLength() const;
</del><span class="cx"> CalculationValue& calculationValue() const;
</span><span class="cx">
</span><span class="cx"> LengthType type() const;
</span><span class="lines">@@ -439,6 +439,8 @@
</span><span class="cx"> return Length(WebCore::blend(fromValue, toValue, progress), resultType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, Length);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // Length_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthSizecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/LengthSize.cpp (0 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LengthSize.cpp (rev 0)
+++ trunk/Source/WebCore/platform/LengthSize.cpp 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "LengthSize.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, const LengthSize& size)
+{
+ return ts << size.width() << " " << size.height();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LengthSize.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LengthSize.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/LengthSize.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx"> Length m_height;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, const LengthSize&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LengthSize_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsTypescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.cpp 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -47,7 +47,8 @@
</span><span class="cx"> "destination-atop",
</span><span class="cx"> "xor",
</span><span class="cx"> "darker",
</span><del>- "lighter"
</del><ins>+ "lighter",
+ "difference"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const char* const blendOperatorNames[] = {
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < numBlendOperatorNames; i++) {
</span><span class="cx"> if (s == blendOperatorNames[i]) {
</span><del>- blendMode = static_cast<BlendMode>(i+1);
</del><ins>+ blendMode = static_cast<BlendMode>(i + BlendModeNormal);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -110,13 +111,20 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(op >= 0);
</span><span class="cx"> ASSERT(op < numCompositeOperatorNames);
</span><del>- ASSERT(blendOp >= 0);
- ASSERT(blendOp <= numBlendOperatorNames);
- if (blendOp != BlendModeNormal)
- return blendOperatorNames[blendOp-1];
</del><ins>+ ASSERT(blendOp >= BlendModeNormal);
+ ASSERT(blendOp < numBlendOperatorNames);
+ if (blendOp > BlendModeNormal)
+ return blendOperatorNames[blendOp - BlendModeNormal];
</ins><span class="cx"> return compositeOperatorNames[op];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String blendModeName(BlendMode blendOp)
+{
+ ASSERT(blendOp >= BlendModeNormal);
+ ASSERT(blendOp <= BlendModePlusLighter);
+ return blendOperatorNames[blendOp - BlendModeNormal];
+}
+
</ins><span class="cx"> bool parseLineCap(const String& s, LineCap& cap)
</span><span class="cx"> {
</span><span class="cx"> if (s == "butt") {
</span><span class="lines">@@ -237,29 +245,14 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, CompositeOperator op)
+{
+ return ts << compositeOperatorName(op, BlendModeNormal);
+}
+
</ins><span class="cx"> TextStream& operator<<(TextStream& ts, BlendMode blendMode)
</span><span class="cx"> {
</span><del>- 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;
</del><ins>+ return ts << blendModeName(blendMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextStream& operator<<(TextStream& ts, WindRule rule)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsTypes.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/graphics/GraphicsTypes.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx">
</span><span class="cx"> class TextStream;
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(TextStream&, BlendMode);
</span><ins>+WEBCORE_EXPORT TextStream& operator<<(TextStream&, CompositeOperator);
</ins><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(TextStream&, WindRule);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineCap);
</span><span class="cx"> WEBCORE_EXPORT TextStream& operator<<(TextStream&, LineJoin);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextStream.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextStream.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/platform/text/TextStream.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> class LayoutRect;
</span><span class="cx"> class LayoutUnit;
</span><span class="cx">
</span><ins>+// FIXME: this should move to platform/
</ins><span class="cx"> class TextStream {
</span><span class="cx"> public:
</span><span class="cx"> struct FormatNumberRespectingIntegers {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleFillLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/FillLayer.cpp (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/FillLayer.cpp 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/rendering/style/FillLayer.cpp 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FillLayer.h"
</span><span class="cx">
</span><ins>+#include "TextStream.h"
</ins><span class="cx"> #include <wtf/PointerComparison.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -395,4 +396,41 @@
</span><span class="cx"> return !layer1 && !layer2;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream& ts, FillSize fillSize)
+{
+ return ts << fillSize.type << " " << fillSize.size;
+}
+
+TextStream& operator<<(TextStream& ts, const FillLayer& layer)
+{
+ TextStream::GroupScope scope(ts);
+ ts << "fill-layer";
+
+ ts.startGroup();
+ ts << "position " << layer.xPosition() << " " << layer.yPosition();
+ ts.endGroup();
+
+ ts.dumpProperty("size", layer.size());
+
+ ts.startGroup();
+ ts << "background-origin " << layer.backgroundXOrigin() << " " << layer.backgroundYOrigin();
+ ts.endGroup();
+
+ ts.startGroup();
+ ts << "repeat " << layer.repeatX() << " " << layer.repeatY();
+ ts.endGroup();
+
+ ts.dumpProperty("clip", layer.clip());
+ ts.dumpProperty("origin", layer.origin());
+
+ ts.dumpProperty("composite", layer.composite());
+ ts.dumpProperty("blend-mode", layer.blendMode());
+ ts.dumpProperty("mask-type", layer.maskSourceType());
+
+ if (layer.next())
+ ts << *layer.next();
+
+ return ts;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleFillLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/FillLayer.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/FillLayer.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/rendering/style/FillLayer.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -213,6 +213,9 @@
</span><span class="cx"> mutable unsigned m_clipMax : 2; // EFillBox, maximum m_clip value from this to bottom layer
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, FillSize);
+TextStream& operator<<(TextStream&, const FillLayer&);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // FillLayer_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantscpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (0 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (rev 0)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -0,0 +1,99 @@
</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 "RenderStyleConstants.h"
+
+#include "TextStream.h"
+
+namespace WebCore {
+
+TextStream& operator<<(TextStream& ts, EFillSizeType sizeType)
+{
+ switch (sizeType) {
+ case Contain: ts << "contain"; break;
+ case Cover: ts << "cover"; break;
+ case SizeLength: ts << "size-length"; break;
+ case SizeNone: ts << "size-none"; break;
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, EFillAttachment attachment)
+{
+ switch (attachment) {
+ case ScrollBackgroundAttachment: ts << "scroll"; break;
+ case LocalBackgroundAttachment: ts << "local"; break;
+ case FixedBackgroundAttachment: ts << "fixed"; break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, EFillBox fill)
+{
+ switch (fill) {
+ case BorderFillBox: ts << "border"; break;
+ case PaddingFillBox: ts << "padding"; break;
+ case ContentFillBox: ts << "content"; break;
+ case TextFillBox: ts << "text"; break;
+ }
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, EFillRepeat repeat)
+{
+ switch (repeat) {
+ case RepeatFill: ts << "repeat"; break;
+ case NoRepeatFill: ts << "no-repeat"; break;
+ case RoundFill: ts << "round"; break;
+ case SpaceFill: ts << "space"; break;
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, EMaskSourceType maskSource)
+{
+ switch (maskSource) {
+ case MaskAlpha: ts << "alpha"; break;
+ case MaskLuminance: ts << "luminance"; break;
+ }
+
+ return ts;
+}
+
+TextStream& operator<<(TextStream& ts, BackgroundEdgeOrigin edge)
+{
+ switch (edge) {
+ case TopEdge: ts << "top"; break;
+ case RightEdge: ts << "right"; break;
+ case BottomEdge: ts << "bottom"; break;
+ case LeftEdge: ts << "left"; break;
+ }
+ return ts;
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (191309 => 191310)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-10-19 19:53:45 UTC (rev 191309)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-10-19 20:07:37 UTC (rev 191310)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class TextStream;
+
</ins><span class="cx"> static const size_t PrintColorAdjustBits = 1;
</span><span class="cx"> enum PrintColorAdjust {
</span><span class="cx"> PrintColorAdjustEconomy,
</span><span class="lines">@@ -656,6 +658,13 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+TextStream& operator<<(TextStream&, EFillSizeType);
+TextStream& operator<<(TextStream&, EFillAttachment);
+TextStream& operator<<(TextStream&, EFillBox);
+TextStream& operator<<(TextStream&, EFillRepeat);
+TextStream& operator<<(TextStream&, EMaskSourceType);
+TextStream& operator<<(TextStream&, BackgroundEdgeOrigin);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RenderStyleConstants_h
</span></span></pre>
</div>
</div>
</body>
</html>