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

Side by Side Diff: Source/core/frame/LocalFrame.cpp

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 9 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 | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/PinchViewport.h » ('j') | 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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 return VisiblePosition(); 669 return VisiblePosition();
670 LayoutObject* renderer = node->layoutObject(); 670 LayoutObject* renderer = node->layoutObject();
671 if (!renderer) 671 if (!renderer)
672 return VisiblePosition(); 672 return VisiblePosition();
673 VisiblePosition visiblePos = VisiblePosition(renderer->positionForPoint(resu lt.localPoint())); 673 VisiblePosition visiblePos = VisiblePosition(renderer->positionForPoint(resu lt.localPoint()));
674 if (visiblePos.isNull()) 674 if (visiblePos.isNull())
675 visiblePos = VisiblePosition(firstPositionInOrBeforeNode(node)); 675 visiblePos = VisiblePosition(firstPositionInOrBeforeNode(node));
676 return visiblePos; 676 return visiblePos;
677 } 677 }
678 678
679 Document* LocalFrame::documentAtPoint(const IntPoint& point) 679 Document* LocalFrame::documentAtPoint(const IntPoint& pointInRootFrame)
680 { 680 {
681 if (!view()) 681 if (!view())
682 return nullptr; 682 return nullptr;
683 683
684 IntPoint pt = view()->windowToContents(point); 684 IntPoint pt = view()->rootFrameToContents(pointInRootFrame);
685 HitTestResult result = HitTestResult(pt); 685 HitTestResult result = HitTestResult(pt);
686 686
687 if (contentRenderer()) 687 if (contentRenderer())
688 result = eventHandler().hitTestResultAtPoint(pt, HitTestRequest::ReadOnl y | HitTestRequest::Active); 688 result = eventHandler().hitTestResultAtPoint(pt, HitTestRequest::ReadOnl y | HitTestRequest::Active);
689 return result.innerNode() ? &result.innerNode()->document() : nullptr; 689 return result.innerNode() ? &result.innerNode()->document() : nullptr;
690 } 690 }
691 691
692 PassRefPtrWillBeRawPtr<Range> LocalFrame::rangeForPoint(const IntPoint& framePoi nt) 692 PassRefPtrWillBeRawPtr<Range> LocalFrame::rangeForPoint(const IntPoint& framePoi nt)
693 { 693 {
694 VisiblePosition position = visiblePositionForPoint(framePoint); 694 VisiblePosition position = visiblePositionForPoint(framePoint);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 // We detach the FrameView's custom scroll bars as early as 801 // We detach the FrameView's custom scroll bars as early as
802 // possible to prevent m_doc->detach() from messing with the view 802 // possible to prevent m_doc->detach() from messing with the view
803 // such that its scroll bars won't be torn down. 803 // such that its scroll bars won't be torn down.
804 // 804 //
805 // FIXME: We should revisit this. 805 // FIXME: We should revisit this.
806 if (m_view) 806 if (m_view)
807 m_view->prepareForDetach(); 807 m_view->prepareForDetach();
808 } 808 }
809 809
810 } // namespace blink 810 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698