From 35fa87fecceaf46832dea0d7b31fc7c50f1e6e8b Mon Sep 17 00:00:00 2001 From: "sigbjornf@opera.com" Date: Tue, 22 Sep 2015 11:22:37 +0000 Subject: [PATCH] Oilpan: fix build after r202625. TBR=oilpan-reviews BUG=529640 NOTRY=true Review URL: https://codereview.chromium.org/1358083002 git-svn-id: svn://svn.chromium.org/blink/trunk@202629 bbb929c8-8fbe-4397-9dbb-9b2b20218538 --- third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp | 8 ++++++-- third_party/WebKit/Source/core/css/CSSImageSetValue.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp index 41af71c2e596..3816da275d85 100644 --- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp @@ -119,8 +119,12 @@ String CSSCrossfadeValue::customCSSText() const PassRefPtrWillBeRawPtr CSSCrossfadeValue::valueWithURLsMadeAbsolute() { - RefPtrWillBeRawPtr fromValue = m_fromValue->isImageValue() ? toCSSImageValue(*m_fromValue).valueWithURLMadeAbsolute() : m_fromValue; - RefPtrWillBeRawPtr toValue = m_toValue->isImageValue() ? toCSSImageValue(*m_toValue).valueWithURLMadeAbsolute() : m_toValue; + RefPtrWillBeRawPtr fromValue = m_fromValue; + if (m_fromValue->isImageValue()) + fromValue = toCSSImageValue(*m_fromValue).valueWithURLMadeAbsolute(); + RefPtrWillBeRawPtr toValue = m_toValue; + if (m_toValue->isImageValue()) + toValue = toCSSImageValue(*m_toValue).valueWithURLMadeAbsolute(); return CSSCrossfadeValue::create(fromValue.release(), toValue.release(), m_percentageValue); } diff --git a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp index bffd0ddfb8f4..2f1954109a27 100644 --- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp +++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp @@ -193,7 +193,7 @@ PassRefPtrWillBeRawPtr CSSImageSetValue::valueWithURLsMadeAbso CSSImageSetValue* value = CSSImageSetValue::create().get(); for (auto& item : *this) item->isImageValue() ? value->append(toCSSImageValue(*item).valueWithURLMadeAbsolute()) : value->append(item); - return adoptRef(value); + return adoptRefWillBeNoop(value); } -- 2.11.4.GIT