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

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

Issue 1032823003: Refactor HitTestResult to store the HitTestRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated as per review comments Created 5 years, 8 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/editing/FrameSelection.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 visiblePos = VisiblePosition(firstPositionInOrBeforeNode(node)); 661 visiblePos = VisiblePosition(firstPositionInOrBeforeNode(node));
662 return visiblePos; 662 return visiblePos;
663 } 663 }
664 664
665 Document* LocalFrame::documentAtPoint(const IntPoint& pointInRootFrame) 665 Document* LocalFrame::documentAtPoint(const IntPoint& pointInRootFrame)
666 { 666 {
667 if (!view()) 667 if (!view())
668 return nullptr; 668 return nullptr;
669 669
670 IntPoint pt = view()->rootFrameToContents(pointInRootFrame); 670 IntPoint pt = view()->rootFrameToContents(pointInRootFrame);
671 HitTestResult result = HitTestResult(pt);
672 671
673 if (contentRenderer()) 672 if (!contentRenderer())
674 result = eventHandler().hitTestResultAtPoint(pt, HitTestRequest::ReadOnl y | HitTestRequest::Active); 673 return nullptr;
674 HitTestResult result = eventHandler().hitTestResultAtPoint(pt, HitTestReques t::ReadOnly | HitTestRequest::Active);
675 return result.innerNode() ? &result.innerNode()->document() : nullptr; 675 return result.innerNode() ? &result.innerNode()->document() : nullptr;
676 } 676 }
677 677
678 PassRefPtrWillBeRawPtr<Range> LocalFrame::rangeForPoint(const IntPoint& framePoi nt) 678 PassRefPtrWillBeRawPtr<Range> LocalFrame::rangeForPoint(const IntPoint& framePoi nt)
679 { 679 {
680 VisiblePosition position = visiblePositionForPoint(framePoint); 680 VisiblePosition position = visiblePositionForPoint(framePoint);
681 if (position.isNull()) 681 if (position.isNull())
682 return nullptr; 682 return nullptr;
683 683
684 VisiblePosition previous = position.previous(); 684 VisiblePosition previous = position.previous();
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 // We detach the FrameView's custom scroll bars as early as 839 // We detach the FrameView's custom scroll bars as early as
840 // possible to prevent m_doc->detach() from messing with the view 840 // possible to prevent m_doc->detach() from messing with the view
841 // such that its scroll bars won't be torn down. 841 // such that its scroll bars won't be torn down.
842 // 842 //
843 // FIXME: We should revisit this. 843 // FIXME: We should revisit this.
844 if (m_view) 844 if (m_view)
845 m_view->prepareForDetach(); 845 m_view->prepareForDetach();
846 } 846 }
847 847
848 } // namespace blink 848 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/FrameSelection.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698