| Index: content/browser/frame_host/render_widget_host_view_child_frame.h
|
| diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| index 87e2de411f8bb3c0c998d4db2011a7d4718e2100..d0990c5257d486f575c7b035008aa7dfd3bdbb99 100644
|
| --- a/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| +++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
|
| @@ -180,6 +180,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
|
|
| void UpdateViewportIntersection(const gfx::Rect& viewport_intersection);
|
|
|
| + bool has_frame() { return has_frame_; }
|
| +
|
| protected:
|
| friend class RenderWidgetHostView;
|
| friend class RenderWidgetHostViewChildFrameTest;
|
| @@ -188,9 +190,6 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| explicit RenderWidgetHostViewChildFrame(RenderWidgetHost* widget);
|
| void Init();
|
|
|
| - virtual bool ShouldCreateNewSurfaceId(uint32_t compositor_frame_sink_id,
|
| - const cc::CompositorFrame& frame);
|
| -
|
| void ProcessCompositorFrame(uint32_t compositor_frame_sink_id,
|
| cc::CompositorFrame frame);
|
|
|
| @@ -242,6 +241,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| void CreateCompositorFrameSinkSupport();
|
| void ResetCompositorFrameSinkSupport();
|
|
|
| + virtual bool HasEmbedderChanged();
|
| +
|
| using FrameSwappedCallbackList = std::deque<std::unique_ptr<base::Closure>>;
|
| // Since frame-drawn callbacks are "fire once", we use std::deque to make
|
| // it convenient to swap() when processing the list.
|
| @@ -250,6 +251,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| // The surface client ID of the parent RenderWidgetHostView. 0 if none.
|
| cc::FrameSinkId parent_frame_sink_id_;
|
|
|
| + bool has_frame_ = false;
|
| +
|
| base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
|
| };
|
|
|