summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 12:40:14 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-10 12:40:14 +0000
commitd2e72982e075c7e253892338ca4deca6ecb97413 (patch)
treefaa9dd9d5baa7de25a36f866f8581be7f2b28602 /webkit
parent56d8ebace0e0a6df51e41c957b3a1ede0fb72cc4 (diff)
downloadchromium_src-d2e72982e075c7e253892338ca4deca6ecb97413.zip
chromium_src-d2e72982e075c7e253892338ca4deca6ecb97413.tar.gz
chromium_src-d2e72982e075c7e253892338ca4deca6ecb97413.tar.bz2
Add Android stubs for webplugin_delegate_impl and webcursor
BUG= TEST= Review URL: http://codereview.chromium.org/9022010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webcursor_android.cc29
-rw-r--r--webkit/glue/webkit_glue.gypi4
-rw-r--r--webkit/plugins/npapi/webplugin_delegate_impl_android.cc86
3 files changed, 118 insertions, 1 deletions
diff --git a/webkit/glue/webcursor_android.cc b/webkit/glue/webcursor_android.cc
new file mode 100644
index 0000000..774133b
--- /dev/null
+++ b/webkit/glue/webcursor_android.cc
@@ -0,0 +1,29 @@
+// Copyright (c) 2012 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/webcursor.h"
+
+#include "base/logging.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
+
+void WebCursor::InitPlatformData() {
+}
+
+bool WebCursor::SerializePlatformData(Pickle* pickle) const {
+ return true;
+}
+
+bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) {
+ return true;
+}
+
+bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
+ return true;
+}
+
+void WebCursor::CleanupPlatformData() {
+}
+
+void WebCursor::CopyPlatformData(const WebCursor& other) {
+}
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 52c1ca9..b0fa6ab 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
@@ -206,6 +206,7 @@
'../plugins/npapi/webplugin_delegate.h',
'../plugins/npapi/webplugin_delegate_impl.cc',
'../plugins/npapi/webplugin_delegate_impl.h',
+ '../plugins/npapi/webplugin_delegate_impl_android.cc',
'../plugins/npapi/webplugin_delegate_impl_aura.cc',
'../plugins/npapi/webplugin_delegate_impl_gtk.cc',
'../plugins/npapi/webplugin_delegate_impl_mac.mm',
@@ -392,6 +393,7 @@
'webcookie.h',
'webcursor.cc',
'webcursor.h',
+ 'webcursor_android.cc',
'webcursor_aura.cc',
'webcursor_gtk.cc',
'webcursor_gtk_data.h',
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_android.cc b/webkit/plugins/npapi/webplugin_delegate_impl_android.cc
new file mode 100644
index 0000000..2abce77
--- /dev/null
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_android.cc
@@ -0,0 +1,86 @@
+// Copyright (c) 2012 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/plugins/npapi/webplugin_delegate_impl.h"
+
+#include "base/basictypes.h"
+#include "base/logging.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/webkit_glue.h"
+
+using WebKit::WebCursorInfo;
+using WebKit::WebInputEvent;
+
+namespace webkit {
+namespace npapi {
+
+WebPluginDelegateImpl::WebPluginDelegateImpl(
+ gfx::PluginWindowHandle containing_view,
+ PluginInstance* instance)
+ : windowed_handle_(0),
+ windowed_did_set_window_(false),
+ windowless_(false),
+ plugin_(NULL),
+ instance_(instance),
+ parent_(containing_view),
+ quirks_(0),
+ handle_event_depth_(0),
+ first_set_window_call_(true) {
+ memset(&window_, 0, sizeof(window_));
+}
+
+WebPluginDelegateImpl::~WebPluginDelegateImpl() {
+}
+
+bool WebPluginDelegateImpl::PlatformInitialize() {
+ return true;
+}
+
+void WebPluginDelegateImpl::PlatformDestroyInstance() {
+ // Nothing to do here.
+}
+
+void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
+ const gfx::Rect& rect) {
+}
+
+bool WebPluginDelegateImpl::WindowedCreatePlugin() {
+ return false;
+}
+
+void WebPluginDelegateImpl::WindowedDestroyWindow() {
+}
+
+bool WebPluginDelegateImpl::WindowedReposition(
+ const gfx::Rect& window_rect,
+ const gfx::Rect& clip_rect) {
+ return false;
+}
+
+void WebPluginDelegateImpl::WindowedSetWindow() {
+}
+
+void WebPluginDelegateImpl::WindowlessUpdateGeometry(
+ const gfx::Rect& window_rect,
+ const gfx::Rect& clip_rect) {
+}
+
+void WebPluginDelegateImpl::WindowlessPaint(gfx::NativeDrawingContext context,
+ const gfx::Rect& damage_rect) {
+}
+
+bool WebPluginDelegateImpl::PlatformSetPluginHasFocus(bool focused) {
+ return false;
+}
+
+bool WebPluginDelegateImpl::PlatformHandleInputEvent(
+ const WebInputEvent& event, WebCursorInfo* cursor_info) {
+ return false;
+}
+
+} // namespace npapi
+} // namespace webkit