[CSSRegions]Reduce the cases when the box style in region is computed

https://bugs.webkit.org/show_bug.cgi?id=77446

Reviewed by David Hyatt.

Covered by existing region style tests.

* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::setRegionBoxesRegionStyle):
(WebCore::RenderRegion::restoreRegionBoxesOriginalStyle):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 740be0b..f44375a 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-31  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Reduce the cases when the box style in region is computed
+        https://bugs.webkit.org/show_bug.cgi?id=77446
+
+        Reviewed by David Hyatt.
+
+        Covered by existing region style tests.
+
+        * rendering/RenderRegion.cpp:
+        (WebCore::RenderRegion::setRegionBoxesRegionStyle):
+        (WebCore::RenderRegion::restoreRegionBoxesOriginalStyle):
+
 2012-01-31  Anders Carlsson  <andersca@apple.com>
 
         Put tiles in a HashMap

diff --git a/Source/WebCore/rendering/RenderRegion.cpp b/Source/WebCore/rendering/RenderRegion.cpp
index 6a3cf46..b0a7fa8 100644 (file)
--- a/Source/WebCore/rendering/RenderRegion.cpp
+++ b/Source/WebCore/rendering/RenderRegion.cpp
@@ -98,6 +98,9 @@ bool RenderRegion::isLastRegion() const
 
 void RenderRegion::setRegionBoxesRegionStyle()
 {
+    if (!hasCustomRegionStyle())
+        return;
+
     for (RenderBoxRegionInfoMap::iterator iter = m_renderBoxRegionInfo.begin(), end = m_renderBoxRegionInfo.end(); iter != end; ++iter) {
         const RenderBox* box = iter->first;
         if (!box->canHaveRegionStyle())
@@ -115,6 +118,9 @@ void RenderRegion::setRegionBoxesRegionStyle()
 
 void RenderRegion::restoreRegionBoxesOriginalStyle()
 {
+    if (!hasCustomRegionStyle())
+        return;
+
     for (RenderBoxRegionInfoMap::iterator iter = m_renderBoxRegionInfo.begin(), end = m_renderBoxRegionInfo.end(); iter != end; ++iter) {
         const RenderBox* box = iter->first;
         RenderBoxRegionStyleMap::iterator it = m_renderBoxRegionStyle.find(box);