| Index: third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
|
| index f6a59a1f3d82b54f469feb69aefe7b568fa286fd..1dbe414bce11f775f982212d516bfff24405bbb2 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/ElementStyleResources.cpp
|
| @@ -49,7 +49,7 @@ ElementStyleResources::ElementStyleResources(Document& document, float deviceSca
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::styleImage(CSSPropertyID property, const CSSValue& value)
|
| +RawPtr<StyleImage> ElementStyleResources::styleImage(CSSPropertyID property, const CSSValue& value)
|
| {
|
| if (value.isImageValue())
|
| return cachedOrPendingFromValue(property, toCSSImageValue(value));
|
| @@ -66,7 +66,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::styleImage(CSSProperty
|
| return nullptr;
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPropertyID property, const CSSImageGeneratorValue& value)
|
| +RawPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPropertyID property, const CSSImageGeneratorValue& value)
|
| {
|
| if (value.isPending()) {
|
| m_pendingImageProperties.add(property);
|
| @@ -75,7 +75,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFrom
|
| return StyleGeneratedImage::create(value);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, const CSSImageSetValue& value)
|
| +RawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, const CSSImageSetValue& value)
|
| {
|
| if (value.isCachePending(m_deviceScaleFactor)) {
|
| m_pendingImageProperties.add(property);
|
| @@ -84,7 +84,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(
|
| return value.cachedImage(m_deviceScaleFactor);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(CSSPropertyID property, const CSSImageValue& value)
|
| +RawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(CSSPropertyID property, const CSSImageValue& value)
|
| {
|
| if (value.isCachePending()) {
|
| m_pendingImageProperties.add(property);
|
| @@ -94,7 +94,7 @@ PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromVal
|
| return value.cachedImage();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, const CSSCursorImageValue& value)
|
| +RawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, const CSSCursorImageValue& value)
|
| {
|
| if (value.isCachePending(m_deviceScaleFactor)) {
|
| m_pendingImageProperties.add(property);
|
| @@ -115,7 +115,7 @@ void ElementStyleResources::loadPendingSVGDocuments(ComputedStyle* computedStyle
|
|
|
| FilterOperations::FilterOperationVector& filterOperations = computedStyle->mutableFilter().operations();
|
| for (unsigned i = 0; i < filterOperations.size(); ++i) {
|
| - RefPtrWillBeRawPtr<FilterOperation> filterOperation = filterOperations.at(i);
|
| + RawPtr<FilterOperation> filterOperation = filterOperations.at(i);
|
| if (filterOperation->type() == FilterOperation::REFERENCE) {
|
| ReferenceFilterOperation* referenceFilter = toReferenceFilterOperation(filterOperation.get());
|
|
|
| @@ -132,10 +132,10 @@ void ElementStyleResources::loadPendingSVGDocuments(ComputedStyle* computedStyle
|
| }
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::loadPendingImage(StylePendingImage* pendingImage, CrossOriginAttributeValue crossOrigin)
|
| +RawPtr<StyleImage> ElementStyleResources::loadPendingImage(StylePendingImage* pendingImage, CrossOriginAttributeValue crossOrigin)
|
| {
|
| if (CSSImageValue* imageValue = pendingImage->cssImageValue()) {
|
| - if (RefPtrWillBeRawPtr<StyleImage> cachedImage = imageValue->cacheImage(m_document, crossOrigin))
|
| + if (RawPtr<StyleImage> cachedImage = imageValue->cacheImage(m_document, crossOrigin))
|
| return cachedImage.release();
|
| return StyleInvalidImage::create(imageValue->url());
|
| }
|
| @@ -220,7 +220,7 @@ void ElementStyleResources::loadPendingImages(ComputedStyle* style)
|
| if (StyleReflection* reflection = style->boxReflect()) {
|
| const NinePieceImage& maskImage = reflection->mask();
|
| if (maskImage.image() && maskImage.image()->isPendingImage()) {
|
| - RefPtrWillBeRawPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(maskImage.image()));
|
| + RawPtr<StyleImage> loadedImage = loadPendingImage(toStylePendingImage(maskImage.image()));
|
| reflection->setMask(NinePieceImage(loadedImage.release(), maskImage.imageSlices(), maskImage.fill(), maskImage.borderSlices(), maskImage.outset(), maskImage.horizontalRule(), maskImage.verticalRule()));
|
| }
|
| }
|
|
|