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

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

Issue 2716203002: blink: Fix cc/paint skia type mismatches (Closed)
Patch Set: Fix canvas Created 3 years, 9 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"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 return nullptr; 280 return nullptr;
281 281
282 if (m_resolvedFilter) 282 if (m_resolvedFilter)
283 return m_resolvedFilter; 283 return m_resolvedFilter;
284 284
285 FilterOperations operations = 285 FilterOperations operations =
286 FilterOperationResolver::createOffscreenFilterOperations(*m_filterValue); 286 FilterOperationResolver::createOffscreenFilterOperations(*m_filterValue);
287 287
288 // We can't reuse m_fillFlags and m_strokeFlags for the filter, since these 288 // We can't reuse m_fillFlags and m_strokeFlags for the filter, since these
289 // incorporate the global alpha, which isn't applicable here. 289 // incorporate the global alpha, which isn't applicable here.
290 SkPaint fillFlagsForFilter; 290 PaintFlags fillFlagsForFilter;
291 m_fillStyle->applyToFlags(fillFlagsForFilter); 291 m_fillStyle->applyToFlags(fillFlagsForFilter);
292 fillFlagsForFilter.setColor(m_fillStyle->paintColor()); 292 fillFlagsForFilter.setColor(m_fillStyle->paintColor());
293 SkPaint strokeFlagsForFilter; 293 PaintFlags strokeFlagsForFilter;
294 m_strokeStyle->applyToFlags(strokeFlagsForFilter); 294 m_strokeStyle->applyToFlags(strokeFlagsForFilter);
295 strokeFlagsForFilter.setColor(m_strokeStyle->paintColor()); 295 strokeFlagsForFilter.setColor(m_strokeStyle->paintColor());
296 296
297 FilterEffectBuilder filterEffectBuilder( 297 FilterEffectBuilder filterEffectBuilder(
298 FloatRect((FloatPoint()), FloatSize(canvasSize)), 298 FloatRect((FloatPoint()), FloatSize(canvasSize)),
299 1.0f, // Deliberately ignore zoom on the canvas element. 299 1.0f, // Deliberately ignore zoom on the canvas element.
300 &fillFlagsForFilter, &strokeFlagsForFilter); 300 &fillFlagsForFilter, &strokeFlagsForFilter);
301 301
302 FilterEffect* lastEffect = filterEffectBuilder.buildFilterEffect(operations); 302 FilterEffect* lastEffect = filterEffectBuilder.buildFilterEffect(operations);
303 if (lastEffect) { 303 if (lastEffect) {
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 flags->setLooper(0); 593 flags->setLooper(0);
594 flags->setImageFilter(shadowAndForegroundImageFilter()); 594 flags->setImageFilter(shadowAndForegroundImageFilter());
595 return flags; 595 return flags;
596 } 596 }
597 flags->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper())); 597 flags->setLooper(sk_ref_sp(shadowAndForegroundDrawLooper()));
598 flags->setImageFilter(0); 598 flags->setImageFilter(0);
599 return flags; 599 return flags;
600 } 600 }
601 601
602 } // namespace blink 602 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698