Skip to content

Commit

Permalink
Remove WebFloatRect
Browse files Browse the repository at this point in the history
Last usage of WebFloatRect has been removed on the blink public API.

BUG=738465

Change-Id: I83917a10a80dda63c735918969f37103f7877816
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490255
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819740}
  • Loading branch information
dtapuska authored and Commit Bot committed Oct 22, 2020
1 parent 853119f commit 2e70d40
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 107 deletions.
7 changes: 3 additions & 4 deletions content/child/browser_font_resource_trusted.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@
#include "ppapi/thunk/thunk.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
#include "third_party/blink/public/platform/web_float_rect.h"
#include "third_party/blink/public/platform/web_font.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_text_run.h"
#include "third_party/icu/source/common/unicode/ubidi.h"
#include "third_party/skia/include/core/SkRect.h"
#include "ui/gfx/geometry/rect_f.h"

using ppapi::StringVar;
using ppapi::thunk::EnterResourceNoLock;
using ppapi::thunk::PPB_ImageData_API;
using blink::WebFloatRect;
using blink::WebFont;
using blink::WebFontDescription;
using blink::WebRect;
Expand Down Expand Up @@ -398,10 +397,10 @@ int32_t BrowserFontResource_Trusted::PixelOffsetForCharacter(
// 0 characters starting at the character in question, it would give us
// a 0-width rect around the insertion point. But that will be on the
// right side of the character for an RTL run, which would be wrong.
WebFloatRect rect = font_->SelectionRectForText(
gfx::RectF rect = font_->SelectionRectForText(
run, gfx::PointF(), font_->Height(), char_offset - run_begin,
char_offset - run_begin + 1);
return cur_pixel_offset + static_cast<int>(rect.x);
return cur_pixel_offset + static_cast<int>(rect.x());
} else {
// Character is past this run, account for the pixels and continue
// looking.
Expand Down
1 change: 0 additions & 1 deletion content/common/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ include_rules = [
"+third_party/blink/public/platform/viewport_intersection_state.h",
"+third_party/blink/public/platform/web_content_security_policy.h",
"+third_party/blink/public/common/page/drag_operation.h",
"+third_party/blink/public/platform/web_float_rect.h",
"+third_party/blink/public/platform/web_fullscreen_video_status.h",
"+third_party/blink/public/platform/web_http_body.h",
"+third_party/blink/public/platform/web_history_scroll_restoration_type.h",
Expand Down
1 change: 0 additions & 1 deletion content/common/widget_messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "ipc/ipc_message_macros.h"
#include "third_party/blink/public/common/widget/visual_properties.h"
#include "third_party/blink/public/mojom/page/record_content_to_visible_time_request.mojom-forward.h"
#include "third_party/blink/public/platform/web_float_rect.h"
#include "ui/base/ime/text_input_action.h"
#include "ui/base/ime/text_input_mode.h"
#include "ui/base/ui_base_types.h"
Expand Down
1 change: 0 additions & 1 deletion third_party/blink/public/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ source_set("blink_headers") {
"platform/web_encrypted_media_types.h",
"platform/web_fetch_client_settings_object.h",
"platform/web_file_system_type.h",
"platform/web_float_rect.h",
"platform/web_font.h",
"platform/web_font_description.h",
"platform/web_font_render_style.h",
Expand Down
100 changes: 0 additions & 100 deletions third_party/blink/public/platform/web_float_rect.h

This file was deleted.

0 comments on commit 2e70d40

Please sign in to comment.