diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 16:08:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 10:37:17 +0100 |
| commit | 192c49d02eeb9cf618784ffef9639f8df38e3c16 (patch) | |
| tree | e5e812b8ff4a7e377c227c4de484b8d1693f11d3 /Source/WebCore/bridge | |
| parent | 3ddac44fe7d289e2d30214ccda5120c9f789be0a (diff) | |
| download | external_webkit-192c49d02eeb9cf618784ffef9639f8df38e3c16.zip external_webkit-192c49d02eeb9cf618784ffef9639f8df38e3c16.tar.gz external_webkit-192c49d02eeb9cf618784ffef9639f8df38e3c16.tar.bz2 | |
Merge WebKit at r80534: Fix JavaMethod.cpp
Partial cherry pick of http://trac.webkit.org/changeset/81040
Need to add the JSC guard (it was added unguraded
in http://trac.webkit.org/changeset/79904)
Change-Id: I880e241e2369ee4ffc616286d195989655e18cc2
Diffstat (limited to 'Source/WebCore/bridge')
| -rw-r--r-- | Source/WebCore/bridge/jni/JavaMethod.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/bridge/jni/JavaMethod.cpp b/Source/WebCore/bridge/jni/JavaMethod.cpp index 55f29df..69dc99b 100644 --- a/Source/WebCore/bridge/jni/JavaMethod.cpp +++ b/Source/WebCore/bridge/jni/JavaMethod.cpp @@ -31,7 +31,11 @@ #include "JavaString.h" +#if USE(JSC) +#include <runtime/JSObject.h> #include <runtime/ScopeChain.h> +#endif + #include <wtf/text/StringBuilder.h> using namespace JSC; |