Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/canvas2d/CanvasRenderingContext2DState.h" 5 #include "modules/canvas2d/CanvasRenderingContext2DState.h"
6 6
7 #include "core/css/CSSFontSelector.h" 7 #include "core/css/CSSFontSelector.h"
8 #include "core/css/resolver/FilterOperationResolver.h" 8 #include "core/css/resolver/FilterOperationResolver.h"
9 #include "core/css/resolver/StyleBuilder.h" 9 #include "core/css/resolver/StyleBuilder.h"
10 #include "core/css/resolver/StyleResolverState.h" 10 #include "core/css/resolver/StyleResolverState.h"
11 #include "core/html/HTMLCanvasElement.h" 11 #include "core/html/HTMLCanvasElement.h"
12 #include "core/paint/FilterEffectBuilder.h" 12 #include "core/paint/FilterEffectBuilder.h"
13 #include "core/style/ComputedStyle.h" 13 #include "core/style/ComputedStyle.h"
14 #include "core/svg/SVGFilterElement.h" 14 #include "core/svg/SVGFilterElement.h"
15 #include "modules/canvas2d/CanvasGradient.h" 15 #include "modules/canvas2d/CanvasGradient.h"
16 #include "modules/canvas2d/CanvasPattern.h" 16 #include "modules/canvas2d/CanvasPattern.h"
17 #include "modules/canvas2d/CanvasRenderingContext2D.h" 17 #include "modules/canvas2d/CanvasRenderingContext2D.h"
18 #include "modules/canvas2d/CanvasStyle.h" 18 #include "modules/canvas2d/CanvasStyle.h"
19 #include "platform/graphics/DrawLooperBuilder.h" 19 #include "platform/graphics/DrawLooperBuilder.h"
20 #include "platform/graphics/filters/FilterOperation.h" 20 #include "platform/graphics/filters/FilterOperation.h"
21 #include "platform/graphics/filters/SkiaImageFilterBuilder.h" 21 #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
22 #include "platform/graphics/skia/SkiaUtils.h" 22 #include "platform/graphics/skia/SkiaUtils.h"
23 #include "third_party/skia/include/effects/SkDashPathEffect.h" 23 #include "third_party/skia/include/effects/SkDashPathEffect.h"
24 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h" 24 #include "third_party/skia/include/effects/SkDropShadowImageFilter.h"
25 #include <memory>
25 26
26 static const char defaultFont[] = "10px sans-serif"; 27 static const char defaultFont[] = "10px sans-serif";
27 static const char defaultFilter[] = "none"; 28 static const char defaultFilter[] = "none";
28 29
29 namespace blink { 30 namespace blink {
30 31
31 CanvasRenderingContext2DState::CanvasRenderingContext2DState() 32 CanvasRenderingContext2DState::CanvasRenderingContext2DState()
32 : m_unrealizedSaveCount(0) 33 : m_unrealizedSaveCount(0)
33 , m_strokeStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK)) 34 , m_strokeStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK))
34 , m_fillStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK)) 35 , m_fillStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK))
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 } 345 }
345 346
346 void CanvasRenderingContext2DState::clearResolvedFilter() const 347 void CanvasRenderingContext2DState::clearResolvedFilter() const
347 { 348 {
348 m_resolvedFilter.reset(); 349 m_resolvedFilter.reset();
349 } 350 }
350 351
351 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const 352 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const
352 { 353 {
353 if (!m_emptyDrawLooper) { 354 if (!m_emptyDrawLooper) {
354 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( ); 355 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create();
355 m_emptyDrawLooper = drawLooperBuilder->detachDrawLooper(); 356 m_emptyDrawLooper = drawLooperBuilder->detachDrawLooper();
356 } 357 }
357 return m_emptyDrawLooper.get(); 358 return m_emptyDrawLooper.get();
358 } 359 }
359 360
360 SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const 361 SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const
361 { 362 {
362 if (!m_shadowOnlyDrawLooper) { 363 if (!m_shadowOnlyDrawLooper) {
363 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( ); 364 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create();
364 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha); 365 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha);
365 m_shadowOnlyDrawLooper = drawLooperBuilder->detachDrawLooper(); 366 m_shadowOnlyDrawLooper = drawLooperBuilder->detachDrawLooper();
366 } 367 }
367 return m_shadowOnlyDrawLooper.get(); 368 return m_shadowOnlyDrawLooper.get();
368 } 369 }
369 370
370 SkDrawLooper* CanvasRenderingContext2DState::shadowAndForegroundDrawLooper() con st 371 SkDrawLooper* CanvasRenderingContext2DState::shadowAndForegroundDrawLooper() con st
371 { 372 {
372 if (!m_shadowAndForegroundDrawLooper) { 373 if (!m_shadowAndForegroundDrawLooper) {
373 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( ); 374 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create();
374 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha); 375 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha);
375 drawLooperBuilder->addUnmodifiedContent(); 376 drawLooperBuilder->addUnmodifiedContent();
376 m_shadowAndForegroundDrawLooper = drawLooperBuilder->detachDrawLooper(); 377 m_shadowAndForegroundDrawLooper = drawLooperBuilder->detachDrawLooper();
377 } 378 }
378 return m_shadowAndForegroundDrawLooper.get(); 379 return m_shadowAndForegroundDrawLooper.get();
379 } 380 }
380 381
381 SkImageFilter* CanvasRenderingContext2DState::shadowOnlyImageFilter() const 382 SkImageFilter* CanvasRenderingContext2DState::shadowOnlyImageFilter() const
382 { 383 {
383 if (!m_shadowOnlyImageFilter) { 384 if (!m_shadowOnlyImageFilter) {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 paint->setLooper(0); 562 paint->setLooper(0);
562 paint->setImageFilter(shadowAndForegroundImageFilter()); 563 paint->setImageFilter(shadowAndForegroundImageFilter());
563 return paint; 564 return paint;
564 } 565 }
565 paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper())); 566 paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper()));
566 paint->setImageFilter(0); 567 paint->setImageFilter(0);
567 return paint; 568 return paint;
568 } 569 }
569 570
570 } // namespace blink 571 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698