diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-05 08:59:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-05 08:59:28 -0700 |
| commit | 821cfee07d114f74b98673d380d90c08d001df02 (patch) | |
| tree | a27d34768a5943edd29a21d893003aa1a4d1bf49 /WebKit | |
| parent | 24c6a233780d45269caa0095213e59a3ded360b6 (diff) | |
| parent | 13cb86d508a2af29cda7a8336a3375ccddab1bd0 (diff) | |
| download | external_webkit-821cfee07d114f74b98673d380d90c08d001df02.zip external_webkit-821cfee07d114f74b98673d380d90c08d001df02.tar.gz external_webkit-821cfee07d114f74b98673d380d90c08d001df02.tar.bz2 | |
Merge changes I27224716,I6102bbce
* changes:
Don't include JavaScriptCore/config.h from WebCore/WebCorePrefix.h
Generate files correctly
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/V8Counters.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/V8Counters.cpp b/WebKit/android/WebCoreSupport/V8Counters.cpp index 4e7351d..d164f9a 100644 --- a/WebKit/android/WebCoreSupport/V8Counters.cpp +++ b/WebKit/android/WebCoreSupport/V8Counters.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if USE(V8) #ifdef ANDROID_INSTRUMENT @@ -31,12 +30,14 @@ #include "config.h" #include "V8Counters.h" -#include "NotImplemented.h" +#include "NotImplemented.h" #include <utils/Log.h> #include <wtf/text/CString.h> #include <wtf/text/StringHash.h> +#if USE(V8) + namespace WebCore { V8Counters::Counter::Counter(bool isHistogram) |