Index: Source/core/html/canvas/CanvasRenderingContext2D.cpp |
diff --git a/Source/core/html/canvas/CanvasRenderingContext2D.cpp b/Source/core/html/canvas/CanvasRenderingContext2D.cpp |
index 45c9f4dd579f97d4a79c4c7ceb83d3be101b10bc..cec69502eae02acf1b3bba99a19caacc5f656a75 100644 |
--- a/Source/core/html/canvas/CanvasRenderingContext2D.cpp |
+++ b/Source/core/html/canvas/CanvasRenderingContext2D.cpp |
@@ -44,6 +44,7 @@ |
#include "core/css/resolver/StyleResolver.h" |
#include "core/dom/ExceptionCode.h" |
#include "core/fetch/ImageResource.h" |
+#include "core/frame/ImageBitmap.h" |
#include "core/html/HTMLCanvasElement.h" |
#include "core/html/HTMLImageElement.h" |
#include "core/html/HTMLMediaElement.h" |
@@ -53,8 +54,7 @@ |
#include "core/html/canvas/CanvasGradient.h" |
#include "core/html/canvas/CanvasPattern.h" |
#include "core/html/canvas/CanvasStyle.h" |
-#include "core/html/canvas/DOMPath.h" |
-#include "core/frame/ImageBitmap.h" |
+#include "core/html/canvas/DOMPath2D.h" |
#include "core/rendering/RenderImage.h" |
#include "core/rendering/RenderLayer.h" |
#include "core/rendering/RenderTheme.h" |
@@ -817,12 +817,12 @@ void CanvasRenderingContext2D::beginPath() |
m_path.clear(); |
} |
-PassRefPtr<DOMPath> CanvasRenderingContext2D::currentPath() |
+PassRefPtr<DOMPath2D> CanvasRenderingContext2D::currentPath() |
{ |
- return DOMPath::create(m_path); |
+ return DOMPath2D::create(m_path); |
} |
-void CanvasRenderingContext2D::setCurrentPath(DOMPath* path) |
+void CanvasRenderingContext2D::setCurrentPath(DOMPath2D* path) |
{ |
if (!path) |
return; |
@@ -923,7 +923,7 @@ void CanvasRenderingContext2D::fill(const String& windingRuleString) |
fillInternal(m_path, windingRuleString); |
} |
-void CanvasRenderingContext2D::fill(DOMPath* domPath, const String& windingRuleString) |
+void CanvasRenderingContext2D::fill(DOMPath2D* domPath, const String& windingRuleString) |
{ |
fillInternal(domPath->path(), windingRuleString); |
} |
@@ -961,7 +961,7 @@ void CanvasRenderingContext2D::stroke() |
strokeInternal(m_path); |
} |
-void CanvasRenderingContext2D::stroke(DOMPath* domPath) |
+void CanvasRenderingContext2D::stroke(DOMPath2D* domPath) |
{ |
strokeInternal(domPath->path()); |
} |
@@ -990,7 +990,7 @@ void CanvasRenderingContext2D::clip(const String& windingRuleString) |
clipInternal(m_path, windingRuleString); |
} |
-void CanvasRenderingContext2D::clip(DOMPath* domPath, const String& windingRuleString) |
+void CanvasRenderingContext2D::clip(DOMPath2D* domPath, const String& windingRuleString) |
{ |
clipInternal(domPath->path(), windingRuleString); |
} |