CSSValue Immediates: Change CSSValue to an object instead of a pointer

Source/core/css/FontFace.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/SharedBuffer.h"
 
 namespace blink {
 
-static PassRefPtrWillBeRawPtr<CSSValue> parseCSSValue(const Document* document, const String& value, CSSPropertyID propertyID)
+static NullableCSSValue parseCSSValue(const Document* document, const String& value, CSSPropertyID propertyID)
 {
     CSSParserContext context(*document, UseCounter::getFrom(document));
     return CSSParser::parseFontFaceDescriptor(propertyID, value, context);
 }
 
 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, const AtomicString& family, StringOrArrayBufferOrArrayBufferView& source, const FontFaceDescriptors& descriptors)
 {
     if (source.isString())
         return create(context, family, source.getAsString(), descriptors);
     if (source.isArrayBuffer())
         return create(context, family, source.getAsArrayBuffer(), descriptors);
     if (source.isArrayBufferView())
         return create(context, family, source.getAsArrayBufferView(), descriptors);
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, const AtomicString& family, const String& source, const FontFaceDescriptors& descriptors)
 {
     RefPtrWillBeRawPtr<FontFace> fontFace = adoptRefWillBeNoop(new FontFace(context, family, descriptors));
 
-    RefPtrWillBeRawPtr<CSSValue> src = parseCSSValue(toDocument(context), source, CSSPropertySrc);
-    if (!src || !src->isValueList())
+    NullableCSSValue src = parseCSSValue(toDocument(context), source, CSSPropertySrc);
+    if (!src || !src->isValueList()) {
         fontFace->setError(DOMException::create(SyntaxError, "The source provided ('" + source + "') could not be parsed as a value list."));
+        return fontFace;
+    }
 
-    fontFace->initCSSFontFace(toDocument(context), src);
+    fontFace->initCSSFontFace(toDocument(context), *src);
     return fontFace.release();
 }
 
 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, const AtomicString& family, PassRefPtr<DOMArrayBuffer> source, const FontFaceDescriptors& descriptors)
 {
     RefPtrWillBeRawPtr<FontFace> fontFace = adoptRefWillBeNoop(new FontFace(context, family, descriptors));
     fontFace->initCSSFontFace(static_cast<const unsigned char*>(source->data()), source->byteLength());
     return fontFace.release();
 }
 
 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(ExecutionContext* context, const AtomicString& family, PassRefPtr<DOMArrayBufferView> source, const FontFaceDescriptors& descriptors)
 {
     RefPtrWillBeRawPtr<FontFace> fontFace = adoptRefWillBeNoop(new FontFace(context, family, descriptors));
     fontFace->initCSSFontFace(static_cast<const unsigned char*>(source->baseAddress()), source->byteLength());
     return fontFace.release();
 }
 
 PassRefPtrWillBeRawPtr<FontFace> FontFace::create(Document* document, const StyleRuleFontFace* fontFaceRule)
 {
     const StylePropertySet& properties = fontFaceRule->properties();
 
     // Obtain the font-family property and the src property. Both must be defined.
-    RefPtrWillBeRawPtr<CSSValue> family = properties.getPropertyCSSValue(CSSPropertyFontFamily);
+    NullableCSSValue family = properties.getPropertyCSSValue(CSSPropertyFontFamily);
     if (!family || !family->isValueList())
         return nullptr;
-    RefPtrWillBeRawPtr<CSSValue> src = properties.getPropertyCSSValue(CSSPropertySrc);
+    NullableCSSValue src = properties.getPropertyCSSValue(CSSPropertySrc);
     if (!src || !src->isValueList())
         return nullptr;
 
     RefPtrWillBeRawPtr<FontFace> fontFace = adoptRefWillBeNoop(new FontFace(document));
 
-    if (fontFace->setFamilyValue(toCSSValueList(family.get()))
+    if (fontFace->setFamilyValue(toCSSValueList(family))
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontStyle)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontWeight)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontStretch)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyUnicodeRange)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyFontVariant)
         && fontFace->setPropertyFromStyle(properties, CSSPropertyWebkitFontFeatureSettings)
         && !fontFace->family().isEmpty()
         && fontFace->traits().bitfield()) {
-        fontFace->initCSSFontFace(document, src);
+        fontFace->initCSSFontFace(document, *src);
         return fontFace.release();
     }
     return nullptr;
 }
 
 FontFace::FontFace(ExecutionContext* context)
     : ActiveDOMObject(context)
     , m_status(Unloaded)
 {
     suspendIfNeeded();
@@ skipping 74 matching lines @@
     setPropertyFromString(toDocument(context), s, CSSPropertyFontVariant, &exceptionState);
 }
 
 void FontFace::setFeatureSettings(ExecutionContext* context, const String& s, ExceptionState& exceptionState)
 {
     setPropertyFromString(toDocument(context), s, CSSPropertyWebkitFontFeatureSettings, &exceptionState);
 }
 
 void FontFace::setPropertyFromString(const Document* document, const String& s, CSSPropertyID propertyID, ExceptionState* exceptionState)
 {
-    RefPtrWillBeRawPtr<CSSValue> value = parseCSSValue(document, s, propertyID);
+    NullableCSSValue value = parseCSSValue(document, s, propertyID);
     if (value && setPropertyValue(value, propertyID))
         return;
 
     String message = "Failed to set '" + s + "' as a property value.";
     if (exceptionState)
         exceptionState->throwDOMException(SyntaxError, message);
     else
         setError(DOMException::create(SyntaxError, message));
 }
 
 bool FontFace::setPropertyFromStyle(const StylePropertySet& properties, CSSPropertyID propertyID)
 {
     return setPropertyValue(properties.getPropertyCSSValue(propertyID), propertyID);
 }
 
-bool FontFace::setPropertyValue(PassRefPtrWillBeRawPtr<CSSValue> value, CSSPropertyID propertyID)
+bool FontFace::setPropertyValue(NullableCSSValue value, CSSPropertyID propertyID)
 {
     switch (propertyID) {
     case CSSPropertyFontStyle:
         m_style = value;
         break;
     case CSSPropertyFontWeight:
         m_weight = value;
         break;
     case CSSPropertyFontStretch:
         m_stretch = value;
@@ skipping 15 matching lines @@
     }
     return true;
 }
 
 bool FontFace::setFamilyValue(CSSValueList* familyList)
 {
     // The font-family descriptor has to have exactly one family name.
     if (familyList->length() != 1)
         return false;
 
-    CSSPrimitiveValue* familyValue = toCSSPrimitiveValue(familyList->item(0));
+    CSSPrimitiveValue& familyValue = toCSSPrimitiveValue(familyList->item(0));
     AtomicString family;
-    if (familyValue->isCustomIdent()) {
-        family = AtomicString(familyValue->getStringValue());
-    } else if (familyValue->isValueID()) {
+    if (familyValue.isCustomIdent()) {
+        family = AtomicString(familyValue.getStringValue());
+    } else if (familyValue.isValueID()) {
         // We need to use the raw text for all the generic family types, since @font-face is a way of actually
         // defining what font to use for those types.
-        switch (familyValue->getValueID()) {
+        switch (familyValue.getValueID()) {
         case CSSValueSerif:
             family =  FontFamilyNames::webkit_serif;
             break;
         case CSSValueSansSerif:
             family =  FontFamilyNames::webkit_sans_serif;
             break;
         case CSSValueCursive:
             family =  FontFamilyNames::webkit_cursive;
             break;
         case CSSValueFantasy:
@@ skipping 99 matching lines @@
     toDocument(context)->styleEngine().fontSelector()->fontLoader()->loadPendingFonts();
 }
 
 FontTraits FontFace::traits() const
 {
     FontStyle style = FontStyleNormal;
     if (m_style) {
         if (!m_style->isPrimitiveValue())
             return 0;
 
-        switch (toCSSPrimitiveValue(m_style.get())->getValueID()) {
+        switch (toCSSPrimitiveValue(m_style)->getValueID()) {
         case CSSValueNormal:
             style = FontStyleNormal;
             break;
         case CSSValueItalic:
         case CSSValueOblique:
             style = FontStyleItalic;
             break;
         default:
             break;
         }
     }
 
     FontWeight weight = FontWeight400;
     if (m_weight) {
         if (!m_weight->isPrimitiveValue())
             return 0;
 
-        switch (toCSSPrimitiveValue(m_weight.get())->getValueID()) {
+        switch (toCSSPrimitiveValue(m_weight)->getValueID()) {
         case CSSValueBold:
         case CSSValue700:
             weight = FontWeight700;
             break;
         case CSSValueNormal:
         case CSSValue400:
             weight = FontWeight400;
             break;
         case CSSValue900:
             weight = FontWeight900;
@@ skipping 21 matching lines @@
         case CSSValueLighter:
         case CSSValueBolder:
             break;
         default:
             ASSERT_NOT_REACHED();
             break;
         }
     }
 
     FontVariant variant = FontVariantNormal;
-    if (RefPtrWillBeRawPtr<CSSValue> fontVariant = m_variant) {
+    if (NullableCSSValue fontVariant = m_variant) {
         // font-variant descriptor can be a value list.
         if (fontVariant->isPrimitiveValue()) {
             RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
-            list->append(fontVariant);
+            list->append(*fontVariant);
             fontVariant = list;
         } else if (!fontVariant->isValueList()) {
             return 0;
         }
 
-        CSSValueList* variantList = toCSSValueList(fontVariant.get());
+        CSSValueList* variantList = toCSSValueList(fontVariant);
         unsigned numVariants = variantList->length();
         if (!numVariants)
             return 0;
 
         for (unsigned i = 0; i < numVariants; ++i) {
-            switch (toCSSPrimitiveValue(variantList->item(i))->getValueID()) {
+            switch (toCSSPrimitiveValue(variantList->item(i)).getValueID()) {
             case CSSValueNormal:
                 variant = FontVariantNormal;
                 break;
             case CSSValueSmallCaps:
                 variant = FontVariantSmallCaps;
                 break;
             default:
                 break;
             }
         }
     }
 
     return FontTraits(style, variant, weight, FontStretchNormal);
 }
 
-static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, CSSValue* unicodeRange)
+static PassOwnPtrWillBeRawPtr<CSSFontFace> createCSSFontFace(FontFace* fontFace, NullableCSSValue unicodeRange)
 {
     Vector<CSSFontFace::UnicodeRange> ranges;
     if (CSSValueList* rangeList = toCSSValueList(unicodeRange)) {
         unsigned numRanges = rangeList->length();
         for (unsigned i = 0; i < numRanges; i++) {
-            CSSUnicodeRangeValue* range = toCSSUnicodeRangeValue(rangeList->item(i));
-            ranges.append(CSSFontFace::UnicodeRange(range->from(), range->to()));
+            CSSUnicodeRangeValue& range = toCSSUnicodeRangeValue(rangeList->item(i));
+            ranges.append(CSSFontFace::UnicodeRange(range.from(), range.to()));
         }
     }
 
     return adoptPtrWillBeNoop(new CSSFontFace(fontFace, ranges));
 }
 
-void FontFace::initCSSFontFace(Document* document, PassRefPtrWillBeRawPtr<CSSValue> src)
+void FontFace::initCSSFontFace(Document* document, CSSValue src)
 {
-    m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
+    m_cssFontFace = createCSSFontFace(this, m_unicodeRange);
     if (m_error)
         return;
 
     // Each item in the src property's list is a single CSSFontFaceSource. Put them all into a CSSFontFace.
-    ASSERT(src);
-    ASSERT(src->isValueList());
-    CSSValueList* srcList = toCSSValueList(src.get());
-    int srcLength = srcList->length();
+    ASSERT(src.isValueList());
+    CSSValueList& srcList = toCSSValueList(src);
+    int srcLength = srcList.length();
 
     for (int i = 0; i < srcLength; i++) {
         // An item in the list either specifies a string (local font name) or a URL (remote font to download).
-        CSSFontFaceSrcValue* item = toCSSFontFaceSrcValue(srcList->item(i));
+        CSSFontFaceSrcValue& item = toCSSFontFaceSrcValue(srcList.item(i));
         OwnPtrWillBeRawPtr<CSSFontFaceSource> source = nullptr;
 
-        if (!item->isLocal()) {
+        if (!item.isLocal()) {
             Settings* settings = document ? document->frame() ? document->frame()->settings() : 0 : 0;
             bool allowDownloading = settings && settings->downloadableBinaryFontsEnabled();
-            if (allowDownloading && item->isSupportedFormat() && document) {
-                FontResource* fetched = item->fetch(document);
+            if (allowDownloading && item.isSupportedFormat() && document) {
+                FontResource* fetched = item.fetch(document);
                 if (fetched) {
                     FontLoader* fontLoader = document->styleEngine().fontSelector()->fontLoader();
                     source = adoptPtrWillBeNoop(new RemoteFontFaceSource(fetched, fontLoader));
                 }
             }
         } else {
-            source = adoptPtrWillBeNoop(new LocalFontFaceSource(item->resource()));
+            source = adoptPtrWillBeNoop(new LocalFontFaceSource(item.resource()));
         }
 
         if (source)
             m_cssFontFace->addSource(source.release());
     }
 }
 
 void FontFace::initCSSFontFace(const unsigned char* data, unsigned size)
 {
-    m_cssFontFace = createCSSFontFace(this, m_unicodeRange.get());
+    m_cssFontFace = createCSSFontFace(this, m_unicodeRange);
     if (m_error)
         return;
 
     RefPtr<SharedBuffer> buffer = SharedBuffer::create(data, size);
     OwnPtrWillBeRawPtr<BinaryDataFontFaceSource> source = adoptPtrWillBeNoop(new BinaryDataFontFaceSource(buffer.get(), m_otsParseMessage));
     if (source->isValid())
         setLoadStatus(Loaded);
     else
         setError(DOMException::create(SyntaxError, "Invalid font data in ArrayBuffer."));
     m_cssFontFace->addSource(source.release());
@@ skipping 19 matching lines @@
 {
     return m_cssFontFace->hadBlankText();
 }
 
 bool FontFace::hasPendingActivity() const
 {
     return m_status == Loading && executionContext() && !executionContext()->activeDOMObjectsAreStopped();
 }
 
 } // namespace blink