Title: [102641] trunk
- Revision
- 102641
- Author
- [email protected]
- Date
- 2011-12-12 16:56:27 -0800 (Mon, 12 Dec 2011)
Log Message
[CSSRegions]Revert RenderObject::style() to its state before region styling
https://bugs.webkit.org/show_bug.cgi?id=74315
Patch by Mihnea Ovidenie <[email protected]> on 2011-12-12
Reviewed by Tony Chang.
Source/WebCore:
* rendering/RenderObject.h:
(WebCore::RenderObject::style):
LayoutTests:
* platform/mac-snowleopard/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (102640 => 102641)
--- trunk/LayoutTests/ChangeLog 2011-12-13 00:52:46 UTC (rev 102640)
+++ trunk/LayoutTests/ChangeLog 2011-12-13 00:56:27 UTC (rev 102641)
@@ -1,3 +1,12 @@
+2011-12-12 Mihnea Ovidenie <[email protected]>
+
+ [CSSRegions]Revert RenderObject::style() to its state before region styling
+ https://bugs.webkit.org/show_bug.cgi?id=74315
+
+ Reviewed by Tony Chang.
+
+ * platform/mac-snowleopard/Skipped:
+
2011-12-12 Adam Klein <[email protected]>
Don't crash in StyleAttributeMutationScope if the style declaration's element has been GCed
Modified: trunk/LayoutTests/platform/mac-snowleopard/Skipped (102640 => 102641)
--- trunk/LayoutTests/platform/mac-snowleopard/Skipped 2011-12-13 00:52:46 UTC (rev 102640)
+++ trunk/LayoutTests/platform/mac-snowleopard/Skipped 2011-12-13 00:56:27 UTC (rev 102641)
@@ -183,5 +183,12 @@
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
Modified: trunk/Source/WebCore/ChangeLog (102640 => 102641)
--- trunk/Source/WebCore/ChangeLog 2011-12-13 00:52:46 UTC (rev 102640)
+++ trunk/Source/WebCore/ChangeLog 2011-12-13 00:56:27 UTC (rev 102641)
@@ -1,3 +1,13 @@
+2011-12-12 Mihnea Ovidenie <[email protected]>
+
+ [CSSRegions]Revert RenderObject::style() to its state before region styling
+ https://bugs.webkit.org/show_bug.cgi?id=74315
+
+ Reviewed by Tony Chang.
+
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::style):
+
2011-12-12 Adam Klein <[email protected]>
Don't crash in StyleAttributeMutationScope if the style declaration's element has been GCed
Modified: trunk/Source/WebCore/rendering/RenderObject.h (102640 => 102641)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-12-13 00:52:46 UTC (rev 102640)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-12-13 00:56:27 UTC (rev 102641)
@@ -1035,9 +1035,7 @@
inline RenderStyle* RenderObject::style() const
{
- if (!inRenderFlowThread())
- return m_style.get();
- return styleInRegion();
+ return m_style.get();
}
inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
