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

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

Issue 1583103007: Use an up-to-date canvas size when building canvas filters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused function Created 4 years, 11 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 m_isTransformInvertible = transform.isInvertible(); 334 m_isTransformInvertible = transform.isInvertible();
335 m_transform = transform; 335 m_transform = transform;
336 } 336 }
337 337
338 void CanvasRenderingContext2DState::resetTransform() 338 void CanvasRenderingContext2DState::resetTransform()
339 { 339 {
340 m_transform.makeIdentity(); 340 m_transform.makeIdentity();
341 m_isTransformInvertible = true; 341 m_isTransformInvertible = true;
342 } 342 }
343 343
344 SkImageFilter* CanvasRenderingContext2DState::getFilter(Element* styleResolution Host, const Font& font) const 344 SkImageFilter* CanvasRenderingContext2DState::getFilter(Element* styleResolution Host, const Font& font, IntSize canvasSize) const
345 { 345 {
346 if (!m_filterValue) 346 if (!m_filterValue)
347 return nullptr; 347 return nullptr;
348 348
349 if (!m_resolvedFilter) { 349 if (!m_resolvedFilter) {
350 RefPtr<ComputedStyle> filterStyle = ComputedStyle::create(); 350 RefPtr<ComputedStyle> filterStyle = ComputedStyle::create();
351 // Must set font in case the filter uses any font-relative units (em, ex ) 351 // Must set font in case the filter uses any font-relative units (em, ex )
352 filterStyle->setFont(font); 352 filterStyle->setFont(font);
353 353
354 StyleResolverState resolverState(styleResolutionHost->document(), styleR esolutionHost, filterStyle.get()); 354 StyleResolverState resolverState(styleResolutionHost->document(), styleR esolutionHost, filterStyle.get());
355 resolverState.setStyle(filterStyle); 355 resolverState.setStyle(filterStyle);
356 356
357 StyleBuilder::applyProperty(CSSPropertyWebkitFilter, resolverState, m_fi lterValue.get()); 357 StyleBuilder::applyProperty(CSSPropertyWebkitFilter, resolverState, m_fi lterValue.get());
358 RefPtrWillBeRawPtr<FilterEffectBuilder> filterEffectBuilder = FilterEffe ctBuilder::create(); 358 RefPtrWillBeRawPtr<FilterEffectBuilder> filterEffectBuilder = FilterEffe ctBuilder::create();
359 359
360 // We can't reuse m_fillPaint and m_strokePaint for the filter, since th ese incorporate 360 // We can't reuse m_fillPaint and m_strokePaint for the filter, since th ese incorporate
361 // the global alpha, which isn't applicable here. 361 // the global alpha, which isn't applicable here.
362 SkPaint fillPaintForFilter; 362 SkPaint fillPaintForFilter;
363 SkPaint strokePaintForFilter; 363 SkPaint strokePaintForFilter;
364 m_fillStyle->applyToPaint(fillPaintForFilter); 364 m_fillStyle->applyToPaint(fillPaintForFilter);
365 m_strokeStyle->applyToPaint(strokePaintForFilter); 365 m_strokeStyle->applyToPaint(strokePaintForFilter);
366 fillPaintForFilter.setColor(m_fillStyle->paintColor()); 366 fillPaintForFilter.setColor(m_fillStyle->paintColor());
367 strokePaintForFilter.setColor(m_strokeStyle->paintColor()); 367 strokePaintForFilter.setColor(m_strokeStyle->paintColor());
368 FloatSize floatCanvasSize(canvasSize);
368 const double effectiveZoom = 1.0; // Deliberately ignore zoom on the can vas element 369 const double effectiveZoom = 1.0; // Deliberately ignore zoom on the can vas element
369 filterEffectBuilder->build(styleResolutionHost, filterStyle->filter(), e ffectiveZoom, &fillPaintForFilter, &strokePaintForFilter); 370 filterEffectBuilder->build(styleResolutionHost, filterStyle->filter(), e ffectiveZoom, &floatCanvasSize, &fillPaintForFilter, &strokePaintForFilter);
370 371
371 SkiaImageFilterBuilder imageFilterBuilder; 372 SkiaImageFilterBuilder imageFilterBuilder;
372 RefPtrWillBeRawPtr<FilterEffect> lastEffect = filterEffectBuilder->lastE ffect(); 373 RefPtrWillBeRawPtr<FilterEffect> lastEffect = filterEffectBuilder->lastE ffect();
373 m_resolvedFilter = imageFilterBuilder.build(lastEffect.get(), ColorSpace DeviceRGB); 374 m_resolvedFilter = imageFilterBuilder.build(lastEffect.get(), ColorSpace DeviceRGB);
374 } 375 }
375 376
376 return m_resolvedFilter.get(); 377 return m_resolvedFilter.get();
377 } 378 }
378 379
379 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const 380 SkDrawLooper* CanvasRenderingContext2DState::emptyDrawLooper() const
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
589 paint->setLooper(0); 590 paint->setLooper(0);
590 paint->setImageFilter(shadowAndForegroundImageFilter()); 591 paint->setImageFilter(shadowAndForegroundImageFilter());
591 return paint; 592 return paint;
592 } 593 }
593 paint->setLooper(shadowAndForegroundDrawLooper()); 594 paint->setLooper(shadowAndForegroundDrawLooper());
594 paint->setImageFilter(0); 595 paint->setImageFilter(0);
595 return paint; 596 return paint;
596 } 597 }
597 598
598 } // blink 599 } // blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698