diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 21:41:40 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 21:41:40 +0000 |
commit | 1e6054763faf7283d3e2e53f26389ff5d83e7d90 (patch) | |
tree | 4132c689a3196890267eae8a57989cbfab36e438 /webkit/glue/plugins | |
parent | 0c5f45a87e93ac32d037ea015f67bceafbd2e340 (diff) | |
download | chromium_src-1e6054763faf7283d3e2e53f26389ff5d83e7d90.zip chromium_src-1e6054763faf7283d3e2e53f26389ff5d83e7d90.tar.gz chromium_src-1e6054763faf7283d3e2e53f26389ff5d83e7d90.tar.bz2 |
Almost done deinlining virtual methods.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/5841002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r-- | webkit/glue/plugins/webplugin_file_delegate.cc | 17 | ||||
-rw-r--r-- | webkit/glue/plugins/webplugin_file_delegate.h | 4 | ||||
-rw-r--r-- | webkit/glue/plugins/webview_plugin.cc | 12 | ||||
-rw-r--r-- | webkit/glue/plugins/webview_plugin.h | 6 |
4 files changed, 33 insertions, 6 deletions
diff --git a/webkit/glue/plugins/webplugin_file_delegate.cc b/webkit/glue/plugins/webplugin_file_delegate.cc new file mode 100644 index 0000000..68c4c60 --- /dev/null +++ b/webkit/glue/plugins/webplugin_file_delegate.cc @@ -0,0 +1,17 @@ +// 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/webplugin_file_delegate.h" + +namespace webkit_glue { + +bool WebPluginFileDelegate::ChooseFile(const char* mime_types, + int mode, + NPChooseFileCallback callback, + void* user_data) { + return false; +} + +} // namespace webkit_glue + diff --git a/webkit/glue/plugins/webplugin_file_delegate.h b/webkit/glue/plugins/webplugin_file_delegate.h index 162516c..ad2bba0 100644 --- a/webkit/glue/plugins/webplugin_file_delegate.h +++ b/webkit/glue/plugins/webplugin_file_delegate.h @@ -21,9 +21,7 @@ class WebPluginFileDelegate { virtual bool ChooseFile(const char* mime_types, int mode, NPChooseFileCallback callback, - void* user_data) { - return false; - } + void* user_data); protected: WebPluginFileDelegate() {} diff --git a/webkit/glue/plugins/webview_plugin.cc b/webkit/glue/plugins/webview_plugin.cc index e0f80e3..f89ccb4 100644 --- a/webkit/glue/plugins/webview_plugin.cc +++ b/webkit/glue/plugins/webview_plugin.cc @@ -105,6 +105,10 @@ void WebViewPlugin::destroy() { MessageLoop::current()->DeleteSoon(FROM_HERE, this); } +NPObject* WebViewPlugin::scriptableObject() { + return NULL; +} + void WebViewPlugin::paint(WebCanvas* canvas, const WebRect& rect) { gfx::Rect paintRect(rect_.Intersect(rect)); if (paintRect.IsEmpty()) @@ -143,6 +147,10 @@ void WebViewPlugin::updateGeometry( } } +bool WebViewPlugin::acceptsInputEvents() { + return true; +} + bool WebViewPlugin::handleInputEvent(const WebInputEvent& event, WebCursorInfo& cursor) { if (event.type == WebInputEvent::ContextMenu) { @@ -178,6 +186,10 @@ void WebViewPlugin::didFailLoading(const WebURLError& error) { error_.reset(new WebURLError(error)); } +bool WebViewPlugin::acceptsLoadDrops() { + return false; +} + void WebViewPlugin::setToolTipText(const WebKit::WebString& text, WebKit::WebTextDirection hint) { if (container_) diff --git a/webkit/glue/plugins/webview_plugin.h b/webkit/glue/plugins/webview_plugin.h index ac89c85..f3c75c1 100644 --- a/webkit/glue/plugins/webview_plugin.h +++ b/webkit/glue/plugins/webview_plugin.h @@ -70,7 +70,7 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient, virtual bool initialize(WebKit::WebPluginContainer*); virtual void destroy(); - virtual NPObject* scriptableObject() { return NULL; } + virtual NPObject* scriptableObject(); virtual void paint(WebKit::WebCanvas* canvas, const WebKit::WebRect& rect); @@ -82,7 +82,7 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient, virtual void updateFocus(bool) { } virtual void updateVisibility(bool) { } - virtual bool acceptsInputEvents() { return true; } + virtual bool acceptsInputEvents(); virtual bool handleInputEvent(const WebKit::WebInputEvent& event, WebKit::WebCursorInfo& cursor_info); @@ -99,7 +99,7 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient, const WebKit::WebURLError& error) { } // WebViewClient methods: - virtual bool acceptsLoadDrops() { return false; } + virtual bool acceptsLoadDrops(); virtual void setToolTipText(const WebKit::WebString&, WebKit::WebTextDirection); |