| Index: content/browser/renderer_host/render_widget_host_view_mac.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| index 171decffbac773594c15ecd793364ffea3d29a0b..8d6a561968a018d5ed9a58f4b3c36936f263b0e8 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| @@ -252,7 +252,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
|
| virtual void DidUpdateBackingStore(
|
| const gfx::Rect& scroll_rect,
|
| const gfx::Vector2d& scroll_delta,
|
| - const std::vector<gfx::Rect>& copy_rects) OVERRIDE;
|
| + const std::vector<gfx::Rect>& copy_rects,
|
| + const ui::LatencyInfo& latency_info) OVERRIDE;
|
| virtual void RenderViewGone(base::TerminationStatus status,
|
| int error_code) OVERRIDE;
|
| virtual void Destroy() OVERRIDE;
|
| @@ -398,6 +399,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
|
| // Whether to allow overlapping views.
|
| bool allow_overlapping_views_;
|
|
|
| + ui::LatencyInfo software_latency_info_;
|
| +
|
| NSWindow* pepper_fullscreen_window() const {
|
| return pepper_fullscreen_window_;
|
| }
|
| @@ -414,6 +417,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
|
|
|
| int window_number() const;
|
|
|
| + void FrameSwapped();
|
| +
|
| private:
|
| friend class RenderWidgetHostView;
|
| friend class RenderWidgetHostViewMacTest;
|
|
|