diff options
| author | Steve Block <steveblock@google.com> | 2010-01-19 13:01:06 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-19 15:04:38 +0000 |
| commit | 1325a8463a7f9bc2ec969c7728aba33e3de91a17 (patch) | |
| tree | b292f004a258e20f87f6e6e347449d567ca23904 /WebCore/bridge/jni | |
| parent | be164dbcfc9adfae8ae7c559ebdff00580f8086d (diff) | |
| download | external_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.zip external_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.tar.gz external_webkit-1325a8463a7f9bc2ec969c7728aba33e3de91a17.tar.bz2 | |
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
See http://trac.webkit.org/changeset/53464
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.
Note that this change required an update to ScriptControllerAndroid.cpp and a manual fix in
PluginView.cpp to add a temporary ANDROID guard.
Change-Id: Ib2fe7793f7b3212e3b41324ff7dc5bb15c0e14b4
Diffstat (limited to 'WebCore/bridge/jni')
| -rw-r--r-- | WebCore/bridge/jni/jsc/JavaInstanceJSC.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.h b/WebCore/bridge/jni/jsc/JavaInstanceJSC.h index fcd53f4..d7b6102 100644 --- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.h +++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.h @@ -28,7 +28,7 @@ #if ENABLE(MAC_JAVA_BRIDGE) -#include "runtime.h" +#include "Bridge.h" #include "runtime_root.h" #include <JavaVM/jni.h> |