Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2880043003: Correct location adjustment in FrameView::ConvertSelfToChild (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 3633 matching lines...) Expand 10 before | Expand all | Expand 10 after
3644 // Convert from FrameView coords into page ("absolute") coordinates. 3644 // Convert from FrameView coords into page ("absolute") coordinates.
3645 point += IntSize(ScrollX(), ScrollY()); 3645 point += IntSize(ScrollX(), ScrollY());
3646 3646
3647 return RoundedIntPoint(layout_item.AbsoluteToLocal(point, kUseTransforms)); 3647 return RoundedIntPoint(layout_item.AbsoluteToLocal(point, kUseTransforms));
3648 } 3648 }
3649 3649
3650 IntPoint FrameView::ConvertSelfToChild(const FrameOrPlugin& child, 3650 IntPoint FrameView::ConvertSelfToChild(const FrameOrPlugin& child,
3651 const IntPoint& point) const { 3651 const IntPoint& point) const {
3652 IntPoint new_point = point; 3652 IntPoint new_point = point;
3653 new_point = FrameToContents(point); 3653 new_point = FrameToContents(point);
3654 new_point.MoveBy(child.FrameRect().Location()); 3654 new_point.MoveBy(-child.FrameRect().Location());
3655 return new_point; 3655 return new_point;
3656 } 3656 }
3657 3657
3658 IntRect FrameView::ConvertToContainingFrameViewBase( 3658 IntRect FrameView::ConvertToContainingFrameViewBase(
3659 const IntRect& local_rect) const { 3659 const IntRect& local_rect) const {
3660 if (parent_) { 3660 if (parent_) {
3661 // Get our layoutObject in the parent view 3661 // Get our layoutObject in the parent view
3662 LayoutPartItem layout_item = frame_->OwnerLayoutItem(); 3662 LayoutPartItem layout_item = frame_->OwnerLayoutItem();
3663 if (layout_item.IsNull()) 3663 if (layout_item.IsNull())
3664 return local_rect; 3664 return local_rect;
(...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after
5362 void FrameView::SetAnimationHost( 5362 void FrameView::SetAnimationHost(
5363 std::unique_ptr<CompositorAnimationHost> host) { 5363 std::unique_ptr<CompositorAnimationHost> host) {
5364 animation_host_ = std::move(host); 5364 animation_host_ = std::move(host);
5365 } 5365 }
5366 5366
5367 LayoutUnit FrameView::CaretWidth() const { 5367 LayoutUnit FrameView::CaretWidth() const {
5368 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5368 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5369 } 5369 }
5370 5370
5371 } // namespace blink 5371 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698