content/browser/renderer_host/render_widget_host_view_win.h - Issue 24012002: Move Range code to gfx.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.h

Issue 24012002: Move Range code to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: d Created 7 years, 3 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

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | content/browser/renderer_host/render_widget_host_view_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_win.h

diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h

index 83e37b1fb68ad53778fd45f7a859d30fcb9d47f1..6650ae4ba8b911700e769f3128464c01422afa2d 100644

--- a/content/browser/renderer_host/render_widget_host_view_win.h

+++ b/content/browser/renderer_host/render_widget_host_view_win.h

@@ -189,7 +189,7 @@ class RenderWidgetHostViewWin

virtual void ScrollOffsetChanged() OVERRIDE;

virtual void ImeCancelComposition() OVERRIDE;

virtual void ImeCompositionRangeChanged(

- const ui::Range& range,

+ const gfx::Range& range,

const std::vector<gfx::Rect>& character_bounds) OVERRIDE;

virtual void DidUpdateBackingStore(

const gfx::Rect& scroll_rect,

@@ -277,12 +277,12 @@ class RenderWidgetHostViewWin

virtual bool GetCompositionCharacterBounds(uint32 index,

gfx::Rect* rect) OVERRIDE;

virtual bool HasCompositionText() OVERRIDE;

- virtual bool GetTextRange(ui::Range* range) OVERRIDE;

- virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;

- virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;

- virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;

- virtual bool DeleteRange(const ui::Range& range) OVERRIDE;

- virtual bool GetTextFromRange(const ui::Range& range,

+ virtual bool GetTextRange(gfx::Range* range) OVERRIDE;

+ virtual bool GetCompositionTextRange(gfx::Range* range) OVERRIDE;

+ virtual bool GetSelectionRange(gfx::Range* range) OVERRIDE;

+ virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;

+ virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;

+ virtual bool GetTextFromRange(const gfx::Range& range,

string16* text) OVERRIDE;

virtual void OnInputMethodChanged() OVERRIDE;

virtual bool ChangeTextDirectionAndLayoutAlignment(

@@ -572,7 +572,7 @@ class RenderWidgetHostViewWin

// back, we regard the mouse movement as (0, 0).

bool ignore_mouse_movement_;

- ui::Range composition_range_;

+ gfx::Range composition_range_;

// The current composition character bounds.

std::vector<gfx::Rect> composition_character_bounds_;