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

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

Issue 226953004: Remove get/set currentPath in canvas (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 if (state().m_fillStyle && state().m_fillStyle->isEquivalentCMYKA(c, m, y, k , a)) 927 if (state().m_fillStyle && state().m_fillStyle->isEquivalentCMYKA(c, m, y, k , a))
928 return; 928 return;
929 setFillStyle(CanvasStyle::createFromCMYKAChannels(c, m, y, k, a)); 929 setFillStyle(CanvasStyle::createFromCMYKAChannels(c, m, y, k, a));
930 } 930 }
931 931
932 void CanvasRenderingContext2D::beginPath() 932 void CanvasRenderingContext2D::beginPath()
933 { 933 {
934 m_path.clear(); 934 m_path.clear();
935 } 935 }
936 936
937 PassRefPtr<Path2D> CanvasRenderingContext2D::currentPath()
938 {
939 return Path2D::create(m_path);
940 }
941
942 void CanvasRenderingContext2D::setCurrentPath(Path2D* path)
943 {
944 if (!path)
945 return;
946 m_path = path->path();
947 }
948
949 static bool validateRectForCanvas(float& x, float& y, float& width, float& heigh t) 937 static bool validateRectForCanvas(float& x, float& y, float& width, float& heigh t)
950 { 938 {
951 if (!std::isfinite(x) | !std::isfinite(y) | !std::isfinite(width) | !std::is finite(height)) 939 if (!std::isfinite(x) | !std::isfinite(y) | !std::isfinite(width) | !std::is finite(height))
952 return false; 940 return false;
953 941
954 if (!width && !height) 942 if (!width && !height)
955 return false; 943 return false;
956 944
957 if (width < 0) { 945 if (width < 0) {
958 width = -width; 946 width = -width;
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 c->setAlphaAsFloat(1.0); 2370 c->setAlphaAsFloat(1.0);
2383 c->clearShadow(); 2371 c->clearShadow();
2384 c->setCompositeOperation(CompositeSourceOver, blink::WebBlendModeNormal); 2372 c->setCompositeOperation(CompositeSourceOver, blink::WebBlendModeNormal);
2385 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor); 2373 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor);
2386 c->restore(); 2374 c->restore();
2387 2375
2388 didDraw(dirtyRect); 2376 didDraw(dirtyRect);
2389 } 2377 }
2390 2378
2391 } // namespace WebCore 2379 } // 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