1 files changed, 4 insertions, 36 deletions

diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h
index 6c38080..2920152 100644
--- a/webkit/glue/webplugin_delegate.h
+++ b/webkit/glue/webplugin_delegate.h
@@ -14,6 +14,8 @@
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
+#include "webkit/glue/plugins/webplugin_2d_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_3d_device_delegate.h"
 
 class FilePath;
 class GURL;
@@ -34,7 +36,8 @@ class WebPlugin;
 class WebPluginResourceClient;
 
 // This is the interface that a plugin implementation needs to provide.
-class WebPluginDelegate {
+class WebPluginDelegate : public WebPlugin2DDeviceDelegate,
+                          public WebPlugin3DDeviceDelegate {
  public:
   virtual ~WebPluginDelegate() {}
 
@@ -127,41 +130,6 @@ class WebPluginDelegate {
       bool notify_needed,
       intptr_t notify_data,
       intptr_t stream) = 0;
-
-  // The following methods are for use in implementing Pepper renderers.
-  // They should not be called outside of that context.
-
-  // Pepper 2D device API.
-  virtual NPError Device2DQueryCapability(int32 capability, int32* value) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DQueryConfig(const NPDeviceContext2DConfig* request,
-                                      NPDeviceContext2DConfig* obtain) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DInitializeContext(
-      const NPDeviceContext2DConfig* config,
-      NPDeviceContext2D* context) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DSetStateContext(NPDeviceContext2D* context,
-                                          int32 state,
-                                          int32 value) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DGetStateContext(NPDeviceContext2D* context,
-                                          int32 state,
-                                          int32* value) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DFlushContext(NPDeviceContext2D* context,
-                                       NPDeviceFlushContextCallbackPtr callback,
-                                       void* user_data) {
-    return NPERR_GENERIC_ERROR;
-  }
-  virtual NPError Device2DDestroyContext(NPDeviceContext2D* context) {
-    return NPERR_GENERIC_ERROR;
-  }
 };
 
 }  // namespace webkit_glue