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

Side by Side 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 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>
26 25
27 static const char defaultFont[] = "10px sans-serif"; 26 static const char defaultFont[] = "10px sans-serif";
28 static const char defaultFilter[] = "none"; 27 static const char defaultFilter[] = "none";
29 28
30 namespace blink { 29 namespace blink {
31 30
32 CanvasRenderingContext2DState::CanvasRenderingContext2DState() 31 CanvasRenderingContext2DState::CanvasRenderingContext2DState()
33 : m_unrealizedSaveCount(0) 32 : m_unrealizedSaveCount(0)
34 , m_strokeStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK)) 33 , m_strokeStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK))
35 , m_fillStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK)) 34 , m_fillStyle(CanvasStyle::createFromRGBA(SK_ColorBLACK))
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 } 344 }
346 345
347 void CanvasRenderingContext2DState::clearResolvedFilter() const 346 void CanvasRenderingContext2DState::clearResolvedFilter() const
348 { 347 {
349 m_resolvedFilter.reset(); 348 m_resolvedFilter.reset();
350 } 349 }
351 350
352 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const 351 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const
353 { 352 {
354 if (!m_emptyDrawLooper) { 353 if (!m_emptyDrawLooper) {
355 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create(); 354 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( );
356 m_emptyDrawLooper = drawLooperBuilder->detachDrawLooper(); 355 m_emptyDrawLooper = drawLooperBuilder->detachDrawLooper();
357 } 356 }
358 return m_emptyDrawLooper.get(); 357 return m_emptyDrawLooper.get();
359 } 358 }
360 359
361 SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const 360 SkDrawLooper* CanvasRenderingContext2DState::shadowOnlyDrawLooper() const
362 { 361 {
363 if (!m_shadowOnlyDrawLooper) { 362 if (!m_shadowOnlyDrawLooper) {
364 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create(); 363 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( );
365 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha); 364 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha);
366 m_shadowOnlyDrawLooper = drawLooperBuilder->detachDrawLooper(); 365 m_shadowOnlyDrawLooper = drawLooperBuilder->detachDrawLooper();
367 } 366 }
368 return m_shadowOnlyDrawLooper.get(); 367 return m_shadowOnlyDrawLooper.get();
369 } 368 }
370 369
371 SkDrawLooper* CanvasRenderingContext2DState::shadowAndForegroundDrawLooper() con st 370 SkDrawLooper* CanvasRenderingContext2DState::shadowAndForegroundDrawLooper() con st
372 { 371 {
373 if (!m_shadowAndForegroundDrawLooper) { 372 if (!m_shadowAndForegroundDrawLooper) {
374 std::unique_ptr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder ::create(); 373 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( );
375 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha); 374 drawLooperBuilder->addShadow(m_shadowOffset, m_shadowBlur, m_shadowColor , DrawLooperBuilder::ShadowIgnoresTransforms, DrawLooperBuilder::ShadowRespectsA lpha);
376 drawLooperBuilder->addUnmodifiedContent(); 375 drawLooperBuilder->addUnmodifiedContent();
377 m_shadowAndForegroundDrawLooper = drawLooperBuilder->detachDrawLooper(); 376 m_shadowAndForegroundDrawLooper = drawLooperBuilder->detachDrawLooper();
378 } 377 }
379 return m_shadowAndForegroundDrawLooper.get(); 378 return m_shadowAndForegroundDrawLooper.get();
380 } 379 }
381 380
382 SkImageFilter* CanvasRenderingContext2DState::shadowOnlyImageFilter() const 381 SkImageFilter* CanvasRenderingContext2DState::shadowOnlyImageFilter() const
383 { 382 {
384 if (!m_shadowOnlyImageFilter) { 383 if (!m_shadowOnlyImageFilter) {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 paint->setLooper(0); 561 paint->setLooper(0);
563 paint->setImageFilter(shadowAndForegroundImageFilter()); 562 paint->setImageFilter(shadowAndForegroundImageFilter());
564 return paint; 563 return paint;
565 } 564 }
566 paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper())); 565 paint->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper()));
567 paint->setImageFilter(0); 566 paint->setImageFilter(0);
568 return paint; 567 return paint;
569 } 568 }
570 569
571 } // namespace blink 570 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698