Attachment 369984 Details for Bug 197923 – Patch

[patch] Patch

bug-197923-20190515125225.patch (text/plain), 3.33 KB, created by Simon Fraser (smfr) on 2019-05-15 12:52:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-05-15 12:52:25 PDT

Size: 3.33 KB

patch

obsolete

>Subversion Revision: 245336
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 44db6ae85ba3c10cdab90d6609c2d38296eb15e0..964961e586c2812a44356151e4cf9fddd9c90f57 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         getUserMedia sandbox extensions should not be revoked when a getUserMedia allowed request is being processed
>diff --git a/Source/WebCore/rendering/LayerOverlapMap.cpp b/Source/WebCore/rendering/LayerOverlapMap.cpp
>index 78100c745ed3334a382ff5fa340e0c89f958faf4..31f95508dcdbb5a426d8fe1c3c958beb15d21a1f 100644
>--- a/Source/WebCore/rendering/LayerOverlapMap.cpp
>+++ b/Source/WebCore/rendering/LayerOverlapMap.cpp
>@@ -25,6 +25,7 @@
> 
> #include "config.h"
> #include "LayerOverlapMap.h"
>+#include <wtf/text/TextStream.h>
> 
> namespace WebCore {
> 
>@@ -73,6 +74,8 @@ public:
>     {
>         m_rectList.append(otherContainer.m_rectList);
>     }
>+    
>+    const RectList& rectList() const { return m_rectList; }
> 
> private:
>     RectList m_rectList;
>@@ -115,4 +118,30 @@ void LayerOverlapMap::popCompositingContainer()
>     m_overlapStack.removeLast();
> }
> 
>+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
>diff --git a/Source/WebCore/rendering/LayerOverlapMap.h b/Source/WebCore/rendering/LayerOverlapMap.h
>index 66cfc39458ef10dfeb1bddd1d926a9a4d4001fae..2b40a43bf7acba784959722a5a7ffb17898d87f6 100644
>--- a/Source/WebCore/rendering/LayerOverlapMap.h
>+++ b/Source/WebCore/rendering/LayerOverlapMap.h
>@@ -28,6 +28,10 @@
> #include "LayoutRect.h"
> #include "RenderGeometryMap.h"
> 
>+namespace WTF {
>+class TextStream;
>+}
>+
> namespace WebCore {
> 
> class OverlapMapContainer;
>@@ -48,10 +52,14 @@ public:
>     const RenderGeometryMap& geometryMap() const { return m_geometryMap; }
>     RenderGeometryMap& geometryMap() { return m_geometryMap; }
> 
>+    const Vector<std::unique_ptr<OverlapMapContainer>>& overlapStack() const { return m_overlapStack; }
>+
> private:
>     Vector<std::unique_ptr<OverlapMapContainer>> m_overlapStack;
>     RenderGeometryMap m_geometryMap;
>     bool m_isEmpty { true };
> };
> 
>+TextStream& operator<<(TextStream&, const LayerOverlapMap&);
>+
> } // namespace WebCore

Flags:

zalan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197923: 369984