Changeset 148398 in webkit

Timestamp:

Apr 14, 2013 9:14:48 AM (11 years ago)

Author:

akling@apple.com

Message:

Move StylePropertySet::createImmutable() to ImmutableStylePropertySet.
<​http://webkit.org/b/114584>

Reviewed by Anders Carlsson.

StylePropertySet::createImmutable() -> ImmutableStylePropertySet::create()
Also, immutableCopyIfNeeded() now returns a PassRefPtr<ImmutableStylePropertySet>.

• css/CSSParser.cpp:

(WebCore::CSSParser::createStylePropertySet):

• css/StylePropertySet.cpp:

(WebCore::ImmutableStylePropertySet::create):
(WebCore::StylePropertySet::immutableCopyIfNeeded):

• css/StylePropertySet.h:

(StylePropertySet):
(ImmutableStylePropertySet):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)
• css/StylePropertySet.cpp (modified) (2 diffs)
• css/StylePropertySet.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-14  Andreas Kling  <akling@apple.com>
+
+        Move StylePropertySet::createImmutable() to ImmutableStylePropertySet.
+        <http://webkit.org/b/114584>
+
+        Reviewed by Anders Carlsson.
+
+        StylePropertySet::createImmutable() -> ImmutableStylePropertySet::create()
+        Also, immutableCopyIfNeeded() now returns a PassRefPtr<ImmutableStylePropertySet>.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createStylePropertySet):
+        * css/StylePropertySet.cpp:
+        (WebCore::ImmutableStylePropertySet::create):
+        (WebCore::StylePropertySet::immutableCopyIfNeeded):
+        * css/StylePropertySet.h:
+        (StylePropertySet):
+        (ImmutableStylePropertySet):
+
 2013-04-14  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -1561 +1561 @@
         results.remove(0, unusedEntries);
 
-    return StylePropertySet::createImmutable(results.data(), results.size(), m_context.mode);
+    return ImmutableStylePropertySet::create(results.data(), results.size(), m_context.mode);
 }
 

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -69 +69 @@
 }
 
-PassRefPtr<StylePropertySet> StylePropertySet::createImmutable(const CSSProperty* properties, unsigned count, CSSParserMode cssParserMode)
+PassRefPtr<ImmutableStylePropertySet> ImmutableStylePropertySet::create(const CSSProperty* properties, unsigned count, CSSParserMode cssParserMode)
 {
     void* slot = WTF::fastMalloc(sizeForImmutableStylePropertySetWithPropertyCount(count));
@@ -75 +75 @@
 }
 
-PassRefPtr<StylePropertySet> StylePropertySet::immutableCopyIfNeeded() const
+PassRefPtr<ImmutableStylePropertySet> StylePropertySet::immutableCopyIfNeeded() const
 {
     if (!isMutable())
-        return const_cast<StylePropertySet*>(this);
-    return createImmutable(mutablePropertyVector().data(), mutablePropertyVector().size(), cssParserMode());
+        return static_cast<ImmutableStylePropertySet*>(const_cast<StylePropertySet*>(this));
+    return ImmutableStylePropertySet::create(mutablePropertyVector().data(), mutablePropertyVector().size(), cssParserMode());
 }
 

trunk/Source/WebCore/css/StylePropertySet.h

@@ -51 +51 @@
     void deref();
 
-    static PassRefPtr<StylePropertySet> createImmutable(const CSSProperty* properties, unsigned count, CSSParserMode);
-
     class PropertyReference {
     public:
@@ -134 +132 @@
 
     PassRefPtr<MutableStylePropertySet> mutableCopy() const;
-    PassRefPtr<StylePropertySet> immutableCopyIfNeeded() const;
+    PassRefPtr<ImmutableStylePropertySet> immutableCopyIfNeeded() const;
 
     void removeEquivalentProperties(const StylePropertySet*);
@@ -207 +205 @@
 class ImmutableStylePropertySet : public StylePropertySet {
 public:
+    ~ImmutableStylePropertySet();
+    static PassRefPtr<ImmutableStylePropertySet> create(const CSSProperty* properties, unsigned count, CSSParserMode);
+
+    void* m_storage;
+
+private:
     ImmutableStylePropertySet(const CSSProperty*, unsigned count, CSSParserMode);
-    ~ImmutableStylePropertySet();
-
-    void* m_storage;
 };