Changeset 115860 in webkit

Timestamp:

May 2, 2012 12:05:31 PM (12 years ago)

Author:

Antti Koivisto

Message:

Move title and media queries from StyleSheetInternal to CSSStyleSheet
​https://bugs.webkit.org/show_bug.cgi?id=85387

Reviewed by Anders Carlsson.

Stylesheet title and media queries are determined by the owner, not by the stylesheet itself.
The fields belong to CSSStyleSheet.

This will make it easier to share StyleSheetInternal instances between documents.

• css/CSSStyleSheet.cpp:

(WebCore::StyleSheetInternal::StyleSheetInternal):
(WebCore::StyleSheetInternal::isCacheable):
(WebCore):
(WebCore::CSSStyleSheet::setDisabled):

Invalidate the document style directly instead of ping-ponging through StyleSheetInternal.

(WebCore::CSSStyleSheet::setMediaQueries):
(WebCore::CSSStyleSheet::media):

• css/CSSStyleSheet.h:

(StyleSheetInternal):
(WebCore::StyleSheetInternal::originalURL):
(WebCore::StyleSheetInternal::hasCharsetRule):
(WebCore::CSSStyleSheet::mediaQueries):
(CSSStyleSheet):
(WebCore::CSSStyleSheet::setTitle):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::appendAuthorStylesheets):
(WebCore::StyleResolver::collectMatchingRulesForList):

• dom/DOMImplementation.cpp:

(WebCore::DOMImplementation::createCSSStyleSheet):

• dom/ProcessingInstruction.cpp:

(WebCore::ProcessingInstruction::setCSSStyleSheet):

• dom/StyleElement.cpp:

(WebCore::StyleElement::createSheet):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::parseAttribute):
(WebCore::HTMLLinkElement::setCSSStyleSheet):

• html/HTMLStyleElement.cpp:

(WebCore::HTMLStyleElement::parseAttribute):

• svg/SVGStyleElement.cpp:

(WebCore::SVGStyleElement::parseAttribute):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSheet.cpp (modified) (4 diffs)
• css/CSSStyleSheet.h (modified) (8 diffs)
• css/StyleResolver.cpp (modified) (2 diffs)
• dom/DOMImplementation.cpp (modified) (1 diff)
• dom/ProcessingInstruction.cpp (modified) (2 diffs)
• dom/StyleElement.cpp (modified) (1 diff)
• html/HTMLLinkElement.cpp (modified) (3 diffs)
• html/HTMLStyleElement.cpp (modified) (2 diffs)
• svg/SVGStyleElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-02  Antti Koivisto  <antti@apple.com>
+
+        Move title and media queries from StyleSheetInternal to CSSStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=85387
+
+        Reviewed by Anders Carlsson.
+
+        Stylesheet title and media queries are determined by the owner, not by the stylesheet itself.
+        The fields belong to CSSStyleSheet.
+        
+        This will make it easier to share StyleSheetInternal instances between documents.
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::StyleSheetInternal::StyleSheetInternal):
+        (WebCore::StyleSheetInternal::isCacheable):
+        (WebCore):
+        (WebCore::CSSStyleSheet::setDisabled):
+        
+            Invalidate the document style directly instead of ping-ponging through StyleSheetInternal.
+
+        (WebCore::CSSStyleSheet::setMediaQueries):
+        (WebCore::CSSStyleSheet::media):
+        * css/CSSStyleSheet.h:
+        (StyleSheetInternal):
+        (WebCore::StyleSheetInternal::originalURL):
+        (WebCore::StyleSheetInternal::hasCharsetRule):
+        (WebCore::CSSStyleSheet::mediaQueries):
+        (CSSStyleSheet):
+        (WebCore::CSSStyleSheet::setTitle):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::appendAuthorStylesheets):
+        (WebCore::StyleResolver::collectMatchingRulesForList):
+        * dom/DOMImplementation.cpp:
+        (WebCore::DOMImplementation::createCSSStyleSheet):
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::setCSSStyleSheet):
+        * dom/StyleElement.cpp:
+        (WebCore::StyleElement::createSheet):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::parseAttribute):
+        (WebCore::HTMLLinkElement::setCSSStyleSheet):
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::parseAttribute):
+        * svg/SVGStyleElement.cpp:
+        (WebCore::SVGStyleElement::parseAttribute):
+
 2012-05-02  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/css/CSSStyleSheet.cpp

@@ -110 +110 @@
     , m_originalURL(o.m_originalURL)
     , m_finalURL(o.m_finalURL)
-    , m_title(o.m_title)
     , m_encodingFromCharsetRule(o.m_encodingFromCharsetRule)
     , m_importRules(o.m_importRules.size())
     , m_childRules(o.m_childRules.size())
     , m_namespaces(o.m_namespaces)
-    , m_mediaQueries(o.m_mediaQueries ? o.m_mediaQueries->copy() : 0)
     , m_loadCompleted(true)
     , m_isUserStyleSheet(o.m_isUserStyleSheet)
@@ -416 +414 @@
     Node* ownerNode = singleOwnerNode();
     return ownerNode ? ownerNode->document() : 0;
-}
-
-void StyleSheetInternal::setMediaQueries(PassRefPtr<MediaQuerySet> mediaQueries)
-{
-    m_mediaQueries = mediaQueries;
 }
 
@@ -526 +519 @@
     if (disabled == m_isDisabled)
         return;
-    m_isDisabled = disabled; 
-    m_internal->styleSheetChanged();
+    m_isDisabled = disabled;
+    Document* owner = ownerDocument();
+    if (owner)
+        owner->styleResolverChanged(DeferRecalcStyle);
+}
+
+void CSSStyleSheet::setMediaQueries(PassRefPtr<MediaQuerySet> mediaQueries)
+{
+    m_mediaQueries = mediaQueries;
 }
 
@@ -640 +640 @@
 MediaList* CSSStyleSheet::media() const 
 { 
-    if (!m_internal->mediaQueries())
-        return 0;
+    if (!m_mediaQueries)
+        return 0;
+
     if (!m_mediaCSSOMWrapper)
-        m_mediaCSSOMWrapper = MediaList::create(m_internal->mediaQueries(), const_cast<CSSStyleSheet*>(this));
+        m_mediaCSSOMWrapper = MediaList::create(m_mediaQueries.get(), const_cast<CSSStyleSheet*>(this));
     return m_mediaCSSOMWrapper.get();
 }

trunk/Source/WebCore/css/CSSStyleSheet.h

@@ -106 +106 @@
     const Vector<RefPtr<StyleRuleImport> >& importRules() const { return m_importRules; }
 
-    MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }
-    void setMediaQueries(PassRefPtr<MediaQuerySet>);
-
     void notifyLoadedSheet(const CachedCSSStyleSheet*);
     
@@ -119 +116 @@
     // the JavaScript binding (which needs to use this value for security).
     String originalURL() const { return m_originalURL; }
-    String title() const { return m_title; }
-    void setTitle(const String& title) { m_title = title; }
     
     const KURL& finalURL() const { return m_finalURL; }
@@ -147 +142 @@
     void clearCharsetRule();
     bool hasCharsetRule() const { return !m_encodingFromCharsetRule.isNull(); }
-    
-    void updateBaseURL();
 
     StyleRuleImport* m_ownerRule;
@@ -154 +147 @@
     String m_originalURL;
     KURL m_finalURL;
-    String m_title;
 
     String m_encodingFromCharsetRule;
@@ -161 +153 @@
     typedef HashMap<AtomicString, AtomicString> PrefixNamespaceURIMap;
     PrefixNamespaceURIMap m_namespaces;
-    RefPtr<MediaQuerySet> m_mediaQueries;
 
     bool m_loadCompleted : 1;
@@ -193 +184 @@
     virtual MediaList* media() const OVERRIDE;
     virtual String href() const OVERRIDE { return m_internal->originalURL(); }  
-    virtual String title() const OVERRIDE { return m_internal->title(); }
+    virtual String title() const OVERRIDE { return m_title; }
     virtual bool disabled() const OVERRIDE { return m_isDisabled; }
     virtual void setDisabled(bool) OVERRIDE;
@@ -219 +210 @@
     void styleSheetChanged() { m_internal->styleSheetChanged(); }
     Document* ownerDocument() const;
+    MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }
+    void setMediaQueries(PassRefPtr<MediaQuerySet>);
+    void setTitle(const String& title) { m_title = title; }
     
     void clearChildRuleCSSOMWrappers();
@@ -233 +227 @@
     RefPtr<StyleSheetInternal> m_internal;
     bool m_isDisabled;
+    String m_title;
+    RefPtr<MediaQuerySet> m_mediaQueries;
 
     Node* m_ownerNode;

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -505 +505 @@
     unsigned size = stylesheets.size();
     for (unsigned i = firstNew; i < size; ++i) {
-        if (!stylesheets[i]->isCSSStyleSheet() || stylesheets[i]->disabled())
+        if (!stylesheets[i]->isCSSStyleSheet())
             continue;
         CSSStyleSheet* cssSheet = static_cast<CSSStyleSheet*>(stylesheets[i].get());
+        if (cssSheet->disabled())
+            continue;
+        if (cssSheet->mediaQueries() && !m_medium->eval(cssSheet->mediaQueries(), this))
+            continue;
         StyleSheetInternal* sheet = cssSheet->internal();
 #if ENABLE(STYLE_SCOPED)
@@ -2479 +2483 @@
 {
     ASSERT(sheet);
-
-    // No media implies "all", but if a media list exists it must
-    // contain our current medium
-    if (sheet->mediaQueries() && !medium.eval(sheet->mediaQueries(), styleSelector))
-        return; // the style sheet doesn't apply
     
     const Vector<RefPtr<StyleRuleImport> >& importRules = sheet->importRules();

trunk/Source/WebCore/dom/DOMImplementation.cpp

@@ -308 +308 @@
     // FIXME: Title should be set.
     // FIXME: Media could have wrong syntax, in which case we should generate an exception.
-    RefPtr<StyleSheetInternal> sheet = StyleSheetInternal::create();
+    RefPtr<CSSStyleSheet> sheet = CSSStyleSheet::create(StyleSheetInternal::create());
     sheet->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(media));
-    return CSSStyleSheet::create(sheet);
+    return sheet;
 }
 

trunk/Source/WebCore/dom/ProcessingInstruction.cpp

@@ -213 +213 @@
     ASSERT(m_isCSS);
     CSSParserContext parserContext(document(), baseURL, charset);
+
     RefPtr<StyleSheetInternal> newSheet = StyleSheetInternal::create(href, baseURL, parserContext);
-    m_sheet = CSSStyleSheet::create(newSheet, this);
+
+    RefPtr<CSSStyleSheet> cssSheet = CSSStyleSheet::create(newSheet, this);
+    cssSheet->setDisabled(m_alternate);
+    cssSheet->setTitle(m_title);
+    cssSheet->setMediaQueries(MediaQuerySet::create(m_media));
+
+    m_sheet = cssSheet.release();
+
     // We don't need the cross-origin security check here because we are
     // getting the sheet text in "strict" mode. This enforces a valid CSS MIME
     // type.
-    newSheet->setTitle(m_title);
-    newSheet->setMediaQueries(MediaQuerySet::create(m_media));
-    m_sheet->setDisabled(m_alternate);
-
     parseStyleSheet(sheet->sheetText(true));
 }
@@ -262 +266 @@
     ASSERT(!m_loading);
     m_sheet = sheet;
-    sheet->internal()->setTitle(m_title);
+    sheet->setTitle(m_title);
     sheet->setDisabled(m_alternate);
 }

trunk/Source/WebCore/dom/StyleElement.cpp

@@ -171 +171 @@
 
             m_sheet = CSSStyleSheet::createInline(e, KURL(), document->inputEncoding());
-            RefPtr<StyleSheetInternal> styleSheet = m_sheet->internal();
-
-            styleSheet->parseStringAtLine(text, startLineNumber);
-            styleSheet->setMediaQueries(mediaQueries.release());
-            styleSheet->setTitle(e->title());
+            m_sheet->setMediaQueries(mediaQueries.release());
+            m_sheet->setTitle(e->title());
+    
+            m_sheet->internal()->parseStringAtLine(text, startLineNumber);
+
             m_loading = false;
         }

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -156 +156 @@
     else {
         if (attr->name() == titleAttr && m_sheet)
-            m_sheet->internal()->setTitle(attr->value());
+            m_sheet->setTitle(attr->value());
         HTMLElement::parseAttribute(attr);
     }
@@ -303 +303 @@
         ASSERT(!restoredSheet->isLoading());
 
-        // restoreParsedStyleSheet() currently returns a copy so it is ok to mutate the queries and the title like this.
-        RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescriptionSyntax(m_media);
-        restoredSheet->setMediaQueries(media.release());
-        restoredSheet->setTitle(title());
-
         m_sheet = CSSStyleSheet::create(restoredSheet, this);
+        m_sheet->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(m_media));
+        m_sheet->setTitle(title());
+
         m_loading = false;
         sheetLoaded();
@@ -316 +314 @@
 
     RefPtr<StyleSheetInternal> styleSheet = StyleSheetInternal::create(href, baseURL, parserContext);
+
     m_sheet = CSSStyleSheet::create(styleSheet, this);
+    m_sheet->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(m_media));
+    m_sheet->setTitle(title());
 
     styleSheet->parseAuthorStyleSheet(cachedStyleSheet, document()->securityOrigin());
-
-    RefPtr<MediaQuerySet> media = MediaQuerySet::createAllowingDescriptionSyntax(m_media);
-    styleSheet->setMediaQueries(media.release());
-    styleSheet->setTitle(title());
 
     m_loading = false;

trunk/Source/WebCore/html/HTMLStyleElement.cpp

@@ -74 +74 @@
 {
     if (attr->name() == titleAttr && m_sheet)
-        m_sheet->internal()->setTitle(attr->value());
+        m_sheet->setTitle(attr->value());
     else if (attr->name() == onloadAttr)
         setAttributeEventListener(eventNames().loadEvent, createAttributeEventListener(this, attr));
@@ -85 +85 @@
         else if (attr->isNull() && m_isRegisteredWithScopingNode)
             unregisterWithScopingNode();
-
     }
 #endif

trunk/Source/WebCore/svg/SVGStyleElement.cpp

@@ -119 +119 @@
     if (attr->name() == SVGNames::titleAttr) {
         if (m_sheet)
-            m_sheet->internal()->setTitle(attr->value());
+            m_sheet->setTitle(attr->value());
         return;
     }