Changeset 266980 in webkit

Timestamp:

Sep 12, 2020 3:02:54 PM (4 years ago)

Author:

Simon Fraser

Message:

Convert TextStream::FormattingFlags to an OptionSet<>
​https://bugs.webkit.org/show_bug.cgi?id=216443

Reviewed by Darin Adler.
Source/WebCore:

Use an OptionSet<> for FormattingFlags.

• rendering/RenderTreeAsText.cpp:

(WebCore::externalRepresentation):
(WebCore::counterValueForElement):

Source/WTF:

Use an OptionSet<> for FormattingFlags.

• wtf/text/TextStream.h:

(WTF::TextStream::TextStream):
(WTF::TextStream::formattingFlags const):
(WTF::TextStream::setFormattingFlags):
(WTF::TextStream::hasFormattingFlag const):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/TextStream.h (modified) (4 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTreeAsText.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2020-09-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert TextStream::FormattingFlags to an OptionSet<>
+        https://bugs.webkit.org/show_bug.cgi?id=216443
+
+        Reviewed by Darin Adler.
+
+        Use an OptionSet<> for FormattingFlags.
+
+        * wtf/text/TextStream.h:
+        (WTF::TextStream::TextStream):
+        (WTF::TextStream::formattingFlags const):
+        (WTF::TextStream::setFormattingFlags):
+        (WTF::TextStream::hasFormattingFlag const):
+
 2020-09-11  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WTF/wtf/text/TextStream.h

@@ -28 +28 @@
 #include <wtf/Forward.h>
 #include <wtf/Markable.h>
+#include <wtf/OptionSet.h>
 #include <wtf/Optional.h>
 #include <wtf/WeakPtr.h>
@@ -45 +46 @@
     };
     
-    enum Formatting {
+    enum class Formatting : uint8_t {
         SVGStyleRect                = 1 << 0, // "at (0,0) size 10x10"
         NumberRespectingIntegers    = 1 << 1,
         LayoutUnitsAsIntegers       = 1 << 2,
     };
-    
-    using FormattingFlags = unsigned;
-    
+
     enum class LineMode { SingleLine, MultipleLine };
-    TextStream(LineMode lineMode = LineMode::MultipleLine, FormattingFlags formattingFlags = 0)
+    TextStream(LineMode lineMode = LineMode::MultipleLine, OptionSet<Formatting> formattingFlags = { })
         : m_formattingFlags(formattingFlags)
         , m_multiLineMode(lineMode == LineMode::MultipleLine)
@@ -81 +80 @@
 #endif
 
-    FormattingFlags formattingFlags() const { return m_formattingFlags; }
-    void setFormattingFlags(FormattingFlags flags) { m_formattingFlags = flags; }
-
-    bool hasFormattingFlag(Formatting flag) const { return m_formattingFlags & flag; }
+    OptionSet<Formatting> formattingFlags() const { return m_formattingFlags; }
+    void setFormattingFlags(OptionSet<Formatting> flags) { m_formattingFlags = flags; }
+
+    bool hasFormattingFlag(Formatting flag) const { return m_formattingFlags.contains(flag); }
 
     template<typename T>
@@ -167 +166 @@
 private:
     StringBuilder m_text;
-    FormattingFlags m_formattingFlags { 0 };
     int m_indent { 0 };
+    OptionSet<Formatting> m_formattingFlags;
     bool m_multiLineMode { true };
 };

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Convert TextStream::FormattingFlags to an OptionSet<>
+        https://bugs.webkit.org/show_bug.cgi?id=216443
+
+        Reviewed by Darin Adler.
+        
+        Use an OptionSet<> for FormattingFlags.
+
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::externalRepresentation):
+        (WebCore::counterValueForElement):
+
 2020-09-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -806 +806 @@
 static String externalRepresentation(RenderBox& renderer, OptionSet<RenderAsTextFlag> behavior)
 {
-    TextStream ts(TextStream::LineMode::MultipleLine, TextStream::Formatting::SVGStyleRect | TextStream::Formatting::LayoutUnitsAsIntegers);
+    TextStream ts(TextStream::LineMode::MultipleLine, { TextStream::Formatting::SVGStyleRect, TextStream::Formatting::LayoutUnitsAsIntegers });
     if (!renderer.hasLayer())
         return ts.release();
@@ -882 +882 @@
     RefPtr<Element> elementRef(element);
     element->document().updateLayout();
-    TextStream stream(TextStream::LineMode::MultipleLine, TextStream::Formatting::SVGStyleRect | TextStream::Formatting::LayoutUnitsAsIntegers);
+    TextStream stream(TextStream::LineMode::MultipleLine, { TextStream::Formatting::SVGStyleRect, TextStream::Formatting::LayoutUnitsAsIntegers });
     bool isFirstCounter = true;
     // The counter renderers should be children of :before or :after pseudo-elements.