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

diff --git a/Source/WebCore/bridge/jni/JavaMethod.cpp b/Source/WebCore/bridge/jni/JavaMethod.cpp
index 55f29df..69dc99b 100644 (file)
--- 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;