Oilpan: fix build after changes that did not take oilpan into account.

R=haraken@chromium.org, wibling@chromium.org
TBR=betravis@adobe.com, haraken@chromium.org, wibling@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/184293008

git-svn-id: svn://svn.chromium.org/blink/trunk@168487 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -1438,12 +1438,15 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForShape(const RenderStyle& style,
         return cssValuePool().createIdentifierValue(CSSValueOutsideShape);
     if (shapeValue->type() == ShapeValue::Box)
         return cssValuePool().createValue(shapeValue->layoutBox());
-    if (shapeValue->type() == ShapeValue::Image)
-        return shapeValue->image() ? shapeValue->image()->cssValue() : cssValuePool().createIdentifierValue(CSSValueNone);
+    if (shapeValue->type() == ShapeValue::Image) {
+        if (shapeValue->image())
+            return shapeValue->image()->cssValue();
+        return cssValuePool().createIdentifierValue(CSSValueNone);
+    }
 
     ASSERT(shapeValue->type() == ShapeValue::Shape);
 
-    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+    RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
     list->append(valueForBasicShape(style, shapeValue->shape()));
     if (shapeValue->layoutBox() != BoxMissing)
         list->append(cssValuePool().createValue(shapeValue->layoutBox()));

third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

@@ -4445,14 +4445,14 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseBasicShapeAndOrBox()
     bool boxFound = false;
     CSSValueID valueId;
 
-    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+    RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
     for (unsigned i = 0; i < 2; ++i) {
         if (!value)
             break;
         valueId = value->id;
         if (value->unit == CSSParserValue::Function && !shapeFound) {
             // parseBasicShape already asks for the next value list item.
-            RefPtr<CSSPrimitiveValue> shapeValue = parseBasicShape();
+            RefPtrWillBeRawPtr<CSSPrimitiveValue> shapeValue = parseBasicShape();
             if (!shapeValue)
                 return nullptr;
             list->append(shapeValue.release());