| OLD | NEW |
| 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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 HitTestResult result = eventHandler().hitTestResultAtPoint(pt, HitTestReques
t::ReadOnly | HitTestRequest::Active); | 708 HitTestResult result = eventHandler().hitTestResultAtPoint(pt, HitTestReques
t::ReadOnly | HitTestRequest::Active); |
| 709 return result.innerNode() ? &result.innerNode()->document() : nullptr; | 709 return result.innerNode() ? &result.innerNode()->document() : nullptr; |
| 710 } | 710 } |
| 711 | 711 |
| 712 EphemeralRange LocalFrame::rangeForPoint(const IntPoint& framePoint) | 712 EphemeralRange LocalFrame::rangeForPoint(const IntPoint& framePoint) |
| 713 { | 713 { |
| 714 const PositionWithAffinity positionWithAffinity = positionForPoint(framePoin
t); | 714 const PositionWithAffinity positionWithAffinity = positionForPoint(framePoin
t); |
| 715 if (positionWithAffinity.isNull()) | 715 if (positionWithAffinity.isNull()) |
| 716 return EphemeralRange(); | 716 return EphemeralRange(); |
| 717 | 717 |
| 718 VisiblePosition position = createVisiblePosition(positionWithAffinity); | 718 VisiblePosition position = createVisiblePositionDeprecated(positionWithAffin
ity); |
| 719 VisiblePosition previous = previousPositionOf(position); | 719 VisiblePosition previous = previousPositionOf(position); |
| 720 if (previous.isNotNull()) { | 720 if (previous.isNotNull()) { |
| 721 const EphemeralRange previousCharacterRange = makeRange(previous, positi
on); | 721 const EphemeralRange previousCharacterRange = makeRange(previous, positi
on); |
| 722 IntRect rect = editor().firstRectForRange(previousCharacterRange); | 722 IntRect rect = editor().firstRectForRange(previousCharacterRange); |
| 723 if (rect.contains(framePoint)) | 723 if (rect.contains(framePoint)) |
| 724 return EphemeralRange(previousCharacterRange); | 724 return EphemeralRange(previousCharacterRange); |
| 725 } | 725 } |
| 726 | 726 |
| 727 VisiblePosition next = nextPositionOf(position); | 727 VisiblePosition next = nextPositionOf(position); |
| 728 const EphemeralRange nextCharacterRange = makeRange(position, next); | 728 const EphemeralRange nextCharacterRange = makeRange(position, next); |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 m_frame->client()->frameBlameContext()->Enter(); | 863 m_frame->client()->frameBlameContext()->Enter(); |
| 864 } | 864 } |
| 865 | 865 |
| 866 ScopedFrameBlamer::~ScopedFrameBlamer() | 866 ScopedFrameBlamer::~ScopedFrameBlamer() |
| 867 { | 867 { |
| 868 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 868 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 869 m_frame->client()->frameBlameContext()->Leave(); | 869 m_frame->client()->frameBlameContext()->Leave(); |
| 870 } | 870 } |
| 871 | 871 |
| 872 } // namespace blink | 872 } // namespace blink |
| OLD | NEW |