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

Side by Side Diff: Source/core/html/canvas/CanvasRenderingContext2D.cpp

Issue 153883003: [SVG] SVGAnimatedTransform{,List} migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove m_zoomAndPan Created 6 years, 10 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 | Annotate | Revision Log
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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 return; 566 return;
567 realizeSaves(); 567 realizeSaves();
568 modifiableState().m_globalComposite = op; 568 modifiableState().m_globalComposite = op;
569 modifiableState().m_globalBlend = blendMode; 569 modifiableState().m_globalBlend = blendMode;
570 GraphicsContext* c = drawingContext(); 570 GraphicsContext* c = drawingContext();
571 if (!c) 571 if (!c)
572 return; 572 return;
573 c->setCompositeOperation(op, blendMode); 573 c->setCompositeOperation(op, blendMode);
574 } 574 }
575 575
576 void CanvasRenderingContext2D::setCurrentTransform(const SVGMatrix& matrix) 576 void CanvasRenderingContext2D::setCurrentTransform(PassRefPtr<SVGMatrixTearOff> passMatrixTearOff)
577 { 577 {
578 setTransform(matrix.a(), matrix.b(), matrix.c(), matrix.d(), matrix.e(), mat rix.f()); 578 RefPtr<SVGMatrixTearOff> matrixTearOff = passMatrixTearOff;
579 const AffineTransform& transform = matrixTearOff->value();
580 setTransform(transform.a(), transform.b(), transform.c(), transform.d(), tra nsform.e(), transform.f());
579 } 581 }
580 582
581 void CanvasRenderingContext2D::scale(float sx, float sy) 583 void CanvasRenderingContext2D::scale(float sx, float sy)
582 { 584 {
583 GraphicsContext* c = drawingContext(); 585 GraphicsContext* c = drawingContext();
584 if (!c) 586 if (!c)
585 return; 587 return;
586 if (!state().m_invertibleCTM) 588 if (!state().m_invertibleCTM)
587 return; 589 return;
588 590
(...skipping 1803 matching lines...) Expand 10 before | Expand all | Expand 10 after
2392 const int focusRingWidth = 5; 2394 const int focusRingWidth = 5;
2393 const int focusRingOutline = 0; 2395 const int focusRingOutline = 0;
2394 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor); 2396 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor);
2395 2397
2396 c->restore(); 2398 c->restore();
2397 2399
2398 didDraw(dirtyRect); 2400 didDraw(dirtyRect);
2399 } 2401 }
2400 2402
2401 } // namespace WebCore 2403 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | Source/core/html/canvas/CanvasRenderingContext2D.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698