| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2015 Google Inc. All rights reserved. | 5 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 LayoutPoint vPoint = view->rootFrameToContents(event.event().position())
; | 150 LayoutPoint vPoint = view->rootFrameToContents(event.event().position())
; |
| 151 if (!extendSelection && selection().contains(vPoint)) { | 151 if (!extendSelection && selection().contains(vPoint)) { |
| 152 m_mouseDownWasSingleClickInSelection = true; | 152 m_mouseDownWasSingleClickInSelection = true; |
| 153 return false; | 153 return false; |
| 154 } | 154 } |
| 155 } | 155 } |
| 156 | 156 |
| 157 PositionWithAffinity eventPos = innerNode->layoutObject()->positionForPoint(
event.localPoint()); | 157 PositionWithAffinity eventPos = innerNode->layoutObject()->positionForPoint(
event.localPoint()); |
| 158 VisiblePosition visiblePos = createVisiblePosition(Strategy::toPositionType(
eventPos.position()), eventPos.affinity()); | 158 VisiblePosition visiblePos = createVisiblePosition(Strategy::toPositionType(
eventPos.position()), eventPos.affinity()); |
| 159 if (visiblePos.isNull()) | 159 if (visiblePos.isNull()) |
| 160 visiblePos = VisiblePosition(firstPositionInOrBeforeNode(innerNode)); | 160 visiblePos = createVisiblePosition(firstPositionInOrBeforeNode(innerNode
)); |
| 161 PositionType pos = Strategy::toPositionType(visiblePos.deepEquivalent()); | 161 PositionType pos = Strategy::toPositionType(visiblePos.deepEquivalent()); |
| 162 | 162 |
| 163 VisibleSelection newSelection = selection().selection(); | 163 VisibleSelection newSelection = selection().selection(); |
| 164 TextGranularity granularity = CharacterGranularity; | 164 TextGranularity granularity = CharacterGranularity; |
| 165 | 165 |
| 166 if (extendSelection && newSelection.isCaretOrRange()) { | 166 if (extendSelection && newSelection.isCaretOrRange()) { |
| 167 VisibleSelection selectionInUserSelectAll(expandSelectionToRespectUserSe
lectAll(innerNode, VisibleSelection(createVisiblePosition(pos)))); | 167 VisibleSelection selectionInUserSelectAll(expandSelectionToRespectUserSe
lectAll(innerNode, VisibleSelection(createVisiblePosition(pos)))); |
| 168 if (selectionInUserSelectAll.isRange()) { | 168 if (selectionInUserSelectAll.isRange()) { |
| 169 if (Strategy::selectionStart(selectionInUserSelectAll).compareTo(Str
ategy::selectionStart(newSelection)) < 0) | 169 if (Strategy::selectionStart(selectionInUserSelectAll).compareTo(Str
ategy::selectionStart(newSelection)) < 0) |
| 170 pos = Strategy::selectionStart(selectionInUserSelectAll); | 170 pos = Strategy::selectionStart(selectionInUserSelectAll); |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 else | 650 else |
| 651 m_selectionState = SelectionState::HaveNotStartedSelection; | 651 m_selectionState = SelectionState::HaveNotStartedSelection; |
| 652 } | 652 } |
| 653 | 653 |
| 654 FrameSelection& SelectionController::selection() const | 654 FrameSelection& SelectionController::selection() const |
| 655 { | 655 { |
| 656 return m_frame->selection(); | 656 return m_frame->selection(); |
| 657 } | 657 } |
| 658 | 658 |
| 659 } // namespace blink | 659 } // namespace blink |
| OLD | NEW |