summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2010-03-03 10:41:52 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-03 10:41:52 -0800
commitc9febf8638abc57bc215380ffbe3a44468f1b9d6 (patch)
treeee13558c73fc7b737bd659618cc584b1635bbb11 /WebKit
parent5af2b523fc6fdb1268cb05a27308f09e9f7a8490 (diff)
parent4bbbef2a208187104163ecdbe4278d709dede038 (diff)
downloadexternal_webkit-c9febf8638abc57bc215380ffbe3a44468f1b9d6.zip
external_webkit-c9febf8638abc57bc215380ffbe3a44468f1b9d6.tar.gz
external_webkit-c9febf8638abc57bc215380ffbe3a44468f1b9d6.tar.bz2
Merge "Fix V8 build when instrumentation is on"
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/V8Counters.cpp2
-rw-r--r--WebKit/android/WebCoreSupport/V8Counters.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp
index c62efb9..7f3f3ad 100644
--- a/WebKit/android/WebCoreSupport/V8Counters.cpp
+++ b/WebKit/android/WebCoreSupport/V8Counters.cpp
@@ -25,7 +25,7 @@
#if USE(V8)
-#ifdef ANROID_INSTRUMENT
+#ifdef ANDROID_INSTRUMENT
#define LOG_TAG "WebCore"
diff --git a/WebKit/android/WebCoreSupport/V8Counters.h b/WebKit/android/WebCoreSupport/V8Counters.h
index dcce068..499b856 100644
--- a/WebKit/android/WebCoreSupport/V8Counters.h
+++ b/WebKit/android/WebCoreSupport/V8Counters.h
@@ -32,6 +32,7 @@
#include <PlatformString.h>
#include <v8.h>
+#include <wtf/HashMap.h>
namespace WebCore {