Ticket #66165: patch-qt5-qtwebengine-RectF-ambiguous.diff

File patch-qt5-qtwebengine-RectF-ambiguous.diff, 2.9 KB (added by kencu (Ken), 18 months ago)
  • src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc

    diff --git src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc src/3rdparty/chromium/third_party/blink/renderer/core/editing/finder/text_finder.cc
    index e41a894fc..be79bf7cf 100644
    gfx::RectF TextFinder::ActiveFindMatchRect() { 
    629629  if (!current_active_match_frame_ || !active_match_)
    630630    return gfx::RectF();
    631631
    632   return gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
     632//  return gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
     633  CGRect r = FindInPageRectFromRange(EphemeralRange(ActiveMatch()));
     634  return gfx::RectF(r);
     635
    633636}
    634637
    635638Vector<gfx::RectF> TextFinder::FindMatchRects() {
    Vector<gfx::RectF> TextFinder::FindMatchRects() { 
    639642  match_rects.ReserveCapacity(match_rects.size() + find_matches_cache_.size());
    640643  for (const FindMatch& match : find_matches_cache_) {
    641644    DCHECK(!match.rect_.IsEmpty());
    642     match_rects.push_back(match.rect_);
     645//    match_rects.push_back(match.rect_);
     646  CGRect r = match.rect_;
     647  match_rects.push_back(r);
     648
    643649  }
    644650
    645651  return match_rects;
  • src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc

    diff --git src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc src/3rdparty/chromium/third_party/blink/renderer/core/paint/paint_timing_detector.cc
    index 48d06120e..e7963b327 100644
    FloatRect PaintTimingDetector::BlinkSpaceToDIPs( 
    320320  // May be nullptr in tests.
    321321  if (!widget)
    322322    return float_rect;
    323   return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
     323//  return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
     324  CGRect r = float_rect;
     325  return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(r)));
    324326}
    325327
    326328FloatRect PaintTimingDetector::CalculateVisualRect(
  • src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc

    diff --git src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc src/3rdparty/chromium/third_party/blink/renderer/modules/exported/web_ax_object.cc
    index f7a348c81..45de8d332 100644
    void WebAXObject::GetRelativeBounds(WebAXObject& offset_container, 
    14801480  private_->GetRelativeBounds(&container, bounds, container_transform,
    14811481                              clips_children);
    14821482  offset_container = WebAXObject(container);
    1483   bounds_in_container = gfx::RectF(bounds);
     1483  //bounds_in_container = gfx::RectF(bounds);
     1484  CGRect r = bounds;
     1485  bounds_in_container = gfx::RectF(r);
    14841486}
    14851487
    14861488void WebAXObject::GetAllObjectsWithChangedBounds(