Changeset 101972 in webkit

Timestamp:

Dec 4, 2011, 9:44:02 PM (15 years ago)

Author:

kling@webkit.org

Message:

CSSStyleSheet can't be reparented, enforce this at compile time.
<​http://webkit.org/b/73793>

Reviewed by Benjamin Poulain.

• css/StyleSheet.h:

(WebCore::StyleSheet::clearOwnerRule):

Changed setParentRule(CSSImportRule*) to clearOwnerRule() to document and
enforce the fact that style sheets should never be reparented after creation.

(WebCore::StyleSheet::ownerRule):

Renamed parentRule() to ownerRule() to match the CSSOM name.

(WebCore::StyleSheet::ownerNode):
(WebCore::StyleSheet::clearOwnerNode):

Also renamed StyleSheet::m_parentNode to m_ownerNode to match its accessors.

• css/CSSStyleSheet.h:

Removed ownerRule() as we now inherit it from StyleSheet.

• bindings/js/JSDOMBinding.h:

(WebCore::root):

• css/CSSImportRule.cpp:

(WebCore::CSSImportRule::~CSSImportRule):
(WebCore::CSSImportRule::setCSSStyleSheet):

• css/StyleSheet.cpp:

(WebCore::StyleSheet::StyleSheet):
(WebCore::StyleSheet::parentStyleSheet):
(WebCore::StyleSheet::baseURL):

• inspector/InspectorStyleSheet.cpp:

(WebCore::fillMediaListChain):

Update call sites to use the new names.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (1 diff)
• css/CSSImportRule.cpp (modified) (2 diffs)
• css/CSSStyleSheet.h (modified) (1 diff)
• css/StyleSheet.cpp (modified) (4 diffs)
• css/StyleSheet.h (modified) (2 diffs)
• inspector/InspectorStyleSheet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-04  Andreas Kling  <kling@webkit.org>
+
+        CSSStyleSheet can't be reparented, enforce this at compile time.
+        <http://webkit.org/b/73793>
+
+        Reviewed by Benjamin Poulain.
+
+        * css/StyleSheet.h:
+        (WebCore::StyleSheet::clearOwnerRule):
+
+            Changed setParentRule(CSSImportRule*) to clearOwnerRule() to document and
+            enforce the fact that style sheets should never be reparented after creation.
+
+        (WebCore::StyleSheet::ownerRule):
+
+            Renamed parentRule() to ownerRule() to match the CSSOM name.
+
+        (WebCore::StyleSheet::ownerNode):
+        (WebCore::StyleSheet::clearOwnerNode):
+
+            Also renamed StyleSheet::m_parentNode to m_ownerNode to match its accessors.
+
+        * css/CSSStyleSheet.h:
+
+            Removed ownerRule() as we now inherit it from StyleSheet.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::root):
+        * css/CSSImportRule.cpp:
+        (WebCore::CSSImportRule::~CSSImportRule):
+        (WebCore::CSSImportRule::setCSSStyleSheet):
+        * css/StyleSheet.cpp:
+        (WebCore::StyleSheet::StyleSheet):
+        (WebCore::StyleSheet::parentStyleSheet):
+        (WebCore::StyleSheet::baseURL):
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::fillMediaListChain):
+
+            Update call sites to use the new names.
+
 2011-12-04  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -195 +195 @@
     inline void* root(StyleSheet* styleSheet)
     {
-        if (styleSheet->parentRule())
-            return root(styleSheet->parentRule());
+        if (styleSheet->ownerRule())
+            return root(styleSheet->ownerRule());
         if (styleSheet->ownerNode())
             return root(styleSheet->ownerNode());

trunk/Source/WebCore/css/CSSImportRule.cpp

@@ -51 +51 @@
         m_lstMedia->setParentStyleSheet(0);
     if (m_styleSheet)
-        m_styleSheet->setParentRule(0);
+        m_styleSheet->clearOwnerRule();
     if (m_cachedSheet)
         m_cachedSheet->removeClient(&m_styleSheetClient);
@@ -59 +59 @@
 {
     if (m_styleSheet)
-        m_styleSheet->setParentRule(0);
+        m_styleSheet->clearOwnerRule();
     m_styleSheet = CSSStyleSheet::create(this, href, baseURL, charset);
 

trunk/Source/WebCore/css/CSSStyleSheet.h

@@ -67 +67 @@
     }
 
-    CSSImportRule* ownerRule() const { return parentRule(); }
     PassRefPtr<CSSRuleList> cssRules(bool omitCharsetRules = false);
     unsigned insertRule(const String& rule, unsigned index, ExceptionCode&);

trunk/Source/WebCore/css/StyleSheet.cpp

@@ -31 +31 @@
 StyleSheet::StyleSheet(Node* parentNode, const String& originalURL, const KURL& finalURL)
     : m_disabled(false)
-    , m_parentRule(0)
-    , m_parentNode(parentNode)
+    , m_ownerRule(0)
+    , m_ownerNode(parentNode)
     , m_originalURL(originalURL)
     , m_finalURL(finalURL)
@@ -40 +40 @@
 StyleSheet::StyleSheet(CSSImportRule* parentRule, const String& originalURL, const KURL& finalURL)
     : m_disabled(false)
-    , m_parentRule(parentRule)
-    , m_parentNode(0)
+    , m_ownerRule(parentRule)
+    , m_ownerNode(0)
     , m_originalURL(originalURL)
     , m_finalURL(finalURL)
@@ -56 +56 @@
 {
     ASSERT(isCSSStyleSheet());
-    return m_parentRule ? m_parentRule->parentStyleSheet() : 0;
+    return m_ownerRule ? m_ownerRule->parentStyleSheet() : 0;
 }
 
@@ -77 +77 @@
     if (StyleSheet* parentSheet = parentStyleSheet())
         return parentSheet->baseURL();
-    if (!m_parentNode)
+    if (!m_ownerNode)
         return KURL();
-    return m_parentNode->document()->baseURL();
+    return m_ownerNode->document()->baseURL();
 }
 

trunk/Source/WebCore/css/StyleSheet.h

@@ -40 +40 @@
     void setDisabled(bool);
 
-    Node* ownerNode() const { return m_parentNode; }
-    void clearOwnerNode() { m_parentNode = 0; }
+    Node* ownerNode() const { return m_ownerNode; }
+    void clearOwnerNode() { m_ownerNode = 0; }
+
+    CSSImportRule* ownerRule() const { return m_ownerRule; }
+    void clearOwnerRule() { m_ownerRule = 0; }
 
     StyleSheet* parentStyleSheet() const;
-
-    CSSImportRule* parentRule() const { return m_parentRule; }
-    void setParentRule(CSSImportRule* rule) { m_parentRule = rule; }
 
     // Note that href is the URL that started the redirect chain that led to
@@ -77 +77 @@
 private:
     bool m_disabled;
-    CSSImportRule* m_parentRule;
-    Node* m_parentNode;
+    CSSImportRule* m_ownerRule;
+    Node* m_ownerNode;
     String m_originalURL;
     KURL m_finalURL;

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -213 +213 @@
                     mediaArray->pushObject(buildMediaObject(mediaList, styleSheet->ownerNode() ? MediaListSourceLinkedSheet : MediaListSourceInlineSheet, sourceURL));
                 }
-                parentRule = styleSheet->parentRule();
+                parentRule = styleSheet->ownerRule();
                 if (parentRule)
                     break;