Changeset 175648 in webkit

Timestamp:

Nov 5, 2014 4:16:27 PM (9 years ago)

Author:

Chris Dumez

Message:

Allow constructing a PassRef from a Ref
​https://bugs.webkit.org/show_bug.cgi?id=138389

Reviewed by Andreas Kling.

Source/WebCore:

Remove calls to Ref::get() now that a PassRef can be directly
constructed from a Ref.

No new tests, no behavior change.

• css/CSSValuePool.cpp:

(WebCore::CSSValuePool::createColorValue):

• css/CSSValuePool.h:

(WebCore::CSSValuePool::createInheritedValue):
(WebCore::CSSValuePool::createImplicitInitialValue):
(WebCore::CSSValuePool::createExplicitInitialValue):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::setCSSStyleSheet):

Source/WTF:

Allow constructing a PassRef from a Ref, similarly to PassRefPtr that
can be constructed from a RefPtr already. This avoids having to call
Ref::get() and simplifies the code a bit.

• wtf/PassRef.h:

(WTF::PassRef<T>::PassRef):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PassRef.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSValuePool.cpp (modified) (1 diff)
• WebCore/css/CSSValuePool.h (modified) (1 diff)
• WebCore/html/HTMLLinkElement.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Allow constructing a PassRef from a Ref
+        https://bugs.webkit.org/show_bug.cgi?id=138389
+
+        Reviewed by Andreas Kling.
+
+        Allow constructing a PassRef from a Ref, similarly to PassRefPtr that
+        can be constructed from a RefPtr already. This avoids having to call
+        Ref::get() and simplifies the code a bit.
+
+        * wtf/PassRef.h:
+        (WTF::PassRef<T>::PassRef):
+
 2014-11-05  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WTF/wtf/PassRef.h

@@ -41 +41 @@
     PassRef(T&);
     PassRef(PassRef&&);
+    template<typename U> PassRef(const Ref<U>&);
     template<typename U> PassRef(PassRef<U>);
 
@@ -97 +98 @@
 #endif
 {
+}
+
+template<typename T> template<typename U> inline PassRef<T>::PassRef(const Ref<U>& other)
+    : m_reference(const_cast<T&>(other.get()))
+#ifndef NDEBUG
+    , m_gaveUpReference(false)
+#endif
+{
+    m_reference.ref();
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Allow constructing a PassRef from a Ref
+        https://bugs.webkit.org/show_bug.cgi?id=138389
+
+        Reviewed by Andreas Kling.
+
+        Remove calls to Ref::get() now that a PassRef can be directly
+        constructed from a Ref.
+
+        No new tests, no behavior change.
+
+        * css/CSSValuePool.cpp:
+        (WebCore::CSSValuePool::createColorValue):
+        * css/CSSValuePool.h:
+        (WebCore::CSSValuePool::createInheritedValue):
+        (WebCore::CSSValuePool::createImplicitInitialValue):
+        (WebCore::CSSValuePool::createExplicitInitialValue):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::setCSSStyleSheet):
+
 2014-11-05  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/css/CSSValuePool.cpp

@@ -70 +70 @@
     // These are the empty and deleted values of the hash table.
     if (rgbValue == Color::transparent)
-        return m_colorTransparent.get();
+        return m_colorTransparent;
     if (rgbValue == Color::white)
-        return m_colorWhite.get();
+        return m_colorWhite;
     // Just because it is common.
     if (rgbValue == Color::black)
-        return m_colorBlack.get();
+        return m_colorBlack;
 
     // Remove one entry at random if the cache grows too large.

trunk/Source/WebCore/css/CSSValuePool.h

@@ -46 +46 @@
     PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&);
     PassRef<CSSPrimitiveValue> createFontFamilyValue(const String&);
-    PassRef<CSSInheritedValue> createInheritedValue() { return m_inheritedValue.get(); }
-    PassRef<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue.get(); }
-    PassRef<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue.get(); }
+    PassRef<CSSInheritedValue> createInheritedValue() { return m_inheritedValue; }
+    PassRef<CSSInitialValue> createImplicitInitialValue() { return m_implicitInitialValue; }
+    PassRef<CSSInitialValue> createExplicitInitialValue() { return m_explicitInitialValue; }
     PassRef<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
     PassRef<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier);

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -329 +329 @@
 
     Ref<StyleSheetContents> styleSheet(StyleSheetContents::create(href, parserContext));
-    m_sheet = CSSStyleSheet::create(styleSheet.get(), this);
+    m_sheet = CSSStyleSheet::create(styleSheet, this);
     m_sheet->setMediaQueries(MediaQuerySet::createAllowingDescriptionSyntax(m_media));
     m_sheet->setTitle(title());
@@ -340 +340 @@
 
     if (styleSheet.get().isCacheable())
-        const_cast<CachedCSSStyleSheet*>(cachedStyleSheet)->saveParsedStyleSheet(styleSheet.get());
+        const_cast<CachedCSSStyleSheet*>(cachedStyleSheet)->saveParsedStyleSheet(styleSheet);
 }