Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: webkit/glue/plugins/plugin_instance.cc

Issue 291001: Moved Pepper delegate definition to chrome\renderer to allow it to use... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/plugins/plugin_instance.h ('k') | webkit/glue/plugins/webplugin_delegate_pepper_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_instance.cc
===================================================================
--- webkit/glue/plugins/plugin_instance.cc (revision 29377)
+++ webkit/glue/plugins/plugin_instance.cc (working copy)
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Pepper API support should be enabled for this file.
-#define PEPPER_APIS_ENABLED
-
#include "build/build_config.h"
#include "webkit/glue/plugins/plugin_instance.h"
@@ -14,6 +11,7 @@
#include "base/string_util.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/webplugin.h"
+#include "webkit/glue/webplugin_delegate.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/plugins/plugin_host.h"
#include "webkit/glue/plugins/plugin_lib.h"
@@ -355,27 +353,6 @@
}
}
-#ifndef PEPPER_APIS_DISABLED
-NPError PluginInstance::InitializeRenderContext(NPRenderType type,
- NPRenderContext* context) {
- // Set up the renderer for the specified type.
- // Return no errors.
- return NPERR_NO_ERROR;
-}
-
-NPError PluginInstance::FlushRenderContext(NPRenderContext* context,
- NPFlushRenderContextCallbackPtr callback, void* user_data) {
- // Do the flush.
- NPError err = NPERR_NO_ERROR;
- // Invoke the callback to inform the caller the work was done.
- if (callback != NULL) {
- (*callback)(context, err, user_data);
- }
- // Return no errors.
- return NPERR_NO_ERROR;
-}
-#endif // PEPPER_APIS_DISABLED
-
void PluginInstance::PluginThreadAsyncCall(void (*func)(void *),
void *user_data) {
message_loop_->PostTask(FROM_HERE, NewRunnableMethod(
« no previous file with comments | « webkit/glue/plugins/plugin_instance.h ('k') | webkit/glue/plugins/webplugin_delegate_pepper_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698