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

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

Issue 238543002: We don't need overloading about fill, clip, isPointInPath anymore. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after
1017 } 1017 }
1018 1018
1019 c->setFillRule(windRule); 1019 c->setFillRule(windRule);
1020 } 1020 }
1021 1021
1022 void CanvasRenderingContext2D::fill(const String& windingRuleString) 1022 void CanvasRenderingContext2D::fill(const String& windingRuleString)
1023 { 1023 {
1024 fillInternal(m_path, windingRuleString); 1024 fillInternal(m_path, windingRuleString);
1025 } 1025 }
1026 1026
1027 void CanvasRenderingContext2D::fill(Path2D* domPath)
1028 {
1029 fill(domPath, "nonzero");
1030 }
1031
1032 void CanvasRenderingContext2D::fill(Path2D* domPath, const String& windingRuleSt ring) 1027 void CanvasRenderingContext2D::fill(Path2D* domPath, const String& windingRuleSt ring)
1033 { 1028 {
1034 fillInternal(domPath->path(), windingRuleString); 1029 fillInternal(domPath->path(), windingRuleString);
1035 } 1030 }
1036 1031
1037 void CanvasRenderingContext2D::strokeInternal(const Path& path) 1032 void CanvasRenderingContext2D::strokeInternal(const Path& path)
1038 { 1033 {
1039 if (path.isEmpty()) { 1034 if (path.isEmpty()) {
1040 return; 1035 return;
1041 } 1036 }
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 1091
1097 realizeSaves(); 1092 realizeSaves();
1098 c->canvasClip(path, parseWinding(windingRuleString)); 1093 c->canvasClip(path, parseWinding(windingRuleString));
1099 } 1094 }
1100 1095
1101 void CanvasRenderingContext2D::clip(const String& windingRuleString) 1096 void CanvasRenderingContext2D::clip(const String& windingRuleString)
1102 { 1097 {
1103 clipInternal(m_path, windingRuleString); 1098 clipInternal(m_path, windingRuleString);
1104 } 1099 }
1105 1100
1106 void CanvasRenderingContext2D::clip(Path2D* domPath)
1107 {
1108 clip(domPath, "nonzero");
1109 }
1110
1111 void CanvasRenderingContext2D::clip(Path2D* domPath, const String& windingRuleSt ring) 1101 void CanvasRenderingContext2D::clip(Path2D* domPath, const String& windingRuleSt ring)
1112 { 1102 {
1113 clipInternal(domPath->path(), windingRuleString); 1103 clipInternal(domPath->path(), windingRuleString);
1114 } 1104 }
1115 1105
1116 bool CanvasRenderingContext2D::isPointInPath(const float x, const float y, const String& windingRuleString) 1106 bool CanvasRenderingContext2D::isPointInPath(const float x, const float y, const String& windingRuleString)
1117 { 1107 {
1118 return isPointInPathInternal(m_path, x, y, windingRuleString); 1108 return isPointInPathInternal(m_path, x, y, windingRuleString);
1119 } 1109 }
1120 1110
1121 bool CanvasRenderingContext2D::isPointInPath(Path2D* domPath, const float x, con st float y)
1122 {
1123 return isPointInPath(domPath, x, y, "nonzero");
1124 }
1125
1126 bool CanvasRenderingContext2D::isPointInPath(Path2D* domPath, const float x, con st float y, const String& windingRuleString) 1111 bool CanvasRenderingContext2D::isPointInPath(Path2D* domPath, const float x, con st float y, const String& windingRuleString)
1127 { 1112 {
1128 return isPointInPathInternal(domPath->path(), x, y, windingRuleString); 1113 return isPointInPathInternal(domPath->path(), x, y, windingRuleString);
1129 } 1114 }
1130 1115
1131 bool CanvasRenderingContext2D::isPointInPathInternal(const Path& path, const flo at x, const float y, const String& windingRuleString) 1116 bool CanvasRenderingContext2D::isPointInPathInternal(const Path& path, const flo at x, const float y, const String& windingRuleString)
1132 { 1117 {
1133 GraphicsContext* c = drawingContext(); 1118 GraphicsContext* c = drawingContext();
1134 if (!c) 1119 if (!c)
1135 return false; 1120 return false;
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
2411 c->setAlphaAsFloat(1.0); 2396 c->setAlphaAsFloat(1.0);
2412 c->clearShadow(); 2397 c->clearShadow();
2413 c->setCompositeOperation(CompositeSourceOver, blink::WebBlendModeNormal); 2398 c->setCompositeOperation(CompositeSourceOver, blink::WebBlendModeNormal);
2414 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor); 2399 c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor);
2415 c->restore(); 2400 c->restore();
2416 2401
2417 didDraw(dirtyRect); 2402 didDraw(dirtyRect);
2418 } 2403 }
2419 2404
2420 } // namespace WebCore 2405 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698