Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / pepper / resource_converter.h

diff --git a/src/content/renderer/pepper/resource_converter.h b/src/content/renderer/pepper/resource_converter.h
index 842f7c7..d669e74 100644 (file)
--- a/src/content/renderer/pepper/resource_converter.h
+++ b/src/content/renderer/pepper/resource_converter.h
@@ -27,8 +27,6 @@ class ScopedPPVar;
 
 namespace content {
 
-class RendererPpapiHost;
-
 // This class is responsible for converting V8 vars to Pepper resources.
 class CONTENT_EXPORT ResourceConverter {
  public:
@@ -65,20 +63,20 @@ class CONTENT_EXPORT ResourceConverter {
 
 class ResourceConverterImpl : public ResourceConverter {
  public:
-  ResourceConverterImpl(PP_Instance instance, RendererPpapiHost* host);
-  virtual ~ResourceConverterImpl();
+  explicit ResourceConverterImpl(PP_Instance instance);
+  ~ResourceConverterImpl() override;
 
   // ResourceConverter overrides.
-  virtual void Reset() OVERRIDE;
-  virtual bool NeedsFlush() OVERRIDE;
-  virtual void Flush(const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual bool FromV8Value(v8::Handle<v8::Object> val,
-                           v8::Handle<v8::Context> context,
-                           PP_Var* result,
-                           bool* was_resource) OVERRIDE;
-  virtual bool ToV8Value(const PP_Var& var,
-                         v8::Handle<v8::Context> context,
-                         v8::Handle<v8::Value>* result) OVERRIDE;
+  void Reset() override;
+  bool NeedsFlush() override;
+  void Flush(const base::Callback<void(bool)>& callback) override;
+  bool FromV8Value(v8::Handle<v8::Object> val,
+                   v8::Handle<v8::Context> context,
+                   PP_Var* result,
+                   bool* was_resource) override;
+  bool ToV8Value(const PP_Var& var,
+                 v8::Handle<v8::Context> context,
+                 v8::Handle<v8::Value>* result) override;
 
  private:
   // Creates a resource var with the given |pending_renderer_id| and
@@ -97,8 +95,6 @@ class ResourceConverterImpl : public ResourceConverter {
 
   // The instance this ResourceConverter is associated with.
   PP_Instance instance_;
-  // The RendererPpapiHost to use to create browser hosts.
-  RendererPpapiHost* host_;
 
   // A list of the messages to create the browser hosts. This is a parallel
   // array to |browser_vars|. It is kept as a parallel array so that it can be