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

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

Issue 1886063002: Make canvas filters use the font size in effect when the filter is set (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 years, 8 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 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 4 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 5 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 7 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved. 8 * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 9 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
10 * 10 *
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 ImageBuffer* buffer = canvas()->buffer(); 365 ImageBuffer* buffer = canvas()->buffer();
366 if (buffer) 366 if (buffer)
367 buffer->setHasExpensiveOp(); 367 buffer->setHasExpensiveOp();
368 } 368 }
369 369
370 canvas()->didDraw(SkRect::Make(dirtyRect)); 370 canvas()->didDraw(SkRect::Make(dirtyRect));
371 } 371 }
372 372
373 bool CanvasRenderingContext2D::stateHasFilter() 373 bool CanvasRenderingContext2D::stateHasFilter()
374 { 374 {
375 return state().hasFilter(canvas(), accessFont(), canvas()->size(), this); 375 return state().hasFilter(canvas(), canvas()->size(), this);
376 } 376 }
377 377
378 SkImageFilter* CanvasRenderingContext2D::stateGetFilter() 378 SkImageFilter* CanvasRenderingContext2D::stateGetFilter()
379 { 379 {
380 return state().getFilter(canvas(), accessFont(), canvas()->size(), this); 380 return state().getFilter(canvas(), canvas()->size(), this);
381 }
382
383 void CanvasRenderingContext2D::snapshotStateForFilter()
384 {
385 modifiableState().setFontForFilter(accessFont());
381 } 386 }
382 387
383 SkCanvas* CanvasRenderingContext2D::drawingCanvas() const 388 SkCanvas* CanvasRenderingContext2D::drawingCanvas() const
384 { 389 {
385 if (isContextLost()) 390 if (isContextLost())
386 return nullptr; 391 return nullptr;
387 return canvas()->drawingCanvas(); 392 return canvas()->drawingCanvas();
388 } 393 }
389 394
390 SkCanvas* CanvasRenderingContext2D::existingDrawingCanvas() const 395 SkCanvas* CanvasRenderingContext2D::existingDrawingCanvas() const
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 1051
1047 unsigned CanvasRenderingContext2D::hitRegionsCount() const 1052 unsigned CanvasRenderingContext2D::hitRegionsCount() const
1048 { 1053 {
1049 if (m_hitRegionManager) 1054 if (m_hitRegionManager)
1050 return m_hitRegionManager->getHitRegionsCount(); 1055 return m_hitRegionManager->getHitRegionsCount();
1051 1056
1052 return 0; 1057 return 0;
1053 } 1058 }
1054 1059
1055 } // namespace blink 1060 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698