Diff
Modified: trunk/LayoutTests/ChangeLog (98788 => 98789)
--- trunk/LayoutTests/ChangeLog 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/LayoutTests/ChangeLog 2011-10-29 00:51:37 UTC (rev 98789)
@@ -1,3 +1,17 @@
+2011-10-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98776.
+ http://trac.webkit.org/changeset/98776
+ https://bugs.webkit.org/show_bug.cgi?id=71164
+
+ caused lots of test crashes (Requested by smfr on #webkit).
+
+ * animations/resources/animation-test-helpers.js:
+ (checkExpectedValue):
+ * compositing/visibility/animation-visibility-expected.png: Removed.
+ * compositing/visibility/animation-visibility-expected.txt: Removed.
+ * compositing/visibility/animation-visibility.html: Removed.
+
2011-10-28 Sadrul Habib Chowdhury <[email protected]>
Add support for sending scroll-update events from EventSender.
Modified: trunk/LayoutTests/animations/resources/animation-test-helpers.js (98788 => 98789)
--- trunk/LayoutTests/animations/resources/animation-test-helpers.js 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/LayoutTests/animations/resources/animation-test-helpers.js 2011-10-29 00:51:37 UTC (rev 98789)
@@ -33,9 +33,6 @@
*/
-const doPixelTest = true;
-const dontDoPixelTest = false;
-
function isCloseEnough(actual, desired, tolerance)
{
var diff = Math.abs(actual - desired);
@@ -143,20 +140,6 @@
}
else
pass = isCloseEnough(computedValue, expectedValue, tolerance);
- } else if (property == "visibility") {
- var element;
- if (iframeId)
- element = document.getElementById(iframeId).contentDocument.getElementById(elementId);
- else
- element = document.getElementById(elementId);
-
- computedValue = window.getComputedStyle(element).visibility;
- if (compareElements) {
- computedValue2 = window.getComputedStyle(document.getElementById(elementId2)).visibility;
- pass = computedValue == computedValue2;
- }
- else
- pass = computedValue == expectedValue;
} else {
var element;
if (iframeId)
Deleted: trunk/LayoutTests/compositing/visibility/animation-visibility-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/compositing/visibility/animation-visibility-expected.txt (98788 => 98789)
--- trunk/LayoutTests/compositing/visibility/animation-visibility-expected.txt 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/LayoutTests/compositing/visibility/animation-visibility-expected.txt 2011-10-29 00:51:37 UTC (rev 98789)
@@ -1,3 +0,0 @@
-PASS - "visibility" property for "box" element at 0.75s saw something close to: visible
-PASS - "webkitTransform.4" property for "box" element at 0.75s saw something close to: 375
-
Deleted: trunk/LayoutTests/compositing/visibility/animation-visibility.html (98788 => 98789)
--- trunk/LayoutTests/compositing/visibility/animation-visibility.html 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/LayoutTests/compositing/visibility/animation-visibility.html 2011-10-29 00:51:37 UTC (rev 98789)
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <title>Visibility animation</title>
- <style>
- .container {
- position: relative;
- height: 100px;
- width: 600px;
- margin: 20px;
- border: 1px solid black;
- }
-
- .box {
- position: absolute;
- width: 100px;
- height: 100px;
- }
- .indicator {
- background-color: red;
- left: 375px;
- }
- #box {
- background-color: green;
- -webkit-animation: move 1s linear, reveal 1s linear;
- }
-
- @-webkit-keyframes move
- {
- 0% { -webkit-transform: translateX(0); }
- 100%{ -webkit-transform: translateX(500px); }
- }
-
- @-webkit-keyframes reveal
- {
- 0% { visibility: hidden; }
- 50% { visibility: hidden; }
- 51% { visibility: visible; }
- 100%{ visibility: visible; }
- }
-
- #result.hidden {
- opacity: 0; /* Hide in pixel result */
- }
- </style>
- <script src=""
- <script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText(true);
-
- const expectedValues = [
- // [animation-name, time, element-id, property, expected-value, tolerance]
- ["reveal", 0.75, "box", "visibility", 'visible'],
- ["move", 0.75, "box", "webkitTransform.4", 375, 10],
- ];
-
- var disablePauseAPI = false;
- runAnimationTest(expectedValues, null, null, disablePauseAPI, doPixelTest);
- </script>
-</head>
-<body>
-
-<div class="container">
- <div class="indicator box"></div>
- <div id="box" class="box"></div>
-</div>
-<div id="result"></div>
-<script>
- if (window.layoutTestController)
- document.getElementById('result').className = 'hidden';
-</script>
-</body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (98788 => 98789)
--- trunk/Source/WebCore/ChangeLog 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/Source/WebCore/ChangeLog 2011-10-29 00:51:37 UTC (rev 98789)
@@ -1,3 +1,18 @@
+2011-10-28 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r98776.
+ http://trac.webkit.org/changeset/98776
+ https://bugs.webkit.org/show_bug.cgi?id=71164
+
+ caused lots of test crashes (Requested by smfr on #webkit).
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateVisibilityStatus):
+ (WebCore::RenderLayer::dirtyZOrderLists):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::enableCompositingMode):
+
2011-10-28 John Sullivan <[email protected]>
Improvement to the fix for:
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (98788 => 98789)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-10-29 00:51:37 UTC (rev 98789)
@@ -617,7 +617,7 @@
if (m_visibleDescendantStatusDirty) {
m_hasVisibleDescendant = false;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
- child->updateVisibilityStatus();
+ child->updateVisibilityStatus();
if (child->m_hasVisibleContent || child->m_hasVisibleDescendant) {
m_hasVisibleDescendant = true;
break;
@@ -3970,29 +3970,16 @@
void RenderLayer::dirtyZOrderLists()
{
- dirtyZOrderListsInternal();
-
-#if USE(ACCELERATED_COMPOSITING)
- if (!renderer()->documentBeingDestroyed())
- compositor()->setCompositingLayersNeedRebuild();
-#endif
-}
-
-void RenderLayer::dirtyZOrderListsInternal()
-{
if (m_posZOrderList)
m_posZOrderList->clear();
if (m_negZOrderList)
m_negZOrderList->clear();
m_zOrderListsDirty = true;
-}
-void RenderLayer::dirtyZOrderListsIncludingDescendants()
-{
- dirtyZOrderListsInternal();
-
- for (RenderLayer* child = firstChild(); child; child = child->nextSibling())
- child->dirtyZOrderListsIncludingDescendants();
+#if USE(ACCELERATED_COMPOSITING)
+ if (!renderer()->documentBeingDestroyed())
+ compositor()->setCompositingLayersNeedRebuild();
+#endif
}
void RenderLayer::dirtyStackingContextZOrderLists()
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (98788 => 98789)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2011-10-29 00:51:37 UTC (rev 98789)
@@ -376,7 +376,6 @@
bool isStackingContext() const { return !hasAutoZIndex() || renderer()->isRenderView(); }
void dirtyZOrderLists();
- void dirtyZOrderListsIncludingDescendants();
void dirtyStackingContextZOrderLists();
void updateZOrderLists();
Vector<RenderLayer*>* posZOrderList() const { return m_posZOrderList; }
@@ -541,8 +540,6 @@
void setParent(RenderLayer* parent);
void setFirstChild(RenderLayer* first) { m_first = first; }
void setLastChild(RenderLayer* last) { m_last = last; }
-
- void dirtyZOrderListsInternal();
LayoutPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : LayoutPoint(); }
LayoutUnit renderBoxX() const { return renderBoxLocation().x(); }
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (98788 => 98789)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-29 00:32:36 UTC (rev 98788)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-10-29 00:51:37 UTC (rev 98789)
@@ -124,8 +124,6 @@
if (m_compositing) {
ensureRootLayer();
- // Compositing affects whether visibility:hidden layers are included in z-order lists, so we have to dirty the lists here.
- rootRenderLayer()->dirtyZOrderListsIncludingDescendants();
notifyIFramesOfCompositingChange();
} else
destroyRootLayer();
@@ -1126,6 +1124,7 @@
}
}
+
void RenderLayerCompositor::repaintCompositedLayersAbsoluteRect(const LayoutRect& absRect)
{
recursiveRepaintLayerRect(rootRenderLayer(), absRect);
