summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 20:21:31 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 20:21:31 +0000
commitb104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17 (patch)
tree0d35c3f624aec7c6de8824fab2b9521bfff1dbff /webkit/glue/plugins
parentd13509f32546e26332733ac6153d359fbd566eaa (diff)
downloadchromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.zip
chromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.tar.gz
chromium_src-b104b50ddb1d70d95ff9ace7a6fb30ec3b1aeb17.tar.bz2
FBTF: Monster ctor patch after changing heuristics in clang plugin.
(Only 916k this time off Debug Linux .a files) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3814013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/gtk_plugin_container_manager.cc4
-rw-r--r--webkit/glue/plugins/gtk_plugin_container_manager.h3
-rw-r--r--webkit/glue/plugins/pepper_string.cc13
-rw-r--r--webkit/glue/plugins/pepper_string.h4
-rw-r--r--webkit/glue/plugins/pepper_webplugin_impl.cc7
-rw-r--r--webkit/glue/plugins/pepper_webplugin_impl.h7
6 files changed, 29 insertions, 9 deletions
diff --git a/webkit/glue/plugins/gtk_plugin_container_manager.cc b/webkit/glue/plugins/gtk_plugin_container_manager.cc
index f26b44c..2f82b24 100644
--- a/webkit/glue/plugins/gtk_plugin_container_manager.cc
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.cc
@@ -11,6 +11,10 @@
#include "webkit/glue/plugins/gtk_plugin_container.h"
#include "webkit/glue/plugins/webplugin.h"
+GtkPluginContainerManager::GtkPluginContainerManager() : host_widget_(NULL) {}
+
+GtkPluginContainerManager::~GtkPluginContainerManager() {}
+
GtkWidget* GtkPluginContainerManager::CreatePluginContainer(
gfx::PluginWindowHandle id) {
DCHECK(host_widget_);
diff --git a/webkit/glue/plugins/gtk_plugin_container_manager.h b/webkit/glue/plugins/gtk_plugin_container_manager.h
index c33099d..7f7db8d 100644
--- a/webkit/glue/plugins/gtk_plugin_container_manager.h
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.h
@@ -19,7 +19,8 @@ struct WebPluginGeometry;
// Helper class that creates and manages plugin containers (GtkSocket).
class GtkPluginContainerManager {
public:
- GtkPluginContainerManager() : host_widget_(NULL) { }
+ GtkPluginContainerManager();
+ ~GtkPluginContainerManager();
// Sets the widget that will host the plugin containers. Must be a GtkFixed.
void set_host_widget(GtkWidget *widget) { host_widget_ = widget; }
diff --git a/webkit/glue/plugins/pepper_string.cc b/webkit/glue/plugins/pepper_string.cc
new file mode 100644
index 0000000..53c8943
--- /dev/null
+++ b/webkit/glue/plugins/pepper_string.cc
@@ -0,0 +1,13 @@
+// Copyright (c) 2010 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.
+
+#include "webkit/glue/plugins/pepper_string.h"
+
+namespace pepper {
+
+String::String(const char* str, uint32 len) : value_(str, len) {}
+
+String::~String() {}
+
+} // namespace pepper
diff --git a/webkit/glue/plugins/pepper_string.h b/webkit/glue/plugins/pepper_string.h
index 1fc43c4f..fa1ab2ff 100644
--- a/webkit/glue/plugins/pepper_string.h
+++ b/webkit/glue/plugins/pepper_string.h
@@ -14,8 +14,8 @@ namespace pepper {
class String : public base::RefCountedThreadSafe<String> {
public:
- String(const char* str, uint32 len) : value_(str, len) {
- }
+ String(const char* str, uint32 len);
+ virtual ~String();
const std::string& value() const { return value_; }
diff --git a/webkit/glue/plugins/pepper_webplugin_impl.cc b/webkit/glue/plugins/pepper_webplugin_impl.cc
index ef01c6a..2e8eb3f 100644
--- a/webkit/glue/plugins/pepper_webplugin_impl.cc
+++ b/webkit/glue/plugins/pepper_webplugin_impl.cc
@@ -29,6 +29,13 @@ using WebKit::WebView;
namespace pepper {
+struct WebPluginImpl::InitData {
+ scoped_refptr<PluginModule> module;
+ base::WeakPtr<PluginDelegate> delegate;
+ std::vector<std::string> arg_names;
+ std::vector<std::string> arg_values;
+};
+
WebPluginImpl::WebPluginImpl(
PluginModule* plugin_module,
const WebPluginParams& params,
diff --git a/webkit/glue/plugins/pepper_webplugin_impl.h b/webkit/glue/plugins/pepper_webplugin_impl.h
index 3023d95..15ee784 100644
--- a/webkit/glue/plugins/pepper_webplugin_impl.h
+++ b/webkit/glue/plugins/pepper_webplugin_impl.h
@@ -76,12 +76,7 @@ class WebPluginImpl : public WebKit::WebPlugin {
virtual bool printPage(int page_number, WebKit::WebCanvas* canvas);
virtual void printEnd();
- struct InitData {
- scoped_refptr<PluginModule> module;
- base::WeakPtr<PluginDelegate> delegate;
- std::vector<std::string> arg_names;
- std::vector<std::string> arg_values;
- };
+ struct InitData;
scoped_ptr<InitData> init_data_; // Cleared upon successful initialization.
// True if the instance represents the entire document in a frame instead of