[CSSRegions]Add support for background-color in region styling

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

Reviewed by David Hyatt.

Source/WebCore:

This patch enables region styling again. The region styling tests were also added back.
With the improvements from https://bugs.webkit.org/show_bug.cgi?id=76265, hopefully we will not see the same 3% regressions
in performance.

* rendering/RenderObject.h:
(WebCore::RenderObject::style):

LayoutTests:

Add back the region styling tests.

* platform/mac-snowleopard/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f079da7..de8b223 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-19  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Add support for background-color in region styling
+        https://bugs.webkit.org/show_bug.cgi?id=71488
+
+        Reviewed by David Hyatt.
+
+        Add back the region styling tests.
+
+        * platform/mac-snowleopard/Skipped:
+
 2012-01-19  David Hyatt  <hyatt@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=76577

diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index 9ee77e0..3f1d56c 100644 (file)
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -183,13 +183,6 @@ media/media-fullscreen-inline.html
 http/tests/media/video-play-progress.html
 http/tests/media/video-load-twice.html
 
-# Regression in performance
-# https://bugs.webkit.org/show_bug.cgi?id=74141
-fast/regions/region-style-block-background-color.html
-fast/regions/region-style-block-background-color2.html
-fast/regions/region-style-image-background-color.html
-fast/regions/region-style-inline-background-color.html
-
 # HiDPI tests have lower-level platform dependencies on Mac
 fast/hidpi
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7053bf9..f2e9d30 100755 (executable)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-19  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions]Add support for background-color in region styling
+        https://bugs.webkit.org/show_bug.cgi?id=71488
+
+        Reviewed by David Hyatt.
+
+        This patch enables region styling again. The region styling tests were also added back. 
+        With the improvements from https://bugs.webkit.org/show_bug.cgi?id=76265, hopefully we will not see the same 3% regressions
+        in performance.
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::style):
+
 2012-01-16  Jer Noble  <jer.noble@apple.com>
 
         Crash at WebCore::MediaControlRootElement::makeOpaque + 97

diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h
index 0b26ea3..f3c5c87 100644 (file)
--- a/Source/WebCore/rendering/RenderObject.h
+++ b/Source/WebCore/rendering/RenderObject.h
@@ -1110,7 +1110,9 @@ inline bool RenderObject::preservesNewline() const
 
 inline RenderStyle* RenderObject::style() const
 {
-    return m_style.get();
+    if (!inRenderFlowThread())
+        return m_style.get();
+    return styleInRegion();
 }
 
 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)