Diff
Modified: trunk/LayoutTests/ChangeLog (112819 => 112820)
--- trunk/LayoutTests/ChangeLog 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/ChangeLog 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,3 +1,24 @@
+2012-04-01 Eric Seidel <e...@webkit.org>
+
+ Unreviewed, rolling out r112760.
+ http://trac.webkit.org/changeset/112760
+ https://bugs.webkit.org/show_bug.cgi?id=82795
+
+ Revert addition of webkitseamless. I'll do this work on
+ GitHub instead to avoid any half-implemented feature concerns.
+
+ * fast/frames/seamless/resources/css-cascade-child.html: Removed.
+ * fast/frames/seamless/resources/nested-seamless.html: Removed.
+ * fast/frames/seamless/resources/square.html: Removed.
+ * fast/frames/seamless/seamless-basic-expected.txt: Removed.
+ * fast/frames/seamless/seamless-basic.html: Removed.
+ * fast/frames/seamless/seamless-css-cascade-expected.txt: Removed.
+ * fast/frames/seamless/seamless-css-cascade.html: Removed.
+ * fast/frames/seamless/seamless-nested-expected.txt: Removed.
+ * fast/frames/seamless/seamless-nested.html: Removed.
+ * fast/frames/seamless/seamless-sandbox-flag-expected.txt: Removed.
+ * fast/frames/seamless/seamless-sandbox-flag.html: Removed.
+
2012-04-01 Dan Bernstein <m...@apple.com>
Corrected the expected results for this test.
Deleted: trunk/LayoutTests/fast/frames/seamless/resources/css-cascade-child.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/resources/css-cascade-child.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/resources/css-cascade-child.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,7 +0,0 @@
-<style>
-#two { color: purple; }
-</style>
-
-<div id="one"></div>
-<div id="two"></div>
-<div id="three"></div>
Deleted: trunk/LayoutTests/fast/frames/seamless/resources/nested-seamless.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/resources/nested-seamless.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/resources/nested-seamless.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<iframe id="iframe" webkitseamless src=""
Deleted: trunk/LayoutTests/fast/frames/seamless/resources/square.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/resources/square.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/resources/square.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,2 +0,0 @@
-<!DOCTYPE html>
-<html style="width: 100px; height: 100px; background-color: green"></html>
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-basic-expected.txt (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-basic-expected.txt 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-basic-expected.txt 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,4 +0,0 @@
-PASS iframe.webkitseamless is true
-FAIL window.getComputedStyle(iframe).width should be 200px. Was 300px.
-FAIL window.getComputedStyle(iframe).height should be 100px. Was 150px.
-
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-basic.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-basic.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-basic.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<div id="parent" style="width: 200px; height: 200px;">
-<iframe id="iframe" webkitseamless src=""
-</div>
-<script>
-window._onload_ = function () {
- window.iframe = document.getElementById("iframe");
- shouldBeTrue("iframe.webkitseamless");
-
- // Seamless iframes are normal inline/replaced elements but behave
- // like blocks with (intrinsic) width filling their parent
- // and their (intrinsic) height defined by their children.
-
- // Spec: In visual media, in a CSS-supporting user agent: the user agent
- // should set the intrinsic width of the iframe to the width that the element
- // would have if it was a non-replaced block-level element with 'width: auto'.
- shouldBeEqualToString("window.getComputedStyle(iframe).width", "200px");
-
- // Spec: In visual media, in a CSS-supporting user agent: the user agent
- // should set the intrinsic height of the iframe to the height of the bounding
- // box around the content rendered in the iframe at its current width...
- shouldBeEqualToString("window.getComputedStyle(iframe).height", "100px");
-}
-</script>
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade-expected.txt (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade-expected.txt 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade-expected.txt 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,5 +0,0 @@
-FAIL window.getComputedStyle(one).color should be rgb(255, 0, 0). Was rgb(0, 0, 0).
-PASS window.getComputedStyle(two).color is "rgb(128, 0, 128)"
-FAIL window.getComputedStyle(three).color should be rgb(255, 255, 255). Was rgb(0, 0, 0).
-FAIL window.getComputedStyle(rootElement).color should be rgb(255, 128, 64). Was rgb(0, 0, 0).
-
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-css-cascade.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<style>
-iframe { color: orange; }
-div { color: white; }
-#one { color: red; }
-#two { color: blue; }
-</style>
-<iframe id="iframe" webkitseamless src=""
-<script>
-window._onload_ = function () {
- window.iframe = document.getElementById("iframe");
- window._one_ = iframe.contentDocument.getElementById("one");
- window.two = iframe.contentDocument.getElementById("two");
- window.three = iframe.contentDocument.getElementById("three");
-
- // Spec: In a CSS-supporting user agent: the user agent must add all the style
- // sheets that apply to the iframe element to the cascade of the active document
- // of the iframe element's nested browsing context, at the appropriate cascade
- // levels, before any style sheets specified by the document itself.
- shouldBeEqualToString("window.getComputedStyle(one).color", "rgb(255, 0, 0)"); // red, Specified directly by parent's selector.
- shouldBeEqualToString("window.getComputedStyle(two).color", "rgb(128, 0, 128)"); // purple, Selector in child overrides parent.
- shouldBeEqualToString("window.getComputedStyle(three).color", "rgb(255, 255, 255)"); // white, div selector in parent.
-
- // Spec: In a CSS-supporting user agent: the user agent must, for the purpose of
- // CSS property inheritance only, treat the root element of the active document
- // of the iframe element's nested browsing context as being a child of the
- // iframe element. (Thus inherited properties on the root element of the
- // document in the iframe will inherit the computed values of those properties
- // on the iframe element instead of taking their initial values.)
- window.rootElement = iframe.contentDocument.documentElement;
- shouldBeEqualToString("window.getComputedStyle(rootElement).color", "rgb(255, 128, 64)"); // orange, inherited from parent iframe.
-}
-</script>
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-nested-expected.txt (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-nested-expected.txt 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-nested-expected.txt 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,5 +0,0 @@
-PASS iframe.webkitseamless is true
-PASS nestedFrame.webkitseamless is true
-FAIL window.getComputedStyle(iframe).width should be 200px. Was 300px.
-FAIL window.getComputedStyle(iframe).height should be 100px. Was 150px.
-
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-nested.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-nested.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-nested.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<div id="parent" style="width: 200px; height: 200px;">
-<iframe id="iframe" webkitseamless src=""
-</div>
-<script>
-window._onload_ = function () {
- window.iframe = document.getElementById("iframe");
- shouldBeTrue("iframe.webkitseamless");
-
- // The nested iframe is also seamless.
- window.nestedFrame = iframe.contentDocument.getElementById("iframe");
- shouldBeTrue("nestedFrame.webkitseamless");
-
- // Just like seamless-basic.html, the height from resources/square.html
- // should define the height of the nested seamless iframes.
- shouldBeEqualToString("window.getComputedStyle(iframe).width", "200px");
- shouldBeEqualToString("window.getComputedStyle(iframe).height", "100px");
-}
-</script>
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag-expected.txt (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag-expected.txt 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag-expected.txt 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,5 +0,0 @@
-PASS iframe.webkitseamless is true
-PASS nestedFrame.webkitseamless is true
-FAIL window.getComputedStyle(iframe).width should be 200px. Was 300px.
-PASS window.getComputedStyle(iframe).height is "150px"
-
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag.html (112819 => 112820)
--- trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag.html 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-sandbox-flag.html 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<div id="parent" style="width: 200px; height: 200px;">
-<iframe id="iframe" webkitseamless sandbox="allow-same-origin" src=""
-</div>
-<script>
-window._onload_ = function () {
- window.iframe = document.getElementById("iframe");
- shouldBeTrue("iframe.webkitseamless");
-
- // The nested iframe is also "seamless", but the seamless-ness should be disabled by the sandbox.
- window.nestedFrame = iframe.contentDocument.getElementById("iframe");
- shouldBeTrue("nestedFrame.webkitseamless");
-
- // The sandboxed iframe is still seamless, but the iframe inside it is not and
- // thus 300x150. Thus the sandboxed iframe should be the width of its parent,
- // but the height of its iframe child (which is intrinsicly 150px).
- shouldBeEqualToString("window.getComputedStyle(iframe).width", "200px");
- shouldBeEqualToString("window.getComputedStyle(iframe).height", "150px");
-}
-</script>
Modified: trunk/Source/WebCore/ChangeLog (112819 => 112820)
--- trunk/Source/WebCore/ChangeLog 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/Source/WebCore/ChangeLog 2012-04-01 23:12:24 UTC (rev 112820)
@@ -1,3 +1,15 @@
+2012-04-01 Eric Seidel <e...@webkit.org>
+
+ Unreviewed, rolling out r112760.
+ http://trac.webkit.org/changeset/112760
+ https://bugs.webkit.org/show_bug.cgi?id=82795
+
+ Revert addition of webkitseamless. I'll do this work on
+ GitHub instead to avoid any half-implemented feature concerns.
+
+ * html/HTMLAttributeNames.in:
+ * html/HTMLIFrameElement.idl:
+
2012-04-01 Timothy Hatcher <timo...@apple.com>
Fix a crash when closing a tab/window while the Web Inspector is stopped in the debugger.
Modified: trunk/Source/WebCore/html/HTMLAttributeNames.in (112819 => 112820)
--- trunk/Source/WebCore/html/HTMLAttributeNames.in 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/Source/WebCore/html/HTMLAttributeNames.in 2012-04-01 23:12:24 UTC (rev 112820)
@@ -317,6 +317,5 @@
vspace
webkitallowfullscreen
webkitdirectory
-webkitseamless
width
wrap
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.idl (112819 => 112820)
--- trunk/Source/WebCore/html/HTMLIFrameElement.idl 2012-04-01 21:22:02 UTC (rev 112819)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.idl 2012-04-01 23:12:24 UTC (rev 112820)
@@ -33,9 +33,6 @@
attribute [Reflect, URL] DOMString src;
attribute [Reflect] DOMString width;
- // FIXME: webkit prefix will be removed when implementation is complete.
- attribute [Reflect] boolean webkitseamless;
-
// Introduced in DOM Level 2:
readonly attribute [CheckSecurityForNode] Document contentDocument;
