summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core')
-rw-r--r--chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc6
-rw-r--r--chromium/third_party/blink/renderer/core/frame/frame_view.cc2
-rw-r--r--chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc4
3 files changed, 8 insertions, 4 deletions
diff --git a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
index cb8e8e22354..392d0956b64 100644
--- a/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
+++ b/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -694,7 +694,8 @@ gfx::RectF TextFinder::ActiveFindMatchRect() {
if (!current_active_match_frame_ || !active_match_)
return gfx::RectF();
- return gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
+ FloatRect temp = FindInPageRectFromRange(EphemeralRange(ActiveMatch()));
+ return gfx::RectF(temp.X(), temp.Y(), temp.Width(), temp.Height());
}
Vector<gfx::RectF> TextFinder::FindMatchRects() {
@@ -704,7 +705,8 @@ Vector<gfx::RectF> TextFinder::FindMatchRects() {
match_rects.ReserveCapacity(match_rects.size() + find_matches_cache_.size());
for (const FindMatch& match : find_matches_cache_) {
DCHECK(!match.rect_.IsEmpty());
- match_rects.push_back(match.rect_);
+ gfx::RectF temp = gfx::RectF(match.rect_.X(), match.rect_.Y(), match.rect_.Width(), match.rect_.Height());
+ match_rects.push_back(std::move(temp));
}
return match_rects;
diff --git a/chromium/third_party/blink/renderer/core/frame/frame_view.cc b/chromium/third_party/blink/renderer/core/frame/frame_view.cc
index 427942a4461..b73a8f2c197 100644
--- a/chromium/third_party/blink/renderer/core/frame/frame_view.cc
+++ b/chromium/third_party/blink/renderer/core/frame/frame_view.cc
@@ -193,7 +193,7 @@ void FrameView::UpdateViewportIntersection(unsigned flags,
SetViewportIntersection(mojom::blink::ViewportIntersectionState(
viewport_intersection, mainframe_intersection, gfx::Rect(),
occlusion_state, gfx::Size(frame.GetMainFrameViewportSize()),
- gfx::Point(frame.GetMainFrameScrollOffset()), main_frame_gfx_transform));
+ gfx::Point(frame.GetMainFrameScrollOffset().X(), frame.GetMainFrameScrollOffset().Y()), main_frame_gfx_transform));
UpdateFrameVisibility(!viewport_intersection.IsEmpty());
diff --git a/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc b/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
index 9a795855075..3ffa7fd8c7a 100644
--- a/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
+++ b/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
@@ -326,7 +326,9 @@ FloatRect PaintTimingDetector::BlinkSpaceToDIPs(
// May be nullptr in tests.
if (!widget)
return float_rect;
- return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
+ gfx::RectF rectF(float_rect.X(), float_rect.Y(),
+ float_rect.Width(), float_rect.Height());
+ return FloatRect(widget->BlinkSpaceToDIPs(rectF));
}
FloatRect PaintTimingDetector::CalculateVisualRect(