Title: [159018] trunk/Source/WebCore
Revision
159018
Author
[email protected]
Date
2013-11-09 23:28:20 -0800 (Sat, 09 Nov 2013)

Log Message

CSSValuePool::createFontFamilyValue() should return PassRef.
<https://webkit.org/b/124114>

Unlike createFontFaceValue(), createFontFamilyValue() can never
fail to return an object and thus should return PassRef.

Reviewed by Anders Carlsson.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (159017 => 159018)


--- trunk/Source/WebCore/ChangeLog	2013-11-10 07:26:00 UTC (rev 159017)
+++ trunk/Source/WebCore/ChangeLog	2013-11-10 07:28:20 UTC (rev 159018)
@@ -1,5 +1,15 @@
 2013-11-09  Andreas Kling  <[email protected]>
 
+        CSSValuePool::createFontFamilyValue() should return PassRef.
+        <https://webkit.org/b/124114>
+
+        Unlike createFontFaceValue(), createFontFamilyValue() can never
+        fail to return an object and thus should return PassRef.
+
+        Reviewed by Anders Carlsson.
+
+2013-11-09  Andreas Kling  <[email protected]>
+
         RenderIFrame should display its name correctly in DRT output.
         <https://webkit.org/b/124117>
 

Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (159017 => 159018)


--- trunk/Source/WebCore/css/CSSValuePool.cpp	2013-11-10 07:26:00 UTC (rev 159017)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp	2013-11-10 07:28:20 UTC (rev 159018)
@@ -116,12 +116,12 @@
     return *cache[intValue];
 }
 
-PassRefPtr<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
+PassRef<CSSPrimitiveValue> CSSValuePool::createFontFamilyValue(const String& familyName)
 {
     RefPtr<CSSPrimitiveValue>& value = m_fontFamilyValueCache.add(familyName, nullptr).iterator->value;
     if (!value)
         value = CSSPrimitiveValue::create(familyName, CSSPrimitiveValue::CSS_STRING);
-    return value;
+    return *value;
 }
 
 PassRefPtr<CSSValueList> CSSValuePool::createFontFaceValue(const AtomicString& string)

Modified: trunk/Source/WebCore/css/CSSValuePool.h (159017 => 159018)


--- trunk/Source/WebCore/css/CSSValuePool.h	2013-11-10 07:26:00 UTC (rev 159017)
+++ trunk/Source/WebCore/css/CSSValuePool.h	2013-11-10 07:28:20 UTC (rev 159018)
@@ -43,7 +43,7 @@
     WTF_MAKE_FAST_ALLOCATED;
 public:
     PassRefPtr<CSSValueList> createFontFaceValue(const AtomicString&);
-    PassRefPtr<CSSPrimitiveValue> createFontFamilyValue(const String&);
+    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(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to