summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/html/HTMLCanvasElement.h
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-11-17 05:49:13 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 05:49:13 -0800
commit1343dcc6f50e1060fc392a2866438c1495449d0f (patch)
tree1d6bd1020d3808031268da591653d20b9b087912 /Source/WebCore/html/HTMLCanvasElement.h
parent821a96a38b73feb4a362a5a738f355b52667253f (diff)
parentb359438e11520b3e3b6801ad1280e1bdef2b986c (diff)
downloadexternal_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.zip
external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.gz
external_webkit-1343dcc6f50e1060fc392a2866438c1495449d0f.tar.bz2
Merge "Removing ANDROID_INSTRUMENTATION code"
Diffstat (limited to 'Source/WebCore/html/HTMLCanvasElement.h')
-rw-r--r--Source/WebCore/html/HTMLCanvasElement.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.h b/Source/WebCore/html/HTMLCanvasElement.h
index 9eab209..207c384 100644
--- a/Source/WebCore/html/HTMLCanvasElement.h
+++ b/Source/WebCore/html/HTMLCanvasElement.h
@@ -128,22 +128,6 @@ public:
void makeRenderingResultsAvailable();
-#ifdef ANDROID_INSTRUMENT
- void* operator new(size_t size) {
- return HTMLElement::operator new(size);
- }
- void* operator new[](size_t size) {
- return HTMLElement::operator new[](size);
- }
-
- void operator delete(void* p, size_t size) {
- HTMLElement::operator delete(p, size);
- }
- void operator delete[](void* p, size_t size) {
- HTMLElement::operator delete[](p, size);
- }
-#endif
-
private:
HTMLCanvasElement(const QualifiedName&, Document*);