Changeset 166715 in webkit

Timestamp:

Apr 3, 2014 6:27:53 AM (10 years ago)

Author:

abucur@adobe.com

Message:

[CSS Regions] Include region range information when printing the render tree
​https://bugs.webkit.org/show_bug.cgi?id=131159

Reviewed by Mihnea Ovidenie.

With this change showRenderObject() will print the region range for objects inside
a flow thread. The format is:
Rs: <startRegion> Re: <endRegion>

Because this can be called anytime during debugging, it's necessary to disable the
current flow thread caching to prevent using the wrong flow thread for an object.

Tests: No new tests, no functional change.

• rendering/RenderFlowThread.cpp:

(WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
(WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):

• rendering/RenderFlowThread.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::showRegionsInformation): Added.
(WebCore::RenderObject::showRenderObject):

• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (2 diffs)
• rendering/RenderFlowThread.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-03  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Include region range information when printing the render tree
+        https://bugs.webkit.org/show_bug.cgi?id=131159
+
+        Reviewed by Mihnea Ovidenie.
+
+        With this change showRenderObject() will print the region range for objects inside
+        a flow thread. The format is:
+        Rs: <startRegion> Re: <endRegion>
+
+        Because this can be called anytime during debugging, it's necessary to disable the
+        current flow thread caching to prevent using the wrong flow thread for an object.
+
+        Tests: No new tests, no functional change.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler):
+        (WebCore::CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::showRegionsInformation): Added.
+        (WebCore::RenderObject::showRenderObject):
+        * rendering/RenderObject.h:
+
 2014-04-03  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -130 +130 @@
     m_regionsInvalidated = true;
 }
-
-class CurrentRenderFlowThreadDisabler {
-    WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
-public:
-    CurrentRenderFlowThreadDisabler(RenderView* view)
-        : m_view(view)
-        , m_renderFlowThread(0)
-    {
-        m_renderFlowThread = m_view->flowThreadController().currentRenderFlowThread();
-        if (m_renderFlowThread)
-            view->flowThreadController().setCurrentRenderFlowThread(0);
-    }
-    ~CurrentRenderFlowThreadDisabler()
-    {
-        if (m_renderFlowThread)
-            m_view->flowThreadController().setCurrentRenderFlowThread(m_renderFlowThread);
-    }
-private:
-    RenderView* m_view;
-    RenderFlowThread* m_renderFlowThread;
-};
 
 void RenderFlowThread::validateRegions()
@@ -1459 +1438 @@
 }
 
+CurrentRenderFlowThreadDisabler::CurrentRenderFlowThreadDisabler(RenderView* view)
+    : m_view(view)
+    , m_renderFlowThread(0)
+{
+    m_renderFlowThread = m_view->flowThreadController().currentRenderFlowThread();
+    if (m_renderFlowThread)
+        view->flowThreadController().setCurrentRenderFlowThread(0);
+}
+
+CurrentRenderFlowThreadDisabler::~CurrentRenderFlowThreadDisabler()
+{
+    if (m_renderFlowThread)
+        m_view->flowThreadController().setCurrentRenderFlowThread(m_renderFlowThread);
+}
+
 
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -349 +349 @@
 };
 
+class CurrentRenderFlowThreadDisabler {
+    WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
+public:
+    CurrentRenderFlowThreadDisabler(RenderView*);
+    ~CurrentRenderFlowThreadDisabler();
+private:
+    RenderView* m_view;
+    RenderFlowThread* m_renderFlowThread;
+};
+
 // This structure is used by PODIntervalTree for debugging.
 #ifndef NDEBUG

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1437 +1437 @@
 }
 
+void RenderObject::showRegionsInformation(int& printedCharacters) const
+{
+    CurrentRenderFlowThreadDisabler flowThreadDisabler(&view());
+
+    if (RenderFlowThread* flowThread = flowThreadContainingBlock()) {
+        const RenderBox* box = isBox() ? toRenderBox(this) : nullptr;
+        if (box) {
+            RenderRegion* startRegion = nullptr;
+            RenderRegion* endRegion = nullptr;
+            flowThread->getRegionRangeForBox(box, startRegion, endRegion);
+            printedCharacters += fprintf(stderr, " Rs:%p Re:%p", startRegion, endRegion);
+        }
+    }
+}
+
 void RenderObject::showRenderObject(int printedCharacters) const
 {
@@ -1447 +1462 @@
 
     printedCharacters += fprintf(stderr, "%s %p", renderName(), this);
+    showRegionsInformation(printedCharacters);
 
     if (node()) {

trunk/Source/WebCore/rendering/RenderObject.h

@@ -278 +278 @@
     // We don't make printedCharacters an optional parameter so that
     // showRenderObject can be called from gdb easily.
-    void showRenderObject(int printedCharacters) const;
-    void showRenderTreeAndMark(const RenderObject* markedObject1 = 0, const char* markedLabel1 = 0, const RenderObject* markedObject2 = 0, const char* markedLabel2 = 0, int depth = 0) const;
+    void showRenderObject(int) const;
+    void showRenderTreeAndMark(const RenderObject* = 0, const char* = 0, const RenderObject* = 0, const char* = 0, int = 0) const;
+    void showRegionsInformation(int&) const;
 #endif