Override isPlaceholder() for NPAPI and PPAPI plugins.

This is the Chromium side of http://webk.it/88028.

BUG=130425
TEST=None yet. Confirmed plugin is instantiated when GetClient()->createHelperPlugin(frame_); is added to WebMediaPlayerImpl::play().


Review URL: https://chromiumcodereview.appspot.com/10556050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143017 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 0 deletions

diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index 723a7c0..27ae1c3 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -468,6 +468,10 @@ void WebPluginImpl::didFailLoadingFrameRequest(
       url, reason, reinterpret_cast<intptr_t>(notify_data));
 }
 
+bool WebPluginImpl::isPlaceholder() {
+  return false;
+}
+
 // -----------------------------------------------------------------------------
 
 WebPluginImpl::WebPluginImpl(
diff --git a/webkit/plugins/npapi/webplugin_impl.h b/webkit/plugins/npapi/webplugin_impl.h
index e03eeb1..2c3e34b 100644
--- a/webkit/plugins/npapi/webplugin_impl.h
+++ b/webkit/plugins/npapi/webplugin_impl.h
@@ -89,6 +89,7 @@ class WEBKIT_PLUGINS_EXPORT WebPluginImpl :
   virtual void didFailLoadingFrameRequest(
       const WebKit::WebURL& url, void* notify_data,
       const WebKit::WebURLError& error);
+  virtual bool isPlaceholder() OVERRIDE;
 
   // WebPlugin implementation:
   virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE;
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
index 3421ccd..298c14b 100644
--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.cc
@@ -290,5 +290,9 @@ void WebPluginImpl::rotateView(RotationType type) {
   instance_->RotateView(type);
 }
 
+bool WebPluginImpl::isPlaceholder() {
+  return false;
+}
+
 }  // namespace ppapi
 }  // namespace webkit
diff --git a/webkit/plugins/ppapi/ppapi_webplugin_impl.h b/webkit/plugins/ppapi/ppapi_webplugin_impl.h
index 7319cba..502a3c0 100644
--- a/webkit/plugins/ppapi/ppapi_webplugin_impl.h
+++ b/webkit/plugins/ppapi/ppapi_webplugin_impl.h
@@ -83,6 +83,7 @@ class WebPluginImpl : public WebKit::WebPlugin {
 
   virtual bool canRotateView() OVERRIDE;
   virtual void rotateView(RotationType type) OVERRIDE;
+  virtual bool isPlaceholder() OVERRIDE;
 
  private:
   friend class base::DeleteHelper<WebPluginImpl>;