Update To 11.40.268.0

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

diff --git a/src/content/renderer/browser_plugin/browser_plugin.h b/src/content/renderer/browser_plugin/browser_plugin.h
index 11f7661..d072e7b 100644 (file)
--- a/src/content/renderer/browser_plugin/browser_plugin.h
+++ b/src/content/renderer/browser_plugin/browser_plugin.h
@@ -47,7 +47,7 @@ class CONTENT_EXPORT BrowserPlugin :
   // Update Browser Plugin's DOM Node attribute |attribute_name| with the value
   // |attribute_value|.
   void UpdateDOMAttribute(const std::string& attribute_name,
-                          const std::string& attribute_value);
+                          const base::string16& attribute_value);
 
   // Returns whether the guest process has crashed.
   bool guest_crashed() const { return guest_crashed_; }
@@ -77,68 +77,66 @@ class CONTENT_EXPORT BrowserPlugin :
   static bool ShouldForwardToBrowserPlugin(const IPC::Message& message);
 
   // blink::WebPlugin implementation.
-  virtual blink::WebPluginContainer* container() const OVERRIDE;
-  virtual bool initialize(blink::WebPluginContainer* container) OVERRIDE;
-  virtual void destroy() OVERRIDE;
-  virtual bool supportsKeyboardFocus() const OVERRIDE;
-  virtual bool supportsEditCommands() const OVERRIDE;
-  virtual bool supportsInputMethod() const OVERRIDE;
-  virtual bool canProcessDrag() const OVERRIDE;
+  virtual blink::WebPluginContainer* container() const override;
+  virtual bool initialize(blink::WebPluginContainer* container) override;
+  virtual void destroy() override;
+  virtual bool supportsKeyboardFocus() const override;
+  virtual bool supportsEditCommands() const override;
+  virtual bool supportsInputMethod() const override;
+  virtual bool canProcessDrag() const override;
   virtual void paint(
       blink::WebCanvas* canvas,
-      const blink::WebRect& rect) OVERRIDE;
+      const blink::WebRect& rect) override;
   virtual void updateGeometry(
       const blink::WebRect& frame_rect,
       const blink::WebRect& clip_rect,
       const blink::WebVector<blink::WebRect>& cut_outs_rects,
-      bool is_visible) OVERRIDE;
-  virtual void updateFocus(bool focused) OVERRIDE;
-  virtual void updateVisibility(bool visible) OVERRIDE;
-  virtual bool acceptsInputEvents() OVERRIDE;
+      bool is_visible) override;
+  virtual void updateFocus(bool focused) override;
+  virtual void updateVisibility(bool visible) override;
+  virtual bool acceptsInputEvents() override;
   virtual bool handleInputEvent(
       const blink::WebInputEvent& event,
-      blink::WebCursorInfo& cursor_info) OVERRIDE;
+      blink::WebCursorInfo& cursor_info) override;
   virtual bool handleDragStatusUpdate(blink::WebDragStatus drag_status,
                                       const blink::WebDragData& drag_data,
                                       blink::WebDragOperationsMask mask,
                                       const blink::WebPoint& position,
-                                      const blink::WebPoint& screen) OVERRIDE;
+                                      const blink::WebPoint& screen) override;
   virtual void didReceiveResponse(
-      const blink::WebURLResponse& response) OVERRIDE;
-  virtual void didReceiveData(const char* data, int data_length) OVERRIDE;
-  virtual void didFinishLoading() OVERRIDE;
-  virtual void didFailLoading(const blink::WebURLError& error) OVERRIDE;
+      const blink::WebURLResponse& response) override;
+  virtual void didReceiveData(const char* data, int data_length) override;
+  virtual void didFinishLoading() override;
+  virtual void didFailLoading(const blink::WebURLError& error) override;
   virtual void didFinishLoadingFrameRequest(
       const blink::WebURL& url,
-      void* notify_data) OVERRIDE;
+      void* notify_data) override;
   virtual void didFailLoadingFrameRequest(
       const blink::WebURL& url,
       void* notify_data,
-      const blink::WebURLError& error) OVERRIDE;
-  virtual bool executeEditCommand(const blink::WebString& name) OVERRIDE;
+      const blink::WebURLError& error) override;
+  virtual bool executeEditCommand(const blink::WebString& name) override;
   virtual bool executeEditCommand(const blink::WebString& name,
-                                  const blink::WebString& value) OVERRIDE;
+                                  const blink::WebString& value) override;
   virtual bool setComposition(
       const blink::WebString& text,
       const blink::WebVector<blink::WebCompositionUnderline>& underlines,
       int selectionStart,
-      int selectionEnd) OVERRIDE;
+      int selectionEnd) override;
   virtual bool confirmComposition(
       const blink::WebString& text,
-      blink::WebWidget::ConfirmCompositionBehavior selectionBehavior) OVERRIDE;
-  virtual void extendSelectionAndDelete(int before, int after) OVERRIDE;
+      blink::WebWidget::ConfirmCompositionBehavior selectionBehavior) override;
+  virtual void extendSelectionAndDelete(int before, int after) override;
 
   // MouseLockDispatcher::LockTarget implementation.
-  virtual void OnLockMouseACK(bool succeeded) OVERRIDE;
-  virtual void OnMouseLockLost() OVERRIDE;
-  virtual bool HandleMouseLockedInputEvent(
-          const blink::WebMouseEvent& event) OVERRIDE;
+  void OnLockMouseACK(bool succeeded) override;
+  void OnMouseLockLost() override;
+  bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override;
 
  private:
   friend class base::DeleteHelper<BrowserPlugin>;
   // Only the manager is allowed to create a BrowserPlugin.
-  friend class BrowserPluginManagerImpl;
-  friend class MockBrowserPluginManager;
+  friend class BrowserPluginManager;
 
   // For unit/integration tests.
   friend class MockBrowserPlugin;
@@ -153,7 +151,7 @@ class CONTENT_EXPORT BrowserPlugin :
                 blink::WebFrame* frame,
                 scoped_ptr<BrowserPluginDelegate> delegate);
 
-  virtual ~BrowserPlugin();
+  ~BrowserPlugin() override;
 
   int width() const { return plugin_rect_.width(); }
   int height() const { return plugin_rect_.height(); }
@@ -174,14 +172,12 @@ class CONTENT_EXPORT BrowserPlugin :
   void OnAdvanceFocus(int instance_id, bool reverse);
   void OnAttachACK(int browser_plugin_instance_id);
   void OnCompositorFrameSwapped(const IPC::Message& message);
-  void OnCopyFromCompositingSurface(int instance_id,
-                                    int request_id,
-                                    gfx::Rect source_rect,
-                                    gfx::Size dest_size);
   void OnGuestGone(int instance_id);
   void OnSetContentsOpaque(int instance_id, bool opaque);
   void OnSetCursor(int instance_id, const WebCursor& cursor);
   void OnSetMouseLock(int instance_id, bool enable);
+  void OnSetTooltipText(int browser_plugin_instance_id,
+                        const base::string16& tooltip_text);
   void OnShouldAcceptTouchEvents(int instance_id, bool accept);
 
   // This indicates whether this BrowserPlugin has been attached to a
@@ -208,6 +204,9 @@ class CONTENT_EXPORT BrowserPlugin :
 
   bool mouse_locked_;
 
+  // This indicates that the BrowserPlugin has a geometry.
+  bool ready_;
+
   // BrowserPlugin outlives RenderViewImpl in Chrome Apps and so we need to
   // store the BrowserPlugin's BrowserPluginManager in a member variable to
   // avoid accessing the RenderViewImpl.