Changeset 154284 in webkit

Timestamp:

Aug 19, 2013, 10:42:47 AM (12 years ago)

Author:

Antti Koivisto

Message:

<​https://webkit.org/b/120014> REGRESSION(r154268): Some stylesheet media attribute tests failing

Reviewed by Dan Bernstein.

• html/HTMLStyleElement.cpp:

(WebCore::HTMLStyleElement::parseAttribute): Always set the media on InlineStyleSheetOwner.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLStyleElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-19  Antti Koivisto  <antti@apple.com>
+
+        <https://webkit.org/b/120014> REGRESSION(r154268): Some stylesheet media attribute tests failing
+
+        Reviewed by Dan Bernstein.
+
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::parseAttribute): Always set the media on InlineStyleSheetOwner.
+
 2013-08-19  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/html/HTMLStyleElement.cpp

@@ -77 +77 @@
     else if (name == scopedAttr && ContextFeatures::styleScopedEnabled(document()))
         scopedAttributeChanged(!value.isNull());
-    else if (name == mediaAttr && inDocument() && document()->renderer() && sheet()) {
+    else if (name == mediaAttr) {
         m_styleSheetOwner.setMedia(value);
-        sheet()->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(value));
-        document()->styleResolverChanged(RecalcStyleImmediately);
+        if (sheet()) {
+            sheet()->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(value));
+            if (inDocument() && document()->renderer())
+                document()->styleResolverChanged(RecalcStyleImmediately);
+        }
     } else if (name == typeAttr)
         m_styleSheetOwner.setContentType(value);