Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 2883653002: Implement TouchSelectionEditing controls for OOPIF. (Closed)
Patch Set: Mark manager's observer as CONTENT_EXPORT. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 213581d2ec1527df24f84dece81463c439dee614..d5ecab3cbcda68bd38309c467be24fb4b8ae5d68 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
@@ -23,6 +23,7 @@
#include "cc/surfaces/surface_sequence.h"
#include "content/browser/compositor/image_transport_factory.h"
#include "content/browser/renderer_host/event_with_latency_info.h"
+#include "content/browser/renderer_host/input/touch_selection_controller_client_manager.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/common/content_export.h"
#include "content/common/input/input_event_ack_state.h"
@@ -40,6 +41,7 @@ class RenderWidgetHost;
class RenderWidgetHostImpl;
class RenderWidgetHostViewChildFrameTest;
class RenderWidgetHostViewGuestSurfaceTest;
+class TouchSelectionControllerClientChildFrame;
// RenderWidgetHostViewChildFrame implements the view for a RenderWidgetHost
// associated with content being rendered in a separate process from
@@ -51,6 +53,7 @@ class RenderWidgetHostViewGuestSurfaceTest;
// See comments in render_widget_host_view.h about this class and its members.
class CONTENT_EXPORT RenderWidgetHostViewChildFrame
: public RenderWidgetHostViewBase,
+ public TouchSelectionControllerClientManager::Observer,
public NON_EXPORTED_BASE(cc::CompositorFrameSinkSupportClient) {
public:
static RenderWidgetHostViewChildFrame* Create(RenderWidgetHost* widget);
@@ -68,6 +71,10 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
// types, such as RenderWidgetHostViewAura.
void RegisterFrameSwappedCallback(std::unique_ptr<base::Closure> callback);
+ // TouchSelectionControllerClientManager::Observer implementation.
+ void OnManagerWillDestroy(
+ TouchSelectionControllerClientManager* manager) override;
+
// RenderWidgetHostView implementation.
void InitAsChild(gfx::NativeView parent_view) override;
RenderWidgetHost* GetRenderWidgetHost() const override;
@@ -189,6 +196,10 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
bool has_frame() { return has_frame_; }
+ ui::TextInputType GetTextInputType() const;
+ bool GetSelectionRange(gfx::Range* range) const;
+ gfx::Point GetViewOriginInRoot() const;
kenrb 2017/05/23 16:19:02 This one warrants a comment explaining what it ret
wjmaclean 2017/05/23 17:00:41 Done.
+
protected:
friend class RenderWidgetHostView;
friend class RenderWidgetHostViewChildFrameTest;
@@ -265,6 +276,9 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
// The background color of the widget.
SkColor background_color_;
+ std::unique_ptr<TouchSelectionControllerClientChildFrame>
+ selection_controller_client_;
+
base::WeakPtrFactory<RenderWidgetHostViewChildFrame> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrame);
};

Powered by Google App Engine
This is Rietveld 408576698