summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-26 01:09:24 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-26 01:09:24 +0000
commit490161bfd60cec7b6a53a3c46ae8b5a3b8fed3e4 (patch)
tree4c8fa911328320cb1195676ddf5d2248e611ed1a
parent322878d6f906ed5a065e4a9a633a02d508bee942 (diff)
downloadchromium_src-490161bfd60cec7b6a53a3c46ae8b5a3b8fed3e4.zip
chromium_src-490161bfd60cec7b6a53a3c46ae8b5a3b8fed3e4.tar.gz
chromium_src-490161bfd60cec7b6a53a3c46ae8b5a3b8fed3e4.tar.bz2
Stub out some plugin functions to make the dynamic linker happy.
With this change, test_shell_tests can link with dynamic libraries. Review URL: http://codereview.chromium.org/16476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7474 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/SConscript3
-rw-r--r--webkit/glue/plugins/plugin_stubs.cc30
2 files changed, 32 insertions, 1 deletions
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 02570b5..6670025 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -87,12 +87,13 @@ if env.Bit('linux'):
remove_files = [
'plugins/plugin_host.cc',
'plugins/plugin_instance.cc',
+ 'plugins/plugin_stream.cc',
'plugins/plugin_string_stream.cc',
'plugins/plugin_stream_url.cc',
]
-
for file in remove_files:
input_files.remove(file)
+ input_files.extend(['plugins/plugin_stubs.cc'])
if env.Bit('windows'):
# TODO(port): These extra files aren't win32-specific, they've just not been
diff --git a/webkit/glue/plugins/plugin_stubs.cc b/webkit/glue/plugins/plugin_stubs.cc
new file mode 100644
index 0000000..f8210c30
--- /dev/null
+++ b/webkit/glue/plugins/plugin_stubs.cc
@@ -0,0 +1,30 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file stubs out some functions needed to make the linker happy
+// without linking in all the plugin code. It should be removed once
+// we have plugins working on all platforms.
+
+// TODO(port): remove this file.
+
+#include "base/logging.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_stream.h"
+
+namespace NPAPI {
+
+PluginStream::~PluginStream() {
+ NOTIMPLEMENTED();
+}
+
+bool PluginStream::Close(NPReason reason) {
+ NOTIMPLEMENTED();
+ return false;
+}
+
+void PluginInstance::NPP_StreamAsFile(NPStream*, const char*) {
+ NOTIMPLEMENTED();
+}
+
+} // namespace NPAPI