Changeset 167705 in webkit

Timestamp:

Apr 23, 2014 5:30:22 AM (10 years ago)

Author:

abucur@adobe.com

Message:

[CSS Regions] Improve the debugging infrastructure
​https://bugs.webkit.org/show_bug.cgi?id=132042

Reviewed by Mihnea Ovidenie.

This patch improves the debugging code for CSS Regions.

Tests: No function change. No new tests.

• rendering/RenderObject.cpp:

(WebCore::RenderObject::showRegionsInformation): Print brackets around the region range when dumping
the render tree to the console.

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::containingRegion): Convert the ASSERT to an ASSERT_WITH_SECURITY_IMPLICATION.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-23  Andrei Bucur  <abucur@adobe.com>
+
+        [CSS Regions] Improve the debugging infrastructure
+        https://bugs.webkit.org/show_bug.cgi?id=132042
+
+        Reviewed by Mihnea Ovidenie.
+
+        This patch improves the debugging code for CSS Regions.
+
+        Tests: No function change. No new tests.
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::showRegionsInformation): Print brackets around the region range when dumping
+        the render tree to the console.
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::containingRegion): Convert the ASSERT to an ASSERT_WITH_SECURITY_IMPLICATION.
+
 2014-04-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1427 +1427 @@
             RenderRegion* endRegion = nullptr;
             flowThread->getRegionRangeForBox(box, startRegion, endRegion);
-            printedCharacters += fprintf(stderr, " Rs:%p Re:%p", startRegion, endRegion);
+            printedCharacters += fprintf(stderr, " [Rs:%p Re:%p]", startRegion, endRegion);
         }
     }

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -219 +219 @@
 RenderRegion* RootInlineBox::containingRegion() const
 {
+    RenderRegion* region = m_hasContainingRegion ? containingRegionMap().get(this) : nullptr;
+
 #ifndef NDEBUG
     if (m_hasContainingRegion) {
         RenderFlowThread* flowThread = blockFlow().flowThreadContainingBlock();
         const RenderRegionList& regionList = flowThread->renderRegionList();
-        ASSERT(regionList.contains(containingRegionMap().get(this)));
+        ASSERT_WITH_SECURITY_IMPLICATION(regionList.contains(region));
     }
 #endif
-    return m_hasContainingRegion ? containingRegionMap().get(this) : nullptr;
+
+    return region;
 }