diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 04:09:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-20 04:09:40 -0800 |
| commit | 3f4b1969e5c86f542a2b86118467a8fc8cec9c7c (patch) | |
| tree | 70abd1cdc88b9496152a2a30bf47967acfcd64e1 /WebCore/bindings/js/ScriptControllerQt.cpp | |
| parent | 2ba2794f78c094c88827bafc31f42afefe710d1e (diff) | |
| parent | 070350ddbf1f62724597633c31eda461926f365d (diff) | |
| download | external_webkit-3f4b1969e5c86f542a2b86118467a8fc8cec9c7c.zip external_webkit-3f4b1969e5c86f542a2b86118467a8fc8cec9c7c.tar.gz external_webkit-3f4b1969e5c86f542a2b86118467a8fc8cec9c7c.tar.bz2 | |
am 070350dd: Merge changes I61cfea19,Ib2fe7793 into eclair-mr2
Merge commit '070350ddbf1f62724597633c31eda461926f365d' into eclair-mr2-plus-aosp
* commit '070350ddbf1f62724597633c31eda461926f365d':
Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class
Cherry-pick WebKit change 53464 to rename WebCore/bridge/runtime to WebCore/bridge/Bridge
Diffstat (limited to 'WebCore/bindings/js/ScriptControllerQt.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptControllerQt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bindings/js/ScriptControllerQt.cpp b/WebCore/bindings/js/ScriptControllerQt.cpp index 6b14190..55d4ba4 100644 --- a/WebCore/bindings/js/ScriptControllerQt.cpp +++ b/WebCore/bindings/js/ScriptControllerQt.cpp @@ -36,11 +36,11 @@ #include "config.h" #include "ScriptController.h" +#include "Bridge.h" #include "DOMWindow.h" #include "PluginView.h" #include "qt_instance.h" #include "runtime_root.h" -#include "runtime.h" #include <QWidget> |