Changeset 138704 in webkit

Timestamp:

Jan 3, 2013 1:13:50 AM (11 years ago)

Author:

mkwst@chromium.org

Message:

seamless iframes don't inherit styles when srcdoc is used
​https://bugs.webkit.org/show_bug.cgi?id=103539

Reviewed by Antti Koivisto.

Source/WebCore:

Seamless iframes populated via a 'srcdoc' attribute should always
inherit styles from their parent documents. At the moment, this is
only the case when they contain a stylesheet or some other markup
that forces a style recalculation on the document. Simple 'srcdoc'
attributes (e.g. "srcdoc='<p>This is a comment.</p>'") bail out of
recalculating style early, resulting in unstyled appearance.

This patch instructs WebCore to treat seamless documents as having an
updated StyleResolver regardless of what actions the parser takes,
which in turn ensures that the document's style is recalculated
correctly.

Test: fast/frames/seamless/seamless-srcdoc.html

• dom/Document.cpp:

(WebCore::Document::implicitOpen):

If it's a seamless document, notify it that its StyleResolver isn't
what it might have expected.

LayoutTests:

• fast/frames/seamless/resources/span.html: Added.
• fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt:

Updating the previously failing expectation.

• fast/frames/seamless/seamless-srcdoc-expected.txt: Added.
• fast/frames/seamless/seamless-srcdoc.html: Added.

Exciting new test to ensure that this doesn't regress, neither
for totally simple srcdoc attriubtes, nor for slightly more
complex variations.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/frames/seamless/resources/span.html (added)
• LayoutTests/fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt (modified) (1 diff)
• LayoutTests/fast/frames/seamless/seamless-srcdoc-expected.txt (added)
• LayoutTests/fast/frames/seamless/seamless-srcdoc.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-03  Mike West  <mkwst@chromium.org>
+
+        seamless iframes don't inherit styles when srcdoc is used
+        https://bugs.webkit.org/show_bug.cgi?id=103539
+
+        Reviewed by Antti Koivisto.
+
+        * fast/frames/seamless/resources/span.html: Added.
+        * fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt:
+            Updating the previously failing expectation.
+        * fast/frames/seamless/seamless-srcdoc-expected.txt: Added.
+        * fast/frames/seamless/seamless-srcdoc.html: Added.
+            Exciting new test to ensure that this doesn't regress, neither
+            for totally simple srcdoc attriubtes, nor for slightly more
+            complex variations.
+
 2013-01-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/fast/frames/seamless/seamless-contenteditable-not-inherited-expected.txt

@@ -1 +1 @@
 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"
-FAIL window.getComputedStyle(p).getPropertyCSSValue('-webkit-user-modify').cssText should be read-write. Was read-only.
+PASS window.getComputedStyle(p).getPropertyCSSValue('-webkit-user-modify').cssText is "read-write"
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-03  Mike West  <mkwst@chromium.org>
+
+        seamless iframes don't inherit styles when srcdoc is used
+        https://bugs.webkit.org/show_bug.cgi?id=103539
+
+        Reviewed by Antti Koivisto.
+
+        Seamless iframes populated via a 'srcdoc' attribute should always
+        inherit styles from their parent documents. At the moment, this is
+        only the case when they contain a stylesheet or some other markup
+        that forces a style recalculation on the document. Simple 'srcdoc'
+        attributes (e.g. "srcdoc='<p>This is a comment.</p>'") bail out of
+        recalculating style early, resulting in unstyled appearance.
+
+        This patch instructs WebCore to treat seamless documents as having an
+        updated StyleResolver regardless of what actions the parser takes,
+        which in turn ensures that the document's style is recalculated
+        correctly.
+
+        Test: fast/frames/seamless/seamless-srcdoc.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitOpen):
+            If it's a seamless document, notify it that its StyleResolver isn't
+            what it might have expected.
+
 2013-01-03  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2255 +2255 @@
     setCompatibilityMode(NoQuirksMode);
 
+    // Documents rendered seamlessly should start out requiring a stylesheet
+    // collection update in order to ensure they inherit all the relevant data
+    // from their parent.
+    if (shouldDisplaySeamlesslyWithParent())
+        styleResolverChanged(DeferRecalcStyle);
+
     m_parser = createParser();
     setParsing(true);