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 /WebKit | |
| 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 'WebKit')
| -rw-r--r-- | WebKit/mac/ChangeLog | 9 | ||||
| -rw-r--r-- | WebKit/mac/Plugins/Hosted/ProxyInstance.h | 2 | ||||
| -rw-r--r-- | WebKit/qt/Api/qwebframe.cpp | 2 | ||||
| -rw-r--r-- | WebKit/qt/ChangeLog | 9 |
4 files changed, 20 insertions, 2 deletions
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog index b05f2a8..a92cf69 100644 --- a/WebKit/mac/ChangeLog +++ b/WebKit/mac/ChangeLog @@ -1,3 +1,12 @@ +2010-01-19 Steve Block <steveblock@google.com> + + Reviewed by Adam Barth. + + Renames WebCore/bridge/runtime.[cpp|h] to WebCore/bridge/Bridge.[cpp|h] + https://bugs.webkit.org/show_bug.cgi?id=33801 + + * Plugins/Hosted/ProxyInstance.h: + 2009-12-10 Jon Honeycutt <jhoneycutt@apple.com> Mac build fix. Unreviewed. diff --git a/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/WebKit/mac/Plugins/Hosted/ProxyInstance.h index 8a07def..f84c685 100644 --- a/WebKit/mac/Plugins/Hosted/ProxyInstance.h +++ b/WebKit/mac/Plugins/Hosted/ProxyInstance.h @@ -28,7 +28,7 @@ #ifndef ProxyInstance_h #define ProxyInstance_h -#include <WebCore/runtime.h> +#include <WebCore/Bridge.h> #include <WebCore/runtime_root.h> #include <wtf/OwnPtr.h> #include "WebKitPluginHostTypes.h" diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp index ef97c3b..b98b4d5 100644 --- a/WebKit/qt/Api/qwebframe.cpp +++ b/WebKit/qt/Api/qwebframe.cpp @@ -21,6 +21,7 @@ #include "config.h" #include "qwebframe.h" +#include "Bridge.h" #include "CallFrame.h" #include "Document.h" #include "DocumentLoader.h" @@ -67,7 +68,6 @@ #include "qwebpage_p.h" #include "qwebsecurityorigin.h" #include "qwebsecurityorigin_p.h" -#include "runtime.h" #include "runtime_object.h" #include "runtime_root.h" #include "wtf/HashMap.h" diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog index 2c2722b..c6e7465 100644 --- a/WebKit/qt/ChangeLog +++ b/WebKit/qt/ChangeLog @@ -1,3 +1,12 @@ +2010-01-19 Steve Block <steveblock@google.com> + + Reviewed by Adam Barth. + + Renames WebCore/bridge/runtime.[cpp|h] to WebCore/bridge/Bridge.[cpp|h] + https://bugs.webkit.org/show_bug.cgi?id=33801 + + * Api/qwebframe.cpp: + 2009-12-07 Benjamin Poulain <benjamin.poulain@nokia.com> Reviewed by Kenneth Rohde Christiansen. |