Changeset 106291 in webkit

Timestamp:

Jan 30, 2012 2:54:38 PM (12 years ago)

Author:

leviw@chromium.org

Message:

!m_insideRegionPaint assertion in RenderRegion.cpp is invalid
​https://bugs.webkit.org/show_bug.cgi?id=77372

Reviewed by David Hyatt.

Removing the !m_insideRegionPaint assertion that's in three functions in
RenderRegion. It's triggering in numerous layout tests and isn't valid.

No new tests as this just removes assertions.

• rendering/RenderRegion.cpp:

(WebCore::RenderRegion::setRenderBoxRegionInfo):
(WebCore::RenderRegion::takeRenderBoxRegionInfo):
(WebCore::RenderRegion::removeRenderBoxRegionInfo):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-30  Levi Weintraub  <leviw@chromium.org>
+
+        !m_insideRegionPaint assertion in RenderRegion.cpp is invalid
+        https://bugs.webkit.org/show_bug.cgi?id=77372
+
+        Reviewed by David Hyatt.
+
+        Removing the !m_insideRegionPaint assertion that's in three functions in
+        RenderRegion. It's triggering in numerous layout tests and isn't valid.
+
+        No new tests as this just removes assertions.
+
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::setRenderBoxRegionInfo):
+        (WebCore::RenderRegion::takeRenderBoxRegionInfo):
+        (WebCore::RenderRegion::removeRenderBoxRegionInfo):
+
 2012-01-30  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderRegion.cpp

@@ -248 +248 @@
         return 0;
 
-#ifndef NDEBUG
-    ASSERT(!m_insideRegionPaint && "RenderBoxRegionInfo should not be modified inside region paint.");
-#endif
-
     OwnPtr<RenderBoxRegionInfo>& boxInfo = m_renderBoxRegionInfo.add(box, nullptr).first->second;
     if (boxInfo)
@@ -263 +259 @@
 PassOwnPtr<RenderBoxRegionInfo> RenderRegion::takeRenderBoxRegionInfo(const RenderBox* box)
 {
-#ifndef NDEBUG
-    ASSERT(!m_insideRegionPaint && "RenderBoxRegionInfo should not be modified inside region paint.");
-#endif
-
     return m_renderBoxRegionInfo.take(box);
 }
@@ -272 +264 @@
 void RenderRegion::removeRenderBoxRegionInfo(const RenderBox* box)
 {
-#ifndef NDEBUG
-    ASSERT(!m_insideRegionPaint && "RenderBoxRegionInfo should not be modified inside region paint.");
-#endif
-
     m_renderBoxRegionInfo.remove(box);
 }