Upstream version 10.39.225.0

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

diff --git a/src/content/renderer/render_widget.h b/src/content/renderer/render_widget.h
index bd97588..cdb166a 100644 (file)
--- a/src/content/renderer/render_widget.h
+++ b/src/content/renderer/render_widget.h
@@ -142,7 +142,6 @@ class CONTENT_EXPORT RenderWidget
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // blink::WebWidgetClient
-  virtual void suppressCompositorScheduling(bool enable);
   virtual void willBeginCompositorFrame();
   virtual void didAutoResize(const blink::WebSize& new_size);
   virtual void initializeLayerTreeView();
@@ -173,6 +172,9 @@ class CONTENT_EXPORT RenderWidget
   // Begins the compositor's scheduler to start producing frames.
   void StartCompositor();
 
+  // Stop compositing.
+  void DestroyLayerTreeView();
+
   // Called when a plugin is moved.  These events are queued up and sent with
   // the next paint or scroll message to the host.
   void SchedulePluginMove(const WebPluginGeometry& move);
@@ -334,6 +336,10 @@ class CONTENT_EXPORT RenderWidget
   // active RenderWidgets.
   void SetSwappedOut(bool is_swapped_out);
 
+  // Allows the process to exit once the unload handler has finished, if there
+  // are no other active RenderWidgets.
+  void WasSwappedOut();
+
   void FlushPendingInputEventAck();
   void DoDeferredClose();
   void DoDeferredSetWindowRect(const blink::WebRect& pos);
@@ -341,7 +347,7 @@ class CONTENT_EXPORT RenderWidget
   // Resizes the render widget.
   void Resize(const gfx::Size& new_size,
               const gfx::Size& physical_backing_size,
-              float overdraw_bottom_height,
+              float top_controls_layout_height,
               const gfx::Size& visible_viewport_size,
               const gfx::Rect& resizer_rect,
               bool is_fullscreen,
@@ -371,7 +377,6 @@ class CONTENT_EXPORT RenderWidget
   virtual void OnWasHidden();
   virtual void OnWasShown(bool needs_repainting,
                           const ui::LatencyInfo& latency_info);
-  virtual void OnWasSwappedOut();
   void OnCreateVideoAck(int32 video_id);
   void OnUpdateVideoAck(int32 video_id);
   void OnRequestMoveAck();
@@ -413,6 +418,7 @@ class CONTENT_EXPORT RenderWidget
 
   virtual void SetDeviceScaleFactor(float device_scale_factor);
   virtual bool SetDeviceColorProfile(const std::vector<char>& color_profile);
+  virtual void ResetDeviceColorProfileForTesting();
 
   virtual void OnOrientationChange();
 
@@ -572,9 +578,9 @@ class CONTENT_EXPORT RenderWidget
   // The size of the view's backing surface in non-DPI-adjusted pixels.
   gfx::Size physical_backing_size_;
 
-  // The height of the physical backing surface that is overdrawn opaquely in
-  // the browser, for example by an on-screen-keyboard (in DPI-adjusted pixels).
-  float overdraw_bottom_height_;
+  // The amount that the viewport size given to Blink was shrunk by the URL-bar
+  // (always 0 on platforms where URL-bar hiding isn't supported).
+  float top_controls_layout_height_;
 
   // The size of the visible viewport in DPI-adjusted pixels.
   gfx::Size visible_viewport_size_;
@@ -624,6 +630,9 @@ class CONTENT_EXPORT RenderWidget
   // be sent, except for a Close.
   bool closing_;
 
+  // True if it is known that the host is in the process of being shut down.
+  bool host_closing_;
+
   // Whether this RenderWidget is currently swapped out, such that the view is
   // being rendered by another process.  If all RenderWidgets in a process are
   // swapped out, the process can exit.