Add support for child and popup windows in OSR

atom/browser/osr/osr_render_widget_host_view.h

@@ -20,10 +20,12 @@
 #include "base/time/time.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
+#include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/renderer_host/delegated_frame_host.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/browser/renderer_host/resize_lock.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/compositor/compositor.h"
@@ -69,7 +71,7 @@ class OffScreenRenderWidgetHostView
   OffScreenRenderWidgetHostView(bool transparent,
                                 const OnPaintCallback& callback,
                                 content::RenderWidgetHost* render_widget_host,
-                                bool is_guest_view_hack,
+                                OffScreenRenderWidgetHostView* parent_host_view,
                                 NativeWindow* native_window);
   ~OffScreenRenderWidgetHostView() override;
 
@@ -139,6 +141,9 @@ class OffScreenRenderWidgetHostView
   void BeginFrameSubscription(
     std::unique_ptr<content::RenderWidgetHostViewFrameSubscriber>) override;
   void EndFrameSubscription() override;
+  void InitAsGuest(
+    content::RenderWidgetHostView*, 
+    content::RenderWidgetHostViewGuest*) override;
   bool HasAcceleratedSurface(const gfx::Size &) override;
   gfx::Rect GetBoundsInRootWindow(void) override;
   void ImeCompositionRangeChanged(
@@ -193,7 +198,32 @@ class OffScreenRenderWidgetHostView
   void DestroyPlatformWidget();
 #endif
 
+  void CancelWidget();
+  void AddGuestHostView(OffScreenRenderWidgetHostView* guest_host);
+  void RemoveGuestHostView(OffScreenRenderWidgetHostView* guest_host);
+
+  void RegisterGuestViewFrameSwappedCallback(
+      content::RenderWidgetHostViewGuest* guest_host_view);
+  void OnGuestViewFrameSwapped(
+      content::RenderWidgetHostViewGuest* guest_host_view);
+
   void OnPaint(const gfx::Rect& damage_rect, const SkBitmap& bitmap);
+  void OnPopupPaint(const gfx::Rect& damage_rect, const SkBitmap& bitmap);
+  
+  bool IsPopupWidget() const {
+    return popup_type_ != blink::WebPopupTypeNone;
+  }
+  
+  void HoldResize();
+  void ReleaseResize();
+  void WasResized();
+  
+  void ProcessKeyboardEvent(
+      const content::NativeWebKeyboardEvent& event) override;
+  void ProcessMouseEvent(const blink::WebMouseEvent& event,
+      const ui::LatencyInfo& latency) override;
+  void ProcessMouseWheelEvent(const blink::WebMouseWheelEvent& event,
+      const ui::LatencyInfo& latency) override;
 
   void SetPainting(bool painting);
   bool IsPainting() const;
@@ -206,6 +236,7 @@ class OffScreenRenderWidgetHostView
   content::DelegatedFrameHost* GetDelegatedFrameHost() const;
 
   void Invalidate();
+  void InvalidateBounds(const gfx::Rect&);
 
   content::RenderWidgetHostImpl* render_widget_host() const
       { return render_widget_host_; }
@@ -213,6 +244,14 @@ class OffScreenRenderWidgetHostView
   gfx::Size size() const { return size_; }
   float scale_factor() const { return scale_factor_; }
 
+  void set_popup_host_view(OffScreenRenderWidgetHostView* popup_view) {
+    popup_host_view_ = popup_view;
+  }
+  
+  void set_child_host_view(OffScreenRenderWidgetHostView* child_view) {
+    child_host_view_ = child_view;
+  }
+
  private:
   void SetupFrameRate(bool force);
   void ResizeRootLayer();
@@ -221,11 +260,19 @@ class OffScreenRenderWidgetHostView
 
   // Weak ptrs.
   content::RenderWidgetHostImpl* render_widget_host_;
+  
+  OffScreenRenderWidgetHostView* parent_host_view_;
+  OffScreenRenderWidgetHostView* popup_host_view_;
+  std::unique_ptr<SkBitmap> popup_bitmap_;
+  OffScreenRenderWidgetHostView* child_host_view_;
+  std::set<OffScreenRenderWidgetHostView*> guest_host_views_;
+  
   NativeWindow* native_window_;
   OffScreenOutputDevice* software_output_device_;
 
   const bool transparent_;
   OnPaintCallback callback_;
+  OnPaintCallback parent_callback_;
 
   int frame_rate_;
   int frame_rate_threshold_ms_;
@@ -233,10 +280,16 @@ class OffScreenRenderWidgetHostView
   base::Time last_time_;
 
   float scale_factor_;
-  bool is_showing_;
   gfx::Vector2dF last_scroll_offset_;
   gfx::Size size_;
   bool painting_;
+  
+  bool is_showing_;
+  bool is_destroyed_;
+  gfx::Rect popup_position_;
+
+  bool hold_resize_;
+  bool pending_resize_;
 
   std::unique_ptr<ui::Layer> root_layer_;
   std::unique_ptr<ui::Compositor> compositor_;