diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2022-11-11 19:41:13 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2023-03-27 09:09:54 +0000 |
commit | 4227b13058c0d485a562bce3797161dbac59f088 (patch) | |
tree | 997eb36235ddbe531ea26d78e1af20c7985c7a62 /chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc | |
parent | cee5373e6119a7ee20ba5e941185f4a22104d46d (diff) | |
download | qtwebengine-chromium-94-based.tar.gz |
Fix building with XCode 14.194-based
The previously implicit conversion from blink::FloatRect to gfx::RectF
is no longer available when building with newer XCode. Make those
explicit where needed.
Task-number: QTBUG-108207
Change-Id: Ib195f4e423480557d9ff86571254deafb05de8a2
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/443042
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/444719
Diffstat (limited to 'chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc | 6 |
1 files changed, 4 insertions, 2 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; |