Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / content / browser / web_contents / web_contents_view_aura.h

diff --git a/src/content/browser/web_contents/web_contents_view_aura.h b/src/content/browser/web_contents/web_contents_view_aura.h
index 71a425a..2d7df30 100644 (file)
--- a/src/content/browser/web_contents/web_contents_view_aura.h
+++ b/src/content/browser/web_contents/web_contents_view_aura.h
@@ -139,7 +139,7 @@ class WebContentsViewAura
 
   // Overridden from OverscrollControllerDelegate:
   virtual gfx::Rect GetVisibleBounds() const OVERRIDE;
-  virtual void OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE;
+  virtual bool OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE;
   virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE;
   virtual void OnOverscrollModeChange(OverscrollMode old_mode,
                                       OverscrollMode new_mode) OVERRIDE;
@@ -183,6 +183,9 @@ class WebContentsViewAura
   virtual void OnWindowVisibilityChanged(aura::Window* window,
                                          bool visible) OVERRIDE;
 
+  // Update the web contents visiblity.
+  void UpdateWebContentsVisibility(bool visible);
+
   scoped_ptr<aura::Window> window_;
 
   // The window that shows the screenshot of the history page during an
@@ -226,6 +229,10 @@ class WebContentsViewAura
   scoped_ptr<TouchEditableImplAura> touch_editable_;
   scoped_ptr<GestureNavSimple> gesture_nav_simple_;
 
+  // On Windows we can run into problems if resources get released within the
+  // initialization phase while the content (and its dimensions) are not known.
+  bool is_or_was_visible_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAura);
 };