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

Unified Diff: content/renderer/render_widget.cc

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/renderer/render_widget.h ('k') | content/renderer/text_input_client_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 0447d97c16c8514f9abfa7689bf236e5aa122bbd..181c6cd42f0ada0f5031ade9137448c895cd41d3 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1843,7 +1843,7 @@ void RenderWidget::OnImeSetComposition(
}
void RenderWidget::OnImeConfirmComposition(const string16& text,
- const ui::Range& replacement_range,
+ const gfx::Range& replacement_range,
bool keep_selection) {
if (!ShouldHandleImeEvent())
return;
@@ -2317,7 +2317,7 @@ ui::TextInputType RenderWidget::GetTextInputType() {
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(USE_AURA)
void RenderWidget::UpdateCompositionInfo(bool should_update_range) {
- ui::Range range = ui::Range();
+ gfx::Range range = gfx::Range();
if (should_update_range) {
GetCompositionRange(&range);
} else {
@@ -2340,7 +2340,7 @@ void RenderWidget::GetCompositionCharacterBounds(
bounds->clear();
}
-void RenderWidget::GetCompositionRange(ui::Range* range) {
+void RenderWidget::GetCompositionRange(gfx::Range* range) {
size_t location, length;
if (webwidget_->compositionRange(&location, &length)) {
range->set_start(location);
@@ -2349,12 +2349,12 @@ void RenderWidget::GetCompositionRange(ui::Range* range) {
range->set_start(location);
range->set_end(location + length);
} else {
- *range = ui::Range::InvalidRange();
+ *range = gfx::Range::InvalidRange();
}
}
bool RenderWidget::ShouldUpdateCompositionInfo(
- const ui::Range& range,
+ const gfx::Range& range,
const std::vector<gfx::Rect>& bounds) {
if (composition_range_ != range)
return true;
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/text_input_client_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698