Modified: trunk/LayoutTests/ChangeLog (206610 => 206611)
--- trunk/LayoutTests/ChangeLog 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/LayoutTests/ChangeLog 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,3 +1,17 @@
+2016-09-29 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r206483.
+ https://bugs.webkit.org/show_bug.cgi?id=162750
+
+ May have caused iOS perf regression (Requested by smfr on
+ #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r204552): Yelp carousel animation is not smooth."
+ https://bugs.webkit.org/show_bug.cgi?id=162632
+ http://trac.webkit.org/changeset/206483
+
2016-09-29 Ryan Haddad <ryanhad...@apple.com>
Removing El Capitan modifier from flaky test media/restore-from-page-cache.html.
Deleted: trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes-expected.html (206610 => 206611)
--- trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes-expected.html 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes-expected.html 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests when the gap between the graphics layer and its associated renderer changes dynamically.</title>
-<style>
-div {
- width: 20px;
- height: 20px;
- background-color: green;
- position: absolute;
-}
-</style>
-</head>
-<body>
-<p id="container"></p>
-<script>
- var subpixel = 0;
- var container = document.getElementById("container");
- for (i = 0; i < 20; ++i) {
- for (j = 0; j < 20; ++j) {
- var outer = document.createElement("div");
- outer.style.top = 25 * i + subpixel + "px";
- outer.style.left = 25 * j + subpixel + "px";
- container.appendChild(outer);
- subpixel += 0.1;
- }
- }
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes.html (206610 => 206611)
--- trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes.html 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/LayoutTests/compositing/hidpi-composited-container-and-graphics-layer-gap-changes.html 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests when the gap between the graphics layer and its associated renderer changes dynamically.</title>
-<style>
-div {
- transform: translateZ(0);
- width: 20px;
- height: 20px;
- background-color: green;
- position: absolute;
-}
-
-.boxShadow {
- background-color: yellow;
-}
-</style>
-<script>
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- function runTest() {
- setTimeout(function() {
- var elements = document.getElementsByClassName("boxShadow")
- for (var i = 0; i < elements.length; ++i)
- elements[i].style.boxShadow = "0px 0px 10px transparent";
- if (window.testRunner)
- testRunner.notifyDone();
- }, 0);
- }
-</script>
-</head>
-<body _onload_="runTest()">
-<p id="container"></p>
-<script>
- var subpixel = 0;
- var container = document.getElementById("container");
- for (i = 0; i < 20; ++i) {
- for (j = 0; j < 20; ++j) {
- var outer = document.createElement("div");
- outer.style.top = 25 * i + subpixel + "px";
- outer.style.left = 25 * j + subpixel + "px";
- outer.className = "boxShadow";
- outer.appendChild(document.createElement("div"));
- container.appendChild(outer);
- subpixel += 0.1;
- }
- }
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel-expected.html (206610 => 206611)
--- trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel-expected.html 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel-expected.html 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests when the composited bounds lands on device pixel.</title>
-<style>
-.container {
- position: absolute;
- background-color: green;
- width: 50px;
- height: 50px;
- left: 10.1px;
- top: 10.1px;
-}
-
-.offset {
- background-color: blue;
- width: 10px;
- height: 10px;
- left: -0.6px;
- top: -0.7px;
- position: relative;
- }
-
-.jiggle {
- height: 30px;
- width: 30px;
- background-color: red;
-}
-</style>
-</head>
-<body>
-<div class=container>
- <div class=offset></div>
- <div class=jiggle></div>
-</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel.html (206610 => 206611)
--- trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel.html 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/LayoutTests/compositing/hidpi-negative-composited-bounds-on-device-pixel.html 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests when the composited bounds lands on device pixel.</title>
-<style>
-.container {
- position: absolute;
- background-color: green;
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- left: 10.1px;
- top: 10.1px;
-}
-
-.offset {
- background-color: blue;
- width: 10px;
- height: 10px;
- left: -0.6px;
- top: -0.7px;
- position: relative;
- }
-
-.jiggle {
- height: 30px;
- width: 30px;
- background-color: red;
- transform: translateZ(0);
-}
-</style>
-</head>
-<body>
-<div class=container>
- <div class=offset></div>
- <div class=jiggle></div>
-</div>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (206610 => 206611)
--- trunk/Source/WebCore/ChangeLog 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/Source/WebCore/ChangeLog 2016-09-29 21:02:59 UTC (rev 206611)
@@ -1,3 +1,17 @@
+2016-09-29 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r206483.
+ https://bugs.webkit.org/show_bug.cgi?id=162750
+
+ May have caused iOS perf regression (Requested by smfr on
+ #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r204552): Yelp carousel animation is not smooth."
+ https://bugs.webkit.org/show_bug.cgi?id=162632
+ http://trac.webkit.org/changeset/206483
+
2016-09-29 Alex Christensen <achristen...@webkit.org>
URLParser: make parsing invalid IPv4 addresses more robust and correct
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (206610 => 206611)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-09-29 20:33:21 UTC (rev 206610)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-09-29 21:02:59 UTC (rev 206611)
@@ -740,18 +740,14 @@
return snappedGraphicsLayer;
}
-static LayoutSize computeOffsetFromAncestorGraphicsLayer(RenderLayer* compositedAncestor, const LayoutPoint& location, float deviceScaleFactor)
+static LayoutSize computeOffsetFromAncestorGraphicsLayer(RenderLayer* compositedAncestor, const LayoutPoint& location)
{
if (!compositedAncestor)
return toLayoutSize(location);
- // FIXME: This is a workaround until after webkit.org/162634 gets fixed. ancestorSubpixelOffsetFromRenderer
- // could be stale when a dynamic composited state change triggers a pre-order updateGeometry() traversal.
- LayoutSize ancestorSubpixelOffsetFromRenderer = compositedAncestor->backing()->subpixelOffsetFromRenderer();
- LayoutRect ancestorCompositedBounds = compositedAncestor->backing()->compositedBounds();
- LayoutSize floored = toLayoutSize(LayoutPoint(floorPointToDevicePixels(ancestorCompositedBounds.location() - ancestorSubpixelOffsetFromRenderer, deviceScaleFactor)));
- LayoutSize ancestorRendererOffsetFromAncestorGraphicsLayer = -(floored + ancestorSubpixelOffsetFromRenderer);
- return ancestorRendererOffsetFromAncestorGraphicsLayer + toLayoutSize(location);
+ LayoutSize ancestorRenderLayerOffsetFromAncestorGraphicsLayer = -(LayoutSize(compositedAncestor->backing()->graphicsLayer()->offsetFromRenderer())
+ + compositedAncestor->backing()->subpixelOffsetFromRenderer());
+ return ancestorRenderLayerOffsetFromAncestorGraphicsLayer + toLayoutSize(location);
}
class ComputedOffsets {
@@ -761,7 +757,6 @@
, m_location(localRect.location())
, m_parentGraphicsLayerOffset(toLayoutSize(parentGraphicsLayerRect.location()))
, m_primaryGraphicsLayerOffset(toLayoutSize(primaryGraphicsLayerRect.location()))
- , m_deviceScaleFactor(renderLayer.renderer().document().deviceScaleFactor())
{
}
@@ -785,7 +780,7 @@
if (!m_fromAncestorGraphicsLayer) {
RenderLayer* compositedAncestor = m_renderLayer.ancestorCompositingLayer();
LayoutPoint localPointInAncestorRenderLayerCoords = m_renderLayer.convertToLayerCoords(compositedAncestor, m_location, RenderLayer::AdjustForColumns);
- m_fromAncestorGraphicsLayer = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, localPointInAncestorRenderLayerCoords, m_deviceScaleFactor);
+ m_fromAncestorGraphicsLayer = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, localPointInAncestorRenderLayerCoords);
}
return m_fromAncestorGraphicsLayer.value();
}
@@ -799,7 +794,6 @@
const LayoutPoint m_location;
const LayoutSize m_parentGraphicsLayerOffset;
const LayoutSize m_primaryGraphicsLayerOffset;
- float m_deviceScaleFactor;
};
LayoutRect RenderLayerBacking::computePrimaryGraphicsLayerRect(const LayoutRect& parentGraphicsLayerRect) const
@@ -827,7 +821,7 @@
if (ancestorBackingLayer->hasClippingLayer()) {
// If the compositing ancestor has a layer to clip children, we parent in that, and therefore position relative to it.
LayoutRect clippingBox = clipBox(downcast<RenderBox>(compositedAncestor->renderer()));
- LayoutSize clippingBoxOffset = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, clippingBox.location(), deviceScaleFactor());
+ LayoutSize clippingBoxOffset = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, clippingBox.location());
parentGraphicsLayerRect = snappedGraphicsLayer(clippingBoxOffset, clippingBox.size(), deviceScaleFactor()).m_snappedRect;
}
@@ -856,7 +850,7 @@
RenderLayer::ClipRectsContext clipRectsContext(compositedAncestor, TemporaryClipRects, IgnoreOverlayScrollbarSize, shouldRespectOverflowClip);
LayoutRect parentClipRect = m_owningLayer.backgroundClipRect(clipRectsContext).rect(); // FIXME: Incorrect for CSS regions.
ASSERT(!parentClipRect.isInfinite());
- LayoutSize clippingOffset = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, parentClipRect.location(), deviceScaleFactor());
+ LayoutSize clippingOffset = computeOffsetFromAncestorGraphicsLayer(compositedAncestor, parentClipRect.location());
LayoutRect snappedClippingLayerRect = snappedGraphicsLayer(clippingOffset, parentClipRect.size(), deviceScaleFactor()).m_snappedRect;
// The primary layer is then parented in, and positioned relative to this clipping layer.
ancestorClippingLayerOffset = snappedClippingLayerRect.location() - parentGraphicsLayerRect.location();
