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

Unified Diff: content/renderer/render_widget.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/renderer/render_view_impl_unittest.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index f3f5c7fe6f96b89c9103a75a30a8772052572acf..e713d8540828388d46c33038f96856d0a1546141 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -32,8 +32,8 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/ime/text_input_mode.h"
#include "ui/base/ime/text_input_type.h"
-#include "ui/base/range/range.h"
#include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/range/range.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/vector2d.h"
#include "ui/gfx/vector2d_f.h"
@@ -60,7 +60,7 @@ struct WebRenderingStatsImpl;
namespace cc { class OutputSurface; }
-namespace ui {
+namespace gfx {
class Range;
}
@@ -307,7 +307,7 @@ class CONTENT_EXPORT RenderWidget
int selection_start,
int selection_end);
virtual void OnImeConfirmComposition(const string16& text,
- const ui::Range& replacement_range,
+ const gfx::Range& replacement_range,
bool keep_selection);
void OnPaintAtSize(const TransportDIB::Handle& dib_id,
int tag,
@@ -449,12 +449,12 @@ class CONTENT_EXPORT RenderWidget
// Returns the range of the text that is being composed or the selection if
// the composition does not exist.
- virtual void GetCompositionRange(ui::Range* range);
+ virtual void GetCompositionRange(gfx::Range* range);
// Returns true if the composition range or composition character bounds
// should be sent to the browser process.
bool ShouldUpdateCompositionInfo(
- const ui::Range& range,
+ const gfx::Range& range,
const std::vector<gfx::Rect>& bounds);
#endif
@@ -655,7 +655,7 @@ class CONTENT_EXPORT RenderWidget
std::vector<gfx::Rect> composition_character_bounds_;
// Stores the current composition range.
- ui::Range composition_range_;
+ gfx::Range composition_range_;
// The kind of popup this widget represents, NONE if not a popup.
WebKit::WebPopupType popup_type_;
« no previous file with comments | « content/renderer/render_view_impl_unittest.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698