Changeset 118633 in webkit

Timestamp:

May 27, 2012, 5:28:49 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

fast/dom/shadow/content-element-in-media.html is wrong.
​https://bugs.webkit.org/show_bug.cgi?id=81310

Modifying to check() to dump expected and actual text at the same
absolute position, because DumpRenderTree dumps absolute x,y-position
information for a layer which contains RenderVideo. For example,
backgroundClip at (8,163), clip at (8, 163) and so on.

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-05-27
Reviewed by Hajime Morita.

• fast/dom/resources/shadow-test-driver.js:

(check):
Disabled actual block when dumping expected block as text, and vice
versa.

• platform/chromium/test_expectations.txt:

Removed BUGWK81310.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/resources/shadow-test-driver.js (modified) (1 diff)
• platform/chromium/test_expectations.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-27  Takashi Sakamoto  <tasak@google.com>
+
+        fast/dom/shadow/content-element-in-media.html is wrong.
+        https://bugs.webkit.org/show_bug.cgi?id=81310
+
+        Modifying to check() to dump expected and actual text at the same
+        absolute position, because DumpRenderTree dumps absolute x,y-position
+        information for a layer which contains RenderVideo. For example,
+        backgroundClip at (8,163), clip at (8, 163) and so on.
+
+        Reviewed by Hajime Morita.
+
+        * fast/dom/resources/shadow-test-driver.js:
+        (check):
+        Disabled actual block when dumping expected block as text, and vice
+        versa.
+        * platform/chromium/test_expectations.txt:
+        Removed BUGWK81310.
+
 2012-05-27  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js

@@ -37 +37 @@
 
 function check() {
-    var refContainerRenderTree = internals.elementRenderTreeAsText(document.getElementById('expect-container'));
+    var expectContainer = document.getElementById('expect-container');
+    var actualContainer = document.getElementById('actual-container');
+    var originalDisplayValue = actualContainer.style.display;
+    actualContainer.style.display = 'none';
+    expectContainer.offsetLeft;
+    var refContainerRenderTree = internals.elementRenderTreeAsText(expectContainer);
     var refRenderTree = removeContainerLines(refContainerRenderTree);
+    actualContainer.style.display = originalDisplayValue;
 
-    var targetContainerRenderTree = internals.elementRenderTreeAsText(document.getElementById('actual-container'));
+    originalDisplayValue = expectContainer.style.display;
+    expectContainer.style.display = 'none';
+    actualContainer.offsetLeft;
+    var targetContainerRenderTree = internals.elementRenderTreeAsText(actualContainer);
     var targetRenderTree = removeContainerLines(targetContainerRenderTree);
+    expectContainer.style.display = originalDisplayValue;
 
     if (targetRenderTree == refRenderTree)

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2742 +2742 @@
 BUGCR85292 : platform/chromium/permissionclient/storage-permission.html = PASS TEXT
 
-BUGWK81310 : fast/dom/shadow/content-element-in-media-element.html = TEXT
-
 // two regions reftests failing on Chromium
 BUGWK74219 : fast/regions/positioned-objects-block-static-spanning-regions-rtl.html = PASS IMAGE