diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 04:02:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-20 04:02:08 -0800 |
| commit | 070350ddbf1f62724597633c31eda461926f365d (patch) | |
| tree | 70abd1cdc88b9496152a2a30bf47967acfcd64e1 /WebCore/bindings/js/ScriptControllerWx.cpp | |
| parent | 4d667d7fc4db50148a046f6913a0db1f0f4cbba5 (diff) | |
| parent | 8b8f27ce488180e0b069765f04e893dcd5dc4447 (diff) | |
| download | external_webkit-070350ddbf1f62724597633c31eda461926f365d.zip external_webkit-070350ddbf1f62724597633c31eda461926f365d.tar.gz external_webkit-070350ddbf1f62724597633c31eda461926f365d.tar.bz2 | |
Merge changes I61cfea19,Ib2fe7793 into eclair-mr2
* changes:
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/ScriptControllerWx.cpp')
| -rw-r--r-- | WebCore/bindings/js/ScriptControllerWx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bindings/js/ScriptControllerWx.cpp b/WebCore/bindings/js/ScriptControllerWx.cpp index 1c14928..1d7b4ca 100644 --- a/WebCore/bindings/js/ScriptControllerWx.cpp +++ b/WebCore/bindings/js/ScriptControllerWx.cpp @@ -27,9 +27,9 @@ #include "config.h" #include "ScriptController.h" +#include "Bridge.h" #include "PluginView.h" #include "runtime_root.h" -#include "runtime.h" namespace WebCore { |