diff options
| author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
|---|---|---|
| committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 01:14:49 +0000 |
| commit | 418ed5ab9cd81a2106893fce7aa121f693c6a98f (patch) | |
| tree | e91f4b793e1c1b73775c0507993c16ad6fabffce /chrome/plugin | |
| parent | 730aef2589a2e544797931eab99ea3d770040d99 (diff) | |
| download | chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.zip chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.gz chromium_src-418ed5ab9cd81a2106893fce7aa121f693c6a98f.tar.bz2 | |
Upstreaming WebKit.gyp
This mega patch contains a few simple but tightly dependent changes:
1. Deletion of webkit/api/WebKit.gyp. The file now lives in webkit.org.
2. Rename of webkit/webkit.gyp to webkit/webkit_glue.gyp. Having two webkit.gyp was a source of developer confusion.
3. Gyp dependencies are updated across chromium to point at the upstream WebKit.gyp and the renamed webkit_glue.gyp.
4. Some 200+ files include paths fixed to point to third_party/WebKit/WebKit/chromium instead of webkit/api. The later will be deleted in a subsequent patch.
Review URL: http://codereview.chromium.org/387020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
| -rw-r--r-- | chrome/plugin/npobject_proxy.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/npobject_stub.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/npobject_util.cc | 2 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_delegate_stub.cc | 4 | ||||
| -rw-r--r-- | chrome/plugin/webplugin_proxy.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/plugin/npobject_proxy.cc b/chrome/plugin/npobject_proxy.cc index 8071141..01cc4c7 100644 --- a/chrome/plugin/npobject_proxy.cc +++ b/chrome/plugin/npobject_proxy.cc @@ -7,7 +7,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_util.h" #include "chrome/plugin/plugin_channel.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/plugins/plugin_instance.h" diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index 7b0e213..958ad55 100644 --- a/chrome/plugin/npobject_stub.cc +++ b/chrome/plugin/npobject_stub.cc @@ -11,7 +11,7 @@ #include "chrome/plugin/plugin_thread.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/plugin_constants_win.h" using WebKit::WebBindings; diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc index 71d866e..7594225 100644 --- a/chrome/plugin/npobject_util.cc +++ b/chrome/plugin/npobject_util.cc @@ -8,7 +8,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/plugin/npobject_proxy.h" #include "chrome/plugin/plugin_channel_base.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/nphostapi.h" #include "webkit/glue/plugins/plugin_host.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index ac19f31..c02b42f 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -18,8 +18,8 @@ #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" -#include "webkit/api/public/WebCursorInfo.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webcursor.h" diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc index 9983315..61ecc7e 100644 --- a/chrome/plugin/webplugin_proxy.cc +++ b/chrome/plugin/webplugin_proxy.cc @@ -28,7 +28,7 @@ #include "chrome/plugin/plugin_thread.h" #include "chrome/plugin/webplugin_delegate_stub.h" #include "skia/ext/platform_device.h" -#include "webkit/api/public/WebBindings.h" +#include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" using WebKit::WebBindings; |