diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 23:13:00 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-24 23:13:00 +0000 |
| commit | 2db037be98a1059dc42f2cf45056944300fbe361 (patch) | |
| tree | 048ef1ddaa8d6c39e192d56805b34d552a0c5612 /webkit/glue | |
| parent | c690a1841132bc82bceda221c30c9526ec7527bf (diff) | |
| download | chromium_src-2db037be98a1059dc42f2cf45056944300fbe361.zip chromium_src-2db037be98a1059dc42f2cf45056944300fbe361.tar.gz chromium_src-2db037be98a1059dc42f2cf45056944300fbe361.tar.bz2 | |
More stubbing out. With this and the rest of Linux pending, test_shell links.
There doesn't appear to be a WebKit PLATFORM macro for LINUX and, since we're
in the middle of a merge, adding one isn't a great idea either. So I'm using
__linux__ here. Also, several the stubs were very temporary and since stubbing
them required getting their headers to work as well I just aliased them away.
Review URL: http://codereview.chromium.org/8131
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/SConscript | 12 | ||||
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 9006cd0..65de5bf 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -69,6 +69,18 @@ input_files = [ 'webview_impl.cc', ] +if env['PLATFORM'] == 'posix': + # TODO(port): until we have plugin support for Linux, these files aren't built. + remove_files = [ + 'plugins/plugin_host.cc', + 'plugins/plugin_instance.cc', + 'plugins/plugin_string_stream.cc', + 'plugins/plugin_stream_url.cc', + ] + + for file in remove_files: + input_files.remove(file) + if env['PLATFORM'] == 'win32': # TODO(port): These extra files aren't win32-specific, they've just not been # tested on other platforms yet. diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 2429c0b..496de7f 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -5,6 +5,7 @@ #include "config.h" #include "base/compiler_specific.h" +#include "build/build_config.h" MSVC_PUSH_WARNING_LEVEL(0); #include "Cursor.h" @@ -375,7 +376,13 @@ bool WebPluginImpl::SetPostData(WebCore::ResourceRequest* request, std::vector<std::string> names; std::vector<std::string> values; std::vector<char> body; +#if !defined(OS_LINUX) bool rv = NPAPI::PluginHost::SetPostData(buf, length, &names, &values, &body); +#else + // TODO(port): unstub once we have plugin support + bool rv = false; + NOTREACHED(); +#endif for (size_t i = 0; i < names.size(); ++i) request->addHTTPHeaderField(webkit_glue::StdStringToString(names[i]), |