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

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

Issue 464074: Enable Pepper support by default, including building the test plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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/npapi_extension_thunk.cc ('k') | webkit/glue/webplugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_host.cc
===================================================================
--- webkit/glue/plugins/plugin_host.cc (revision 34100)
+++ webkit/glue/plugins/plugin_host.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 turned on for this module.
-#define PEPPER_APIS_ENABLED
-
#include "webkit/glue/plugins/plugin_host.h"
#include "base/file_util.h"
@@ -802,9 +799,16 @@
break;
}
#endif // OS_MACOSX
- case NPNVPepperExtensions:
- rv = NPAPI::GetPepperExtensionsFunctions(value);
+ case NPNVPepperExtensions: {
+ scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
+ if (plugin->webplugin()->delegate() != NULL) {
+ // Delegate is only set for in-renderer Pepper plugins.
+ rv = NPAPI::GetPepperExtensionsFunctions(value);
+ } else {
+ rv = NPERR_GENERIC_ERROR;
+ }
break;
+ }
default:
DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet.";
break;
« no previous file with comments | « webkit/glue/plugins/npapi_extension_thunk.cc ('k') | webkit/glue/webplugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698