third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Unified Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DAPITest.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

index cff1f1b01626efd66040442a79b828ee936341c2..d0f577801090780d3a4b7522134aadcdda8badb9 100644

--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

@@ -22,7 +22,6 @@

#include "platform/graphics/skia/SkiaUtils.h"

#include "third_party/skia/include/effects/SkDashPathEffect.h"

#include "third_party/skia/include/effects/SkDropShadowImageFilter.h"

-#include <memory>

static const char defaultFont[] = "10px sans-serif";

static const char defaultFilter[] = "none";

@@ -352,7 +351,7 @@ void CanvasRenderingContext2DState::clearResolvedFilter() const

SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const

{

if (!m_emptyDrawLooper) {

- std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

+ OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

m_emptyDrawLooper = drawLooperBuilder->detachDrawLooper();

}

return m_emptyDrawLooper.get();

@@ -361,7 +360,7 @@ SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const

SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const

{

if (!m_shadowOnlyDrawLooper) {

- std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

+ OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor, DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsAlpha);

m_shadowOnlyDrawLooper = drawLooperBuilder->detachDrawLooper();

}

@@ -371,7 +370,7 @@ SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const

SkDrawLooper* CanvasRenderingContext2DState::shadowAndForegroundDrawLooper() const

{

if (!m_shadowAndForegroundDrawLooper) {

- std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

+ OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create();

drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor, DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsAlpha);

drawLooperBuilder->addUnmodifiedContent();

m_shadowAndForegroundDrawLooper = drawLooperBuilder->detachDrawLooper();