Changeset 207695 in webkit

Timestamp:

Oct 21, 2016 2:07:44 PM (7 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Make sure shadow user agent sheets parse in UASheetMode
​https://bugs.webkit.org/show_bug.cgi?id=163810

Reviewed by Dean Jackson.

• dom/InlineStyleSheetOwner.cpp:

(WebCore::parserContextForElement):
(WebCore::makeInlineStyleSheetCacheKey):
(WebCore::InlineStyleSheetOwner::createSheet):
(WebCore::parserContextForForElement): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/InlineStyleSheetOwner.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-21  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Make sure shadow user agent sheets parse in UASheetMode
+        https://bugs.webkit.org/show_bug.cgi?id=163810
+
+        Reviewed by Dean Jackson.
+
+        * dom/InlineStyleSheetOwner.cpp:
+        (WebCore::parserContextForElement):
+        (WebCore::makeInlineStyleSheetCacheKey):
+        (WebCore::InlineStyleSheetOwner::createSheet):
+        (WebCore::parserContextForForElement): Deleted.
+
 2016-10-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

@@ -45 +45 @@
 }
 
-static CSSParserContext parserContextForForElement(const Element& element)
+static CSSParserContext parserContextForElement(const Element& element)
 {
     auto* shadowRoot = element.containingShadowRoot();
@@ -51 +51 @@
     auto& baseURL = shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent ? blankURL() : element.document().baseURL();
 
-    return CSSParserContext { element.document(), baseURL, element.document().encoding() };
+    CSSParserContext result = CSSParserContext { element.document(), baseURL, element.document().encoding() };
+    if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
+        result.mode = UASheetMode;
+    return result;
 }
 
@@ -61 +64 @@
         return { };
 
-    return std::make_pair(text, parserContextForForElement(element));
+    return std::make_pair(text, parserContextForElement(element));
 }
 
@@ -198 +201 @@
     m_loading = true;
 
-    auto contents = StyleSheetContents::create(String(), parserContextForForElement(element));
+    auto contents = StyleSheetContents::create(String(), parserContextForElement(element));
 
     m_sheet = CSSStyleSheet::createInline(contents.get(), element, m_startTextPosition);