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

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

Issue 1326563002: Introduce visiblePositionOf() with PositionWithAffinity as replacement of VisiblePosition constructo (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-01T10:55:04 Created 5 years, 3 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/VisibleUnits.cpp ('k') | Source/core/layout/HitTestResult.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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 HitTestResult result = eventHandler().hitTestResultAtPoint(pt, HitTestReques t::ReadOnly | HitTestRequest::Active); 699 HitTestResult result = eventHandler().hitTestResultAtPoint(pt, HitTestReques t::ReadOnly | HitTestRequest::Active);
700 return result.innerNode() ? &result.innerNode()->document() : nullptr; 700 return result.innerNode() ? &result.innerNode()->document() : nullptr;
701 } 701 }
702 702
703 EphemeralRange LocalFrame::rangeForPoint(const IntPoint& framePoint) 703 EphemeralRange LocalFrame::rangeForPoint(const IntPoint& framePoint)
704 { 704 {
705 const PositionWithAffinity positionWithAffinity = positionForPoint(framePoin t); 705 const PositionWithAffinity positionWithAffinity = positionForPoint(framePoin t);
706 if (positionWithAffinity.isNull()) 706 if (positionWithAffinity.isNull())
707 return EphemeralRange(); 707 return EphemeralRange();
708 708
709 VisiblePosition position(positionWithAffinity); 709 VisiblePosition position = visiblePositionOf(positionWithAffinity);
710 VisiblePosition previous = previousPositionOf(position); 710 VisiblePosition previous = previousPositionOf(position);
711 if (previous.isNotNull()) { 711 if (previous.isNotNull()) {
712 const EphemeralRange previousCharacterRange = makeRange(previous, positi on); 712 const EphemeralRange previousCharacterRange = makeRange(previous, positi on);
713 IntRect rect = editor().firstRectForRange(previousCharacterRange); 713 IntRect rect = editor().firstRectForRange(previousCharacterRange);
714 if (rect.contains(framePoint)) 714 if (rect.contains(framePoint))
715 return EphemeralRange(previousCharacterRange); 715 return EphemeralRange(previousCharacterRange);
716 } 716 }
717 717
718 VisiblePosition next = nextPositionOf(position); 718 VisiblePosition next = nextPositionOf(position);
719 const EphemeralRange nextCharacterRange = makeRange(position, next); 719 const EphemeralRange nextCharacterRange = makeRange(position, next);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 { 853 {
854 if (isLocalRoot()) 854 if (isLocalRoot())
855 m_instrumentingAgents = InstrumentingAgents::create(); 855 m_instrumentingAgents = InstrumentingAgents::create();
856 else 856 else
857 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 857 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
858 } 858 }
859 859
860 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 860 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
861 861
862 } // namespace blink 862 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/VisibleUnits.cpp ('k') | Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698