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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@191310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/rendering/style/FillLayer.cpp b/Source/WebCore/rendering/style/FillLayer.cpp
index 4524b00..b1b3208 100644
--- a/Source/WebCore/rendering/style/FillLayer.cpp
+++ b/Source/WebCore/rendering/style/FillLayer.cpp
@@ -22,6 +22,7 @@
#include "config.h"
#include "FillLayer.h"
+#include "TextStream.h"
#include <wtf/PointerComparison.h>
namespace WebCore {
@@ -395,4 +396,41 @@
return !layer1 && !layer2;
}
+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;
+}
+
} // namespace WebCore
diff --git a/Source/WebCore/rendering/style/FillLayer.h b/Source/WebCore/rendering/style/FillLayer.h
index 6ff2b3a..6dd0ade 100644
--- a/Source/WebCore/rendering/style/FillLayer.h
+++ b/Source/WebCore/rendering/style/FillLayer.h
@@ -213,6 +213,9 @@
mutable unsigned m_clipMax : 2; // EFillBox, maximum m_clip value from this to bottom layer
};
+TextStream& operator<<(TextStream&, FillSize);
+TextStream& operator<<(TextStream&, const FillLayer&);
+
} // namespace WebCore
#endif // FillLayer_h
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.cpp b/Source/WebCore/rendering/style/RenderStyleConstants.cpp
new file mode 100644
index 0000000..358e160
--- /dev/null
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.cpp
@@ -0,0 +1,99 @@
+/*
+ * 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
diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
index bbb4caa..b72b3a7 100644
--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
@@ -30,6 +30,8 @@
namespace WebCore {
+class TextStream;
+
static const size_t PrintColorAdjustBits = 1;
enum PrintColorAdjust {
PrintColorAdjustEconomy,
@@ -656,6 +658,13 @@
};
#endif
+TextStream& operator<<(TextStream&, EFillSizeType);
+TextStream& operator<<(TextStream&, EFillAttachment);
+TextStream& operator<<(TextStream&, EFillBox);
+TextStream& operator<<(TextStream&, EFillRepeat);
+TextStream& operator<<(TextStream&, EMaskSourceType);
+TextStream& operator<<(TextStream&, BackgroundEdgeOrigin);
+
} // namespace WebCore
#endif // RenderStyleConstants_h
