Title: [154284] trunk/Source/WebCore
- Revision
- 154284
- Author
- [email protected]
- Date
- 2013-08-19 10:42:47 -0700 (Mon, 19 Aug 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154283 => 154284)
--- trunk/Source/WebCore/ChangeLog 2013-08-19 17:31:27 UTC (rev 154283)
+++ trunk/Source/WebCore/ChangeLog 2013-08-19 17:42:47 UTC (rev 154284)
@@ -1,3 +1,12 @@
+2013-08-19 Antti Koivisto <[email protected]>
+
+ <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 <[email protected]>
<https://webkit.org/b/119916> AX: WebKit is not exposing AXLanguage correctly
Modified: trunk/Source/WebCore/html/HTMLStyleElement.cpp (154283 => 154284)
--- trunk/Source/WebCore/html/HTMLStyleElement.cpp 2013-08-19 17:31:27 UTC (rev 154283)
+++ trunk/Source/WebCore/html/HTMLStyleElement.cpp 2013-08-19 17:42:47 UTC (rev 154284)
@@ -76,10 +76,13 @@
sheet()->setTitle(value);
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);
else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
