summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 17:22:28 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 17:22:28 +0000
commit0f1afed8d9f9f1849006fc6d93305d14986d16b6 (patch)
tree317787b597343760331431458fba0486bc49670f /webkit/glue/plugins
parent9010941b17ea056d5dd8e28707262fa91d36b000 (diff)
downloadchromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.zip
chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.gz
chromium_src-0f1afed8d9f9f1849006fc6d93305d14986d16b6.tar.bz2
Keep deinlining stuff.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5783004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69273 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/webplugin_impl.cc12
-rw-r--r--webkit/glue/plugins/webplugin_impl.h8
-rw-r--r--webkit/glue/plugins/webplugin_print_delegate.cc26
-rw-r--r--webkit/glue/plugins/webplugin_print_delegate.h16
4 files changed, 46 insertions, 16 deletions
diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index 3891563..666775b 100644
--- a/webkit/glue/plugins/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -562,6 +562,10 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
#endif
}
+void WebPluginImpl::SetAcceptsInputEvents(bool accepts) {
+ accepts_input_events_ = accepts;
+}
+
void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) {
DCHECK_EQ(window, window_);
window_ = gfx::kNullPluginWindow;
@@ -623,6 +627,10 @@ bool WebPluginImpl::SetPostData(WebURLRequest* request,
return rv;
}
+WebPluginDelegate* WebPluginImpl::delegate() {
+ return delegate_;
+}
+
bool WebPluginImpl::IsValidUrl(const GURL& url, Referrer referrer_flag) {
if (referrer_flag == PLUGIN_SRC &&
mime_type_ == "application/x-shockwave-flash" &&
@@ -1250,6 +1258,10 @@ void WebPluginImpl::SetDeferResourceLoading(unsigned long resource_id,
}
}
+bool WebPluginImpl::IsOffTheRecord() {
+ return false;
+}
+
void WebPluginImpl::HandleHttpMultipartResponse(
const WebURLResponse& response, WebPluginResourceClient* client) {
std::string multipart_boundary;
diff --git a/webkit/glue/plugins/webplugin_impl.h b/webkit/glue/plugins/webplugin_impl.h
index d319df1..27a692b 100644
--- a/webkit/glue/plugins/webplugin_impl.h
+++ b/webkit/glue/plugins/webplugin_impl.h
@@ -60,7 +60,7 @@ class WebPluginImpl : public WebPlugin,
const char* buf,
uint32 length);
- virtual WebPluginDelegate* delegate() { return delegate_; }
+ virtual WebPluginDelegate* delegate();
private:
// WebKit::WebPlugin methods:
@@ -105,9 +105,7 @@ class WebPluginImpl : public WebPlugin,
// WebPlugin implementation:
virtual void SetWindow(gfx::PluginWindowHandle window);
- virtual void SetAcceptsInputEvents(bool accepts) {
- accepts_input_events_ = accepts;
- }
+ virtual void SetAcceptsInputEvents(bool accepts);
virtual void WillDestroyWindow(gfx::PluginWindowHandle window);
#if defined(OS_WIN)
void SetWindowlessPumpEvent(HANDLE pump_messages_event) { }
@@ -237,7 +235,7 @@ class WebPluginImpl : public WebPlugin,
virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
// Ignore in-process plugins mode for this flag.
- virtual bool IsOffTheRecord() { return false; }
+ virtual bool IsOffTheRecord();
// Handles HTTP multipart responses, i.e. responses received with a HTTP
// status code of 206.
diff --git a/webkit/glue/plugins/webplugin_print_delegate.cc b/webkit/glue/plugins/webplugin_print_delegate.cc
new file mode 100644
index 0000000..07bf9b8
--- /dev/null
+++ b/webkit/glue/plugins/webplugin_print_delegate.cc
@@ -0,0 +1,26 @@
+// 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_print_delegate.h"
+
+namespace webkit_glue {
+
+bool WebPluginPrintDelegate::PrintSupportsPrintExtension() {
+ return false;
+}
+
+int WebPluginPrintDelegate::PrintBegin(const gfx::Rect& printable_area,
+ int printer_dpi) {
+ return 0;
+}
+
+bool WebPluginPrintDelegate::PrintPage(int page_number,
+ WebKit::WebCanvas* canvas) {
+ return false;
+}
+
+void WebPluginPrintDelegate::PrintEnd() {
+}
+
+} // namespace webkit_glue
diff --git a/webkit/glue/plugins/webplugin_print_delegate.h b/webkit/glue/plugins/webplugin_print_delegate.h
index 040e58f..24298e8 100644
--- a/webkit/glue/plugins/webplugin_print_delegate.h
+++ b/webkit/glue/plugins/webplugin_print_delegate.h
@@ -7,6 +7,7 @@
#include "base/basictypes.h"
#include "third_party/npapi/bindings/npapi_extensions.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
namespace gfx {
class Rect;
@@ -22,21 +23,14 @@ class WebPluginPrintDelegate {
// If a plugin supports print extensions, then it gets to participate fully
// in the browser's print workflow by specifying the number of pages to be
// printed and providing a print output for specified pages.
- virtual bool PrintSupportsPrintExtension() {
- return false;
- }
+ virtual bool PrintSupportsPrintExtension();
// Note: printable_area is in points (a point is 1/72 of an inch).
- virtual int PrintBegin(const gfx::Rect& printable_area, int printer_dpi) {
- return 0;
- }
+ virtual int PrintBegin(const gfx::Rect& printable_area, int printer_dpi);
- virtual bool PrintPage(int page_number, WebKit::WebCanvas* canvas) {
- return false;
- }
+ virtual bool PrintPage(int page_number, WebKit::WebCanvas* canvas);
- virtual void PrintEnd() {
- }
+ virtual void PrintEnd();
protected:
WebPluginPrintDelegate() {}