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

Unified Diff: ui/gfx/render_text.h

Issue 11269022: Add Vector2d classes that represent offsets, instead of using Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderText fixup Created 8 years, 2 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: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 3ba9f872e7c554c01c0ab2597f5d36e318f02f6c..13215d8222e2287d4f2605eeb6a944253782130d 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -24,6 +24,7 @@
#include "ui/gfx/selection_model.h"
#include "ui/gfx/shadow_value.h"
#include "ui/gfx/text_constants.h"
+#include "ui/gfx/vector2d.h"
class SkCanvas;
class SkDrawLooper;
@@ -294,7 +295,7 @@ class UI_EXPORT RenderText {
protected:
RenderText();
- const Point& GetUpdatedDisplayOffset();
+ const Vector2d& GetUpdatedDisplayOffset();
void set_cached_bounds_and_offset_valid(bool valid) {
cached_bounds_and_offset_valid_ = valid;
@@ -367,8 +368,9 @@ class UI_EXPORT RenderText {
// style (foreground) to selection range.
void ApplyCompositionAndSelectionStyles(StyleRanges* style_ranges);
- // Returns the text origin after applying text alignment and display offset.
- Point GetTextOrigin();
+ // Returns the text offset from the origin after applying text alignment and
+ // display offset.
+ Vector2d GetTextOffset();
// Convert points from the text space to the view space and back.
// Handles the display area, display offset, and the application LTR/RTL mode.
@@ -380,7 +382,7 @@ class UI_EXPORT RenderText {
int GetContentWidth();
// Returns display offset based on current text alignment.
- Point GetAlignmentOffset();
+ Vector2d GetAlignmentOffset();
// Returns the origin point for drawing text. Does not account for font
// baseline, as needed by Skia.
@@ -504,7 +506,7 @@ class UI_EXPORT RenderText {
// The offset for the text to be drawn, relative to the display area.
// Get this point with GetUpdatedDisplayOffset (or risk using a stale value).
- Point display_offset_;
+ Vector2d display_offset_;
// The cached bounds and offset are invalidated by changes to the cursor,
// selection, font, and other operations that adjust the visible text bounds.

Powered by Google App Engine
This is Rietveld 408576698