| 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 eef16d09fd2961751e42ea431a973173e50b9e67..3cbd47573dfd9bcce0e0a8ba28bc5392e839d2b8 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
|
| @@ -130,7 +130,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| InputEventAckState ack_result) override;
|
| bool LockMouse() override;
|
| void UnlockMouse() override;
|
| - uint32_t GetSurfaceIdNamespace() override;
|
| + uint32_t GetSurfaceClientId() override;
|
| void ProcessKeyboardEvent(const NativeWebKeyboardEvent& event) override;
|
| void ProcessMouseEvent(const blink::WebMouseEvent& event,
|
| const ui::LatencyInfo& latency) override;
|
| @@ -237,8 +237,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
|
| cc::BeginFrameSource* begin_frame_source_;
|
| cc::BeginFrameArgs last_begin_frame_args_;
|
| bool observing_begin_frame_source_;
|
| - // The surface id namespace of the parent RenderWidgetHostView. 0 if none.
|
| - uint32_t parent_surface_id_namespace_;
|
| + // The surface client ID of the parent RenderWidgetHostView. 0 if none.
|
| + uint32_t parent_surface_client_id_;
|
|
|
| base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
|
|
|