Title: [177059] branches/safari-600.1.4.13-branch
- Revision
- 177059
- Author
- bshaf...@apple.com
- Date
- 2014-12-10 08:46:59 -0800 (Wed, 10 Dec 2014)
Log Message
Merged r173424. rdar://problem/19131999
Modified Paths
Diff
Modified: branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog (177058 => 177059)
--- branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 16:00:45 UTC (rev 177058)
+++ branches/safari-600.1.4.13-branch/LayoutTests/ChangeLog 2014-12-10 16:46:59 UTC (rev 177059)
@@ -1,3 +1,17 @@
+2014-12-10 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r173424.
+
+ 2014-09-08 Mihnea Ovidenie <mih...@adobe.com>
+
+ [CSSRegions]Incorrect layout for multicol element transformed into region
+ https://bugs.webkit.org/show_bug.cgi?id=136459
+
+ Reviewed by David Hyatt.
+
+ * fast/regions/multicol/nested-multicol-into-region-dynamic-expected.txt: Added.
+ * fast/regions/multicol/nested-multicol-into-region-dynamic.html: Added.
+
2014-12-09 Babak Shafiei <bshaf...@apple.com>
Merge r173061.
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog (177058 => 177059)
--- branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 16:00:45 UTC (rev 177058)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/ChangeLog 2014-12-10 16:46:59 UTC (rev 177059)
@@ -1,3 +1,26 @@
+2014-12-10 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r173424.
+
+ 2014-09-08 Mihnea Ovidenie <mih...@adobe.com>
+
+ [CSSRegions]Incorrect layout for multicol element transformed into region
+ https://bugs.webkit.org/show_bug.cgi?id=136459
+
+ Reviewed by David Hyatt.
+
+ Until we will support the multicolumn region functionality, a multicolumn element
+ that also has flow-from style is not transformed into a region (https://bugs.webkit.org/show_bug.cgi?id=135153).
+ However, when a multicolumn element with flow-from style dynamically loses
+ its multicolumn style while keeping the flow-from style, we have to transform
+ the element into a region by detaching and attaching the associated DOM node,
+ in the same way we are proceeding when an element receives a different flow-from style.
+
+ Test: fast/regions/multicol/nested-multicol-into-region-dynamic.html
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::determineChange):
+
2014-12-09 Babak Shafiei <bshaf...@apple.com>
Merge r173061.
Modified: branches/safari-600.1.4.13-branch/Source/WebCore/style/StyleResolveTree.cpp (177058 => 177059)
--- branches/safari-600.1.4.13-branch/Source/WebCore/style/StyleResolveTree.cpp 2014-12-10 16:00:45 UTC (rev 177058)
+++ branches/safari-600.1.4.13-branch/Source/WebCore/style/StyleResolveTree.cpp 2014-12-10 16:46:59 UTC (rev 177059)
@@ -116,6 +116,11 @@
// When the region thread has changed, we need to prepare a separate render region object.
if (s1->regionThread() != s2->regionThread())
return Detach;
+ // FIXME: Multicolumn regions not yet supported (http://dev.w3.org/csswg/css-regions/#multi-column-regions)
+ // When the node has region style and changed its multicol style, we have to prepare
+ // a separate render region object.
+ if (s1->hasFlowFrom() && (s1->specifiesColumns() != s2->specifiesColumns()))
+ return Detach;
if (*s1 != *s2) {
if (s1->inheritedNotEqual(s2))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
