diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-18 15:36:45 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-18 19:20:06 +0100 |
| commit | d227fc870c7a697500a3c900c31baf05fb9a8524 (patch) | |
| tree | a3fa109aa5bf52fef562ac49d97a2f723889cc71 /WebCore/bridge/jni | |
| parent | f2c627513266faa73f7669058d98c60769fb3524 (diff) | |
| download | external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.zip external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.tar.gz external_webkit-d227fc870c7a697500a3c900c31baf05fb9a8524.tar.bz2 | |
Merge WebKit r47420
Diffstat (limited to 'WebCore/bridge/jni')
| -rw-r--r-- | WebCore/bridge/jni/jni_jsobject.mm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm index c9af8b0..eb4a6bd 100644 --- a/WebCore/bridge/jni/jni_jsobject.mm +++ b/WebCore/bridge/jni/jni_jsobject.mm @@ -29,19 +29,18 @@ #if ENABLE(MAC_JAVA_BRIDGE) #include "Frame.h" +#include "ScriptController.h" +#include "StringSourceProvider.h" #include "WebCoreFrameView.h" #include "jni_runtime.h" #include "jni_utility.h" -#include "ScriptController.h" #include "runtime_object.h" #include "runtime_root.h" #include <interpreter/CallFrame.h> +#include <runtime/Completion.h> #include <runtime/JSGlobalObject.h> #include <runtime/JSLock.h> -#include <runtime/Completion.h> -#include <runtime/Completion.h> #include <wtf/Assertions.h> -#include <parser/SourceProvider.h> using WebCore::Frame; |