Changeset 245370 in webkit

Timestamp:

May 15, 2019, 7:51:12 PM (6 years ago)

Author:

Simon Fraser

Message:

Make LayerOverlapMap able to output to a TextStream
​https://bugs.webkit.org/show_bug.cgi?id=197923

Reviewed by Zalan Bujtas.

Make it possible output LayerOverlapMap to a TextStream for logging.

• rendering/LayerOverlapMap.cpp:

(WebCore::OverlapMapContainer::rectList const):
(WebCore::operator<<):

• rendering/LayerOverlapMap.h:

(WebCore::LayerOverlapMap::overlapStack const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayerOverlapMap.cpp (modified) (3 diffs)
• rendering/LayerOverlapMap.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ -69 +69 @@
         * loader/PingLoader.cpp:
         (WebCore::PingLoader::sendPing):
+
+2019-05-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Make LayerOverlapMap able to output to a TextStream
+        https://bugs.webkit.org/show_bug.cgi?id=197923
+
+        Reviewed by Zalan Bujtas.
+
+        Make it possible output LayerOverlapMap to a TextStream for logging.
+
+        * rendering/LayerOverlapMap.cpp:
+        (WebCore::OverlapMapContainer::rectList const):
+        (WebCore::operator<<):
+        * rendering/LayerOverlapMap.h:
+        (WebCore::LayerOverlapMap::overlapStack const):
 
 2019-05-15  Youenn Fablet  <youenn@apple.com>

trunk/Source/WebCore/rendering/LayerOverlapMap.cpp

@@ -26 +26 @@
 #include "config.h"
 #include "LayerOverlapMap.h"
+#include <wtf/text/TextStream.h>
 
 namespace WebCore {
@@ -74 +75 @@
         m_rectList.append(otherContainer.m_rectList);
     }
+    
+    const RectList& rectList() const { return m_rectList; }
 
 private:
@@ -116 +119 @@
 }
 
+static TextStream& operator<<(TextStream& ts, const RectList& rectList)
+{
+    ts << "bounds " << rectList.boundingRect << " (" << rectList.rects << " rects)";
+    return ts;
+}
+
+static TextStream& operator<<(TextStream& ts, const OverlapMapContainer& container)
+{
+    ts << container.rectList();
+    return ts;
+}
+
+TextStream& operator<<(TextStream& ts, const LayerOverlapMap& overlapMap)
+{
+    TextStream multilineStream;
+
+    TextStream::GroupScope scope(ts);
+    multilineStream << indent << "LayerOverlapMap\n";
+
+    for (auto& container : overlapMap.overlapStack())
+        multilineStream << "  " << *container << "\n";
+
+    ts << multilineStream.release();
+    return ts;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/LayerOverlapMap.h

@@ -29 +29 @@
 #include "RenderGeometryMap.h"
 
+namespace WTF {
+class TextStream;
+}
+
 namespace WebCore {
 
@@ -49 +53 @@
     RenderGeometryMap& geometryMap() { return m_geometryMap; }
 
+    const Vector<std::unique_ptr<OverlapMapContainer>>& overlapStack() const { return m_overlapStack; }
+
 private:
     Vector<std::unique_ptr<OverlapMapContainer>> m_overlapStack;
@@ -55 +61 @@
 };
 
+TextStream& operator<<(TextStream&, const LayerOverlapMap&);
+
 } // namespace WebCore