Title: [184233] branches/safari-601.1.32-branch
- Revision
- 184233
- Author
- dburk...@apple.com
- Date
- 2015-05-12 20:02:40 -0700 (Tue, 12 May 2015)
Log Message
Merge r183942. rdar://problem/20049088
Modified Paths
Diff
Modified: branches/safari-601.1.32-branch/LayoutTests/ChangeLog (184232 => 184233)
--- branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
@@ -1,7 +1,7 @@
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com>
- Merge r183894. rdar://problem/20049088
+ Merge r183942. rdar://problem/20049088
2015-05-06 Dean Jackson <d...@apple.com>
@@ -11,13 +11,36 @@
Reviewed by Simon Fraser.
+ Take 2 - this was rolled out because Mavericks was crashing.
+
A test that creates some backdrop views, then makes them
big enough that it would trigger tiling (which we don't want
to happen).
* compositing/media-controls-bar-appearance-big-expected.txt: Added.
* compositing/media-controls-bar-appearance-big.html: Added.
+ * platform/mac-mavericks/TestExpectations: Skip tests on Mavericks.
+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburk...@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <d...@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ A test that creates some backdrop views, then makes them
+ big enough that it would trigger tiling (which we don't want
+ to happen).
+
+ * compositing/media-controls-bar-appearance-big-expected.txt: Added.
+ * compositing/media-controls-bar-appearance-big.html: Added.
+
2015-05-06 Brent Fulgham <bfulg...@apple.com>
Scroll-snap points do not handle margins and padding propertly
Modified: branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations (184232 => 184233)
--- branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/LayoutTests/platform/mac-mavericks/TestExpectations 2015-05-13 03:02:40 UTC (rev 184233)
@@ -5,3 +5,7 @@
fast/events/mouse-force-changed.html [ Skip ]
fast/events/mouse-force-down.html [ Skip ]
fast/events/mouse-force-up.html [ Skip ]
+
+# No support for Filters Level 2
+compositing/media-controls-bar-appearance.html [ Skip ]
+compositing/media-controls-bar-appearance-big.html [ Skip ]
Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184232 => 184233)
--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
@@ -1,7 +1,7 @@
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com>
- Merge r183894. rdar://problem/20049088
+ Merge r183942. rdar://problem/20049088
2015-05-06 Dean Jackson <d...@apple.com>
@@ -11,6 +11,8 @@
Reviewed by Simon Fraser.
+ Take 2 - this was rolled out because Mavericks was crashing.
+
Make sure backdrop layers don't tile. If they are big
enough, we'll leave it to the platform compositor to handle.
@@ -24,6 +26,32 @@
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
a layer needs a backdrop before checking if it needs to tile.
+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburk...@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <d...@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Make sure backdrop layers don't tile. If they are big
+ enough, we'll leave it to the platform compositor to handle.
+
+ This also fixes a bug where if a layer changed from a backdrop
+ type to a tiled type, it would still retain its custom appearance
+ and we'd try to add children to the wrong layer.
+
+ Test: compositing/media-controls-bar-appearance-big.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
+ a layer needs a backdrop before checking if it needs to tile.
+
2015-05-06 Brent Fulgham <bfulg...@apple.com>
Scroll-snap points do not handle margins and padding propertly
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184232 => 184233)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 03:02:36 UTC (rev 184232)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-13 03:02:40 UTC (rev 184233)
@@ -1,7 +1,7 @@
2015-05-12 Dana Burkart
Dana Burkart <dburk...@apple.com>
- Merge r183894. rdar://problem/20049088
+ Merge r183942. rdar://problem/20049088
2015-05-06 Dean Jackson <d...@apple.com>
@@ -11,11 +11,31 @@
Reviewed by Simon Fraser.
+ Take 2 - this was rolled out because Mavericks was crashing.
+
Add some better logging for custom appearance.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::RemoteLayerTreeTextStream::operator<<):
+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburk...@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <d...@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Add some better logging for custom appearance.
+
+ * Shared/mac/RemoteLayerTreeTransaction.mm:
+ (WebKit::RemoteLayerTreeTextStream::operator<<):
+
2015-05-11 Babak Shafiei <bshaf...@apple.com>
Merge r184004.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
