- Revision
- 138616
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-02 04:19:48 -0800 (Wed, 02 Jan 2013)
Log Message
Unreviewed, rolling out r138601.
http://trac.webkit.org/changeset/138601
https://bugs.webkit.org/show_bug.cgi?id=105917
Also not an optimal solution, needs more discussion.
(Requested by mkwst_ on #webkit).
Patch by Sheriff Bot <webkit.review....@gmail.com> on 2013-01-02
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::finishedParsing):
LayoutTests:
* fast/frames/seamless/resources/span.html: Removed.
* fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt:
* fast/frames/seamless/seamless-srcdoc-expected.txt: Removed.
* fast/frames/seamless/seamless-srcdoc.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (138615 => 138616)
--- trunk/LayoutTests/ChangeLog 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/LayoutTests/ChangeLog 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1,5 +1,19 @@
2013-01-02 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r138601.
+ http://trac.webkit.org/changeset/138601
+ https://bugs.webkit.org/show_bug.cgi?id=105917
+
+ Also not an optimal solution, needs more discussion.
+ (Requested by mkwst_ on #webkit).
+
+ * fast/frames/seamless/resources/span.html: Removed.
+ * fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt:
+ * fast/frames/seamless/seamless-srcdoc-expected.txt: Removed.
+ * fast/frames/seamless/seamless-srcdoc.html: Removed.
+
+2013-01-02 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r138611.
http://trac.webkit.org/changeset/138611
https://bugs.webkit.org/show_bug.cgi?id=105916
Deleted: trunk/LayoutTests/fast/frames/seamless/resources/span.html (138615 => 138616)
--- trunk/LayoutTests/fast/frames/seamless/resources/span.html 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/LayoutTests/fast/frames/seamless/resources/span.html 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1 +0,0 @@
-<span>This is a span.</span>
Modified: trunk/LayoutTests/fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt (138615 => 138616)
--- trunk/LayoutTests/fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1,4 +1,4 @@
This test ensures that content inside a seamless iframe does not inherit editability via the contenteditable attribute on a parent element, but does via a CSS rule that cascades into the frame.
PASS window.getComputedStyle(span).getPropertyCSSValue('-webkit-user-modify').cssText is "read-only"
-PASS window.getComputedStyle(p).getPropertyCSSValue('-webkit-user-modify').cssText is "read-write"
+FAIL window.getComputedStyle(p).getPropertyCSSValue('-webkit-user-modify').cssText should be read-write. Was read-only.
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc-expected.txt (138615 => 138616)
--- trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc-expected.txt 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc-expected.txt 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1,5 +0,0 @@
-This test ensures that content inside a seamless srcdoc iframe correctly inherits style, even if it doesn't set any styles of its own.
-PASS window.getComputedStyle(srcdocspan).getPropertyCSSValue('color').cssText is "rgb(255, 0, 0)"
-PASS window.getComputedStyle(srcdocstylespan).getPropertyCSSValue('color').cssText is "rgb(255, 0, 0)"
-PASS window.getComputedStyle(span).getPropertyCSSValue('color').cssText is "rgb(255, 0, 0)"
-
Deleted: trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc.html (138615 => 138616)
--- trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc.html 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/LayoutTests/fast/frames/seamless/seamless-srcdoc.html 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <script src=""
- <script>
- window._onload_ = function () {
- debug("This test ensures that content inside a seamless srcdoc iframe correctly inherits style, even if it doesn't set any styles of its own.");
-
- window.srcdocspan = document.getElementById("nostyle").contentDocument.querySelector('span');
- window.srcdocstylespan = document.getElementById("style").contentDocument.querySelector('span');
- window.span = document.querySelector('iframe[src]').contentDocument.querySelector('span');
-
- shouldBeEqualToString("window.getComputedStyle(srcdocspan).getPropertyCSSValue('color').cssText", "rgb(255, 0, 0)");
- shouldBeEqualToString("window.getComputedStyle(srcdocstylespan).getPropertyCSSValue('color').cssText", "rgb(255, 0, 0)");
- shouldBeEqualToString("window.getComputedStyle(span).getPropertyCSSValue('color').cssText", "rgb(255, 0, 0)");
- };
- </script>
- <style>
- span { color: red; }
- </style>
-</head>
-<body>
- <iframe id="nostyle" seamless srcdoc="<span>This is a span.</span>"></iframe>
- <iframe id="style" seamless srcdoc="<style></style><span>This is a span.</span>"></iframe>
- <iframe seamless src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (138615 => 138616)
--- trunk/Source/WebCore/ChangeLog 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/Source/WebCore/ChangeLog 2013-01-02 12:19:48 UTC (rev 138616)
@@ -1,5 +1,17 @@
2013-01-02 Sheriff Bot <webkit.review....@gmail.com>
+ Unreviewed, rolling out r138601.
+ http://trac.webkit.org/changeset/138601
+ https://bugs.webkit.org/show_bug.cgi?id=105917
+
+ Also not an optimal solution, needs more discussion.
+ (Requested by mkwst_ on #webkit).
+
+ * dom/Document.cpp:
+ (WebCore::Document::finishedParsing):
+
+2013-01-02 Sheriff Bot <webkit.review....@gmail.com>
+
Unreviewed, rolling out r138611.
http://trac.webkit.org/changeset/138611
https://bugs.webkit.org/show_bug.cgi?id=105916
Modified: trunk/Source/WebCore/dom/Document.cpp (138615 => 138616)
--- trunk/Source/WebCore/dom/Document.cpp 2013-01-02 12:07:11 UTC (rev 138615)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-01-02 12:19:48 UTC (rev 138616)
@@ -4384,12 +4384,6 @@
if (!m_documentTiming.domContentLoadedEventEnd)
m_documentTiming.domContentLoadedEventEnd = monotonicallyIncreasingTime();
- // Seamless iframes require a forced StyleResolver recalc in order to ensure that they
- // inherit style from their parent. Without this recalc, frames that don't define any of
- // their own styles won't discover that there's still work to be done.
- if (shouldDisplaySeamlesslyWithParent())
- styleResolverChanged(DeferRecalcStyle);
-
if (RefPtr<Frame> f = frame()) {
// FrameLoader::finishedParsing() might end up calling Document::implicitClose() if all
// resource loads are complete. HTMLObjectElements can start loading their resources from
