| Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| index 1429cb55ab0fdd47e7c23ef0a0ee01b476e7f7ee..45070f0dd316ef8aefed1f3f3afa2bf231556851 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
|
| @@ -376,7 +376,7 @@ void BaseRenderingContext2D::setFilter(const String& filterString)
|
| if (filterString == state().unparsedFilter())
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<CSSValue> filterValue = CSSParser::parseSingleValue(CSSPropertyWebkitFilter, filterString, CSSParserContext(HTMLStandardMode, 0));
|
| + RawPtr<CSSValue> filterValue = CSSParser::parseSingleValue(CSSPropertyWebkitFilter, filterString, CSSParserContext(HTMLStandardMode, 0));
|
|
|
| if (!filterValue || filterValue->isInitialValue() || filterValue->isInheritedValue())
|
| return;
|
| @@ -385,14 +385,14 @@ void BaseRenderingContext2D::setFilter(const String& filterString)
|
| modifiableState().setFilter(filterValue.release());
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<SVGMatrixTearOff> BaseRenderingContext2D::currentTransform() const
|
| +RawPtr<SVGMatrixTearOff> BaseRenderingContext2D::currentTransform() const
|
| {
|
| return SVGMatrixTearOff::create(state().transform());
|
| }
|
|
|
| -void BaseRenderingContext2D::setCurrentTransform(PassRefPtrWillBeRawPtr<SVGMatrixTearOff> passMatrixTearOff)
|
| +void BaseRenderingContext2D::setCurrentTransform(RawPtr<SVGMatrixTearOff> passMatrixTearOff)
|
| {
|
| - RefPtrWillBeRawPtr<SVGMatrixTearOff> matrixTearOff = passMatrixTearOff;
|
| + RawPtr<SVGMatrixTearOff> matrixTearOff = passMatrixTearOff;
|
| const AffineTransform& transform = matrixTearOff->value();
|
| setTransform(transform.a(), transform.b(), transform.c(), transform.d(), transform.e(), transform.f());
|
| }
|
| @@ -842,13 +842,13 @@ static inline void clipRectsToImageRect(const FloatRect& imageRect, FloatRect* s
|
| static inline CanvasImageSource* toImageSourceInternal(const CanvasImageSourceUnion& value)
|
| {
|
| if (value.isHTMLImageElement())
|
| - return value.getAsHTMLImageElement().get();
|
| + return value.getAsHTMLImageElement();
|
| if (value.isHTMLVideoElement())
|
| - return value.getAsHTMLVideoElement().get();
|
| + return value.getAsHTMLVideoElement();
|
| if (value.isHTMLCanvasElement())
|
| - return value.getAsHTMLCanvasElement().get();
|
| + return value.getAsHTMLCanvasElement();
|
| if (value.isImageBitmap())
|
| - return value.getAsImageBitmap().get();
|
| + return value.getAsImageBitmap();
|
| ASSERT_NOT_REACHED();
|
| return nullptr;
|
| }
|
|
|