Changeset 98861 in webkit

Timestamp:

Oct 31, 2011 10:02:49 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

CSSRule: Devirtualize insertedIntoParent()
​https://bugs.webkit.org/show_bug.cgi?id=71223

Reviewed by Antti Koivisto.

Moved insertedIntoParent() down into CSSImportRule and renamed it to
requestStyleSheet(). CSSImportRule is the only user of this function.

• css/CSSImportRule.cpp:

(WebCore::CSSImportRule::requestStyleSheet):

• css/CSSImportRule.h:
• css/CSSRule.h:
• css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::append):
(WebCore::CSSStyleSheet::insertRule):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSImportRule.cpp (modified) (1 diff)
• css/CSSImportRule.h (modified) (1 diff)
• css/CSSRule.h (modified) (1 diff)
• css/CSSStyleSheet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-31  Andreas Kling  <kling@webkit.org>
+
+        CSSRule: Devirtualize insertedIntoParent()
+        https://bugs.webkit.org/show_bug.cgi?id=71223
+
+        Reviewed by Antti Koivisto.
+
+        Moved insertedIntoParent() down into CSSImportRule and renamed it to
+        requestStyleSheet(). CSSImportRule is the only user of this function.
+
+        * css/CSSImportRule.cpp:
+        (WebCore::CSSImportRule::requestStyleSheet):
+        * css/CSSImportRule.h:
+        * css/CSSRule.h:
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::append):
+        (WebCore::CSSStyleSheet::insertRule):
+
 2011-10-31  Anna Cavender  <annacc@chromium.org>
 

trunk/Source/WebCore/css/CSSImportRule.cpp

@@ -110 +110 @@
 }
 
-void CSSImportRule::insertedIntoParent()
+void CSSImportRule::requestStyleSheet()
 {
     CSSStyleSheet* parentSheet = parentStyleSheet();

trunk/Source/WebCore/css/CSSImportRule.h

@@ -55 +55 @@
     virtual void addSubresourceStyleURLs(ListHashSet<KURL>& urls);
 
+    void requestStyleSheet();
+
 private:
     CSSImportRule(CSSStyleSheet* parent, const String& href, PassRefPtr<MediaList>);
-
-    virtual void insertedIntoParent();
 
     // from CachedResourceClient

trunk/Source/WebCore/css/CSSRule.h

@@ -97 +97 @@
     virtual void addSubresourceStyleURLs(ListHashSet<KURL>&) { }
 
-    virtual void insertedIntoParent() { }
-
     KURL baseURL() const
     {

trunk/Source/WebCore/css/CSSStyleSheet.cpp

@@ -89 +89 @@
     CSSRule* c = child.get();
     m_children.append(child);
-    c->insertedIntoParent();
+    if (c->isImportRule())
+        static_cast<CSSImportRule*>(c)->requestStyleSheet();
 }
 
@@ -137 +138 @@
     CSSRule* c = r.get();
     m_children.insert(index, r.release());
-    c->insertedIntoParent();
+    if (c->isImportRule())
+        static_cast<CSSImportRule*>(c)->requestStyleSheet();
 
     styleSheetChanged();