diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/html/HTMLCanvasElement.h | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/html/HTMLCanvasElement.h')
| -rw-r--r-- | WebCore/html/HTMLCanvasElement.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/html/HTMLCanvasElement.h b/WebCore/html/HTMLCanvasElement.h index d399d5f..ef5d289 100644 --- a/WebCore/html/HTMLCanvasElement.h +++ b/WebCore/html/HTMLCanvasElement.h @@ -32,10 +32,6 @@ #include "HTMLElement.h" #include "IntSize.h" -#if ENABLE(3D_CANVAS) -#include "GraphicsContext3D.h" -#endif - namespace WebCore { class CanvasContextAttributes; @@ -114,6 +110,7 @@ public: bool is3D() const; #endif +<<<<<<< HEAD:WebCore/html/HTMLCanvasElement.h #ifdef ANDROID_INSTRUMENT void* operator new(size_t size) { return HTMLElement::operator new(size); @@ -129,6 +126,9 @@ public: HTMLElement::operator delete[](p, size); } #endif +======= + void makeRenderingResultsAvailable(); +>>>>>>> webkit.org at r63859:WebCore/html/HTMLCanvasElement.h private: HTMLCanvasElement(const QualifiedName&, Document*); |