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

Side by Side Diff: webkit/glue/plugins/plugin_host.cc

Issue 475004: Revert 34161 - Enable Pepper support by default, including building the test ... (Closed) Base URL: svn://svn.chromium.org/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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/plugins/npapi_extension_thunk.cc ('k') | webkit/glue/webplugin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Pepper API support should be turned on for this module.
6 #define PEPPER_APIS_ENABLED
7
5 #include "webkit/glue/plugins/plugin_host.h" 8 #include "webkit/glue/plugins/plugin_host.h"
6 9
7 #include "base/file_util.h" 10 #include "base/file_util.h"
8 #include "base/logging.h" 11 #include "base/logging.h"
9 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
10 #include "base/string_piece.h" 13 #include "base/string_piece.h"
11 #include "base/string_util.h" 14 #include "base/string_util.h"
12 #include "base/sys_string_conversions.h" 15 #include "base/sys_string_conversions.h"
13 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
14 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h" 17 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 } 795 }
793 case NPNVsupportsOpenGLBool: 796 case NPNVsupportsOpenGLBool:
794 case NPNVsupportsCoreAnimationBool: { 797 case NPNVsupportsCoreAnimationBool: {
795 // we do not support these drawing and event models. 798 // we do not support these drawing and event models.
796 NPBool* supports_model = reinterpret_cast<NPBool*>(value); 799 NPBool* supports_model = reinterpret_cast<NPBool*>(value);
797 *supports_model = FALSE; 800 *supports_model = FALSE;
798 rv = NPERR_NO_ERROR; 801 rv = NPERR_NO_ERROR;
799 break; 802 break;
800 } 803 }
801 #endif // OS_MACOSX 804 #endif // OS_MACOSX
802 case NPNVPepperExtensions: { 805 case NPNVPepperExtensions:
803 scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); 806 rv = NPAPI::GetPepperExtensionsFunctions(value);
804 if (plugin->webplugin()->delegate() != NULL) {
805 // Delegate is only set for in-renderer Pepper plugins.
806 rv = NPAPI::GetPepperExtensionsFunctions(value);
807 } else {
808 rv = NPERR_GENERIC_ERROR;
809 }
810 break; 807 break;
811 }
812 default: 808 default:
813 DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet."; 809 DLOG(INFO) << "NPN_GetValue(" << variable << ") is not implemented yet.";
814 break; 810 break;
815 } 811 }
816 return rv; 812 return rv;
817 } 813 }
818 814
819 NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) { 815 NPError NPN_SetValue(NPP id, NPPVariable variable, void* value) {
820 // Allows the plugin to set various modes 816 // Allows the plugin to set various modes
821 817
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 NPCoordinateSpace destSpace) { 1051 NPCoordinateSpace destSpace) {
1056 NOTIMPLEMENTED(); 1052 NOTIMPLEMENTED();
1057 if (destX) 1053 if (destX)
1058 *destX = sourceX; 1054 *destX = sourceX;
1059 if (destY) 1055 if (destY)
1060 *destY = sourceY; 1056 *destY = sourceY;
1061 return FALSE; 1057 return FALSE;
1062 } 1058 }
1063 1059
1064 } // extern "C" 1060 } // extern "C"
OLDNEW
« 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