summaryrefslogtreecommitdiffstats
path: root/webkit
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
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')
-rw-r--r--webkit/glue/media/media_resource_loader_bridge_factory.cc4
-rw-r--r--webkit/glue/media/media_resource_loader_bridge_factory.h5
-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
-rw-r--r--webkit/glue/webkit_glue.gypi6
-rw-r--r--webkit/glue/webvideoframe_impl.cc2
-rw-r--r--webkit/glue/webvideoframe_impl.h1
11 files changed, 42 insertions, 14 deletions
diff --git a/webkit/glue/media/media_resource_loader_bridge_factory.cc b/webkit/glue/media/media_resource_loader_bridge_factory.cc
index 9d8d547..3fb9d65 100644
--- a/webkit/glue/media/media_resource_loader_bridge_factory.cc
+++ b/webkit/glue/media/media_resource_loader_bridge_factory.cc
@@ -32,6 +32,8 @@ MediaResourceLoaderBridgeFactory::MediaResourceLoaderBridgeFactory(
routing_id_(routing_id) {
}
+MediaResourceLoaderBridgeFactory::~MediaResourceLoaderBridgeFactory() {}
+
ResourceLoaderBridge* MediaResourceLoaderBridgeFactory::CreateBridge(
const GURL& url,
int load_flags,
@@ -54,6 +56,8 @@ ResourceLoaderBridge* MediaResourceLoaderBridgeFactory::CreateBridge(
return webkit_glue::ResourceLoaderBridge::Create(request_info);
}
+MediaResourceLoaderBridgeFactory::MediaResourceLoaderBridgeFactory() {}
+
// static
const std::string MediaResourceLoaderBridgeFactory::GenerateHeaders (
int64 first_byte_position, int64 last_byte_position) {
diff --git a/webkit/glue/media/media_resource_loader_bridge_factory.h b/webkit/glue/media/media_resource_loader_bridge_factory.h
index 5f09235..ccacdc6 100644
--- a/webkit/glue/media/media_resource_loader_bridge_factory.h
+++ b/webkit/glue/media/media_resource_loader_bridge_factory.h
@@ -24,7 +24,7 @@ class MediaResourceLoaderBridgeFactory {
int appcache_host_id,
int32 routing_id);
- virtual ~MediaResourceLoaderBridgeFactory() {}
+ virtual ~MediaResourceLoaderBridgeFactory();
// Factory method to create a ResourceLoaderBridge with the following
// parameters:
@@ -40,8 +40,7 @@ class MediaResourceLoaderBridgeFactory {
protected:
// An empty constructor only used by inherited classes.
- MediaResourceLoaderBridgeFactory() {
- }
+ MediaResourceLoaderBridgeFactory();
private:
FRIEND_TEST_ALL_PREFIXES(MediaResourceLoaderBridgeFactoryTest,
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
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index e8e1a3e..4f760f0 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -197,8 +197,8 @@
'plugins/pepper_cursor_control.h',
'plugins/pepper_directory_reader.cc',
'plugins/pepper_directory_reader.h',
- 'plugins/pepper_error_util.cc',
- 'plugins/pepper_error_util.h',
+ 'plugins/pepper_error_util.cc',
+ 'plugins/pepper_error_util.h',
'plugins/pepper_event_conversion.cc',
'plugins/pepper_event_conversion.h',
'plugins/pepper_file_chooser.cc',
@@ -233,6 +233,8 @@
'plugins/pepper_resource.h',
'plugins/pepper_scrollbar.cc',
'plugins/pepper_scrollbar.h',
+ 'plugins/pepper_string.cc',
+ 'plugins/pepper_string.h',
'plugins/pepper_transport.cc',
'plugins/pepper_transport.h',
'plugins/pepper_url_loader.cc',
diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc
index 4d1cd72..bfb1d53 100644
--- a/webkit/glue/webvideoframe_impl.cc
+++ b/webkit/glue/webvideoframe_impl.cc
@@ -25,6 +25,8 @@ WebVideoFrameImpl::WebVideoFrameImpl(
: video_frame_(video_frame) {
}
+WebVideoFrameImpl::~WebVideoFrameImpl() {}
+
#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, chromium_name) \
COMPILE_ASSERT(int(WebKit::WebVideoFrame::webkit_name) == \
int(media::VideoFrame::chromium_name), \
diff --git a/webkit/glue/webvideoframe_impl.h b/webkit/glue/webvideoframe_impl.h
index dfaac03..5454089 100644
--- a/webkit/glue/webvideoframe_impl.h
+++ b/webkit/glue/webvideoframe_impl.h
@@ -18,6 +18,7 @@ class WebVideoFrameImpl : public WebVideoFrame {
static media::VideoFrame* toVideoFrame(WebVideoFrame* web_video_frame);
WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame);
+ virtual ~WebVideoFrameImpl();
virtual WebVideoFrame::SurfaceType surfaceType() const;
virtual WebVideoFrame::Format format() const;
virtual unsigned width() const;