Commit e44c4e43 authored by Dominik Röttsches's avatar Dominik Röttsches Committed by Commit Bot

Remove WebFloatRect from WebFont

Change-Id: I541eca7671cc2904e71b3ab959058cc5881c52dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476153
Auto-Submit: Dominik Röttsches <drott@chromium.org>
Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817549}
parent 4626a9c3
...@@ -19,10 +19,10 @@ class PaintCanvas; ...@@ -19,10 +19,10 @@ class PaintCanvas;
namespace gfx { namespace gfx {
class PointF; class PointF;
class RectF;
} }
namespace blink { namespace blink {
struct WebFloatRect;
struct WebFontDescription; struct WebFontDescription;
struct WebTextRun; struct WebTextRun;
...@@ -44,12 +44,12 @@ class WebFont { ...@@ -44,12 +44,12 @@ class WebFont {
BLINK_PLATFORM_EXPORT int CalculateWidth(const WebTextRun&) const; BLINK_PLATFORM_EXPORT int CalculateWidth(const WebTextRun&) const;
BLINK_PLATFORM_EXPORT int OffsetForPosition(const WebTextRun&, BLINK_PLATFORM_EXPORT int OffsetForPosition(const WebTextRun&,
float position) const; float position) const;
BLINK_PLATFORM_EXPORT WebFloatRect BLINK_PLATFORM_EXPORT gfx::RectF SelectionRectForText(
SelectionRectForText(const WebTextRun&, const WebTextRun&,
const gfx::PointF& left_baseline, const gfx::PointF& left_baseline,
int height, int height,
int from = 0, int from = 0,
int to = -1) const; int to = -1) const;
private: private:
explicit WebFont(const WebFontDescription&); explicit WebFont(const WebFontDescription&);
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "third_party/blink/public/platform/web_font.h" #include "third_party/blink/public/platform/web_font.h"
#include "third_party/blink/public/platform/web_float_rect.h"
#include "third_party/blink/public/platform/web_font_description.h" #include "third_party/blink/public/platform/web_font_description.h"
#include "third_party/blink/public/platform/web_rect.h" #include "third_party/blink/public/platform/web_rect.h"
#include "third_party/blink/public/platform/web_text_run.h" #include "third_party/blink/public/platform/web_text_run.h"
...@@ -110,11 +109,11 @@ int WebFont::OffsetForPosition(const WebTextRun& run, float position) const { ...@@ -110,11 +109,11 @@ int WebFont::OffsetForPosition(const WebTextRun& run, float position) const {
run, position, IncludePartialGlyphs, DontBreakGlyphs); run, position, IncludePartialGlyphs, DontBreakGlyphs);
} }
WebFloatRect WebFont::SelectionRectForText(const WebTextRun& run, gfx::RectF WebFont::SelectionRectForText(const WebTextRun& run,
const gfx::PointF& left_baseline, const gfx::PointF& left_baseline,
int height, int height,
int from, int from,
int to) const { int to) const {
return private_->GetFont().SelectionRectForText( return private_->GetFont().SelectionRectForText(
run, FloatPoint(left_baseline), height, from, to); run, FloatPoint(left_baseline), height, from, to);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment