diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/html/HTMLCanvasElement.cpp | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/html/HTMLCanvasElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLCanvasElement.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WebCore/html/HTMLCanvasElement.cpp b/WebCore/html/HTMLCanvasElement.cpp index ef85323..205cf28 100644 --- a/WebCore/html/HTMLCanvasElement.cpp +++ b/WebCore/html/HTMLCanvasElement.cpp @@ -27,14 +27,11 @@ #include "config.h" #include "HTMLCanvasElement.h" +#include "Attribute.h" #include "CanvasContextAttributes.h" -#include "CanvasRenderingContext2D.h" -#if ENABLE(3D_CANVAS) -#include "WebGLContextAttributes.h" -#include "WebGLRenderingContext.h" -#endif #include "CanvasGradient.h" #include "CanvasPattern.h" +#include "CanvasRenderingContext2D.h" #include "CanvasStyle.h" #include "Chrome.h" #include "Document.h" @@ -42,13 +39,17 @@ #include "GraphicsContext.h" #include "HTMLNames.h" #include "ImageBuffer.h" -#include "MappedAttribute.h" #include "Page.h" #include "RenderHTMLCanvas.h" #include "Settings.h" #include <math.h> #include <stdio.h> +#if ENABLE(3D_CANVAS) +#include "WebGLContextAttributes.h" +#include "WebGLRenderingContext.h" +#endif + namespace WebCore { using namespace HTMLNames; @@ -90,7 +91,7 @@ int HTMLCanvasElement::tagPriority() const #endif -void HTMLCanvasElement::parseMappedAttribute(MappedAttribute* attr) +void HTMLCanvasElement::parseMappedAttribute(Attribute* attr) { const QualifiedName& attrName = attr->name(); if (attrName == widthAttr || attrName == heightAttr) |