| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 const PositionInFlatTree extent = visibleSelection.extent(); | 52 const PositionInFlatTree extent = visibleSelection.extent(); |
| 53 if (extent.isNotNull() && (!extent.inDocument() || extent.document() != docu
ment)) | 53 if (extent.isNotNull() && (!extent.inDocument() || extent.document() != docu
ment)) |
| 54 return false; | 54 return false; |
| 55 return true; | 55 return true; |
| 56 } | 56 } |
| 57 | 57 |
| 58 VisibleSelectionInFlatTree PendingSelection::calcVisibleSelection(const VisibleS
electionInFlatTree& originalSelection) const | 58 VisibleSelectionInFlatTree PendingSelection::calcVisibleSelection(const VisibleS
electionInFlatTree& originalSelection) const |
| 59 { | 59 { |
| 60 const PositionInFlatTree& start = originalSelection.start(); | 60 const PositionInFlatTree& start = originalSelection.start(); |
| 61 const PositionInFlatTree& end = originalSelection.end(); | 61 const PositionInFlatTree& end = originalSelection.end(); |
| 62 SelectionType selectionType = originalSelection.selectionType(); | 62 SelectionType selectionType = originalSelection.getSelectionType(); |
| 63 const TextAffinity affinity = originalSelection.affinity(); | 63 const TextAffinity affinity = originalSelection.affinity(); |
| 64 | 64 |
| 65 bool paintBlockCursor = m_frameSelection->shouldShowBlockCursor() && selecti
onType == SelectionType::CaretSelection && !isLogicalEndOfLine(createVisiblePosi
tion(end, affinity)); | 65 bool paintBlockCursor = m_frameSelection->shouldShowBlockCursor() && selecti
onType == SelectionType::CaretSelection && !isLogicalEndOfLine(createVisiblePosi
tion(end, affinity)); |
| 66 VisibleSelectionInFlatTree selection; | 66 VisibleSelectionInFlatTree selection; |
| 67 if (enclosingTextFormControl(start.computeContainerNode())) { | 67 if (enclosingTextFormControl(start.computeContainerNode())) { |
| 68 // TODO(yosin) We should use |PositionMoveType::Character| to avoid | 68 // TODO(yosin) We should use |PositionMoveType::Character| to avoid |
| 69 // ending paint at middle of character. | 69 // ending paint at middle of character. |
| 70 PositionInFlatTree endPosition = paintBlockCursor ? nextPositionOf(origi
nalSelection.extent(), PositionMoveType::CodePoint) : end; | 70 PositionInFlatTree endPosition = paintBlockCursor ? nextPositionOf(origi
nalSelection.extent(), PositionMoveType::CodePoint) : end; |
| 71 selection.setWithoutValidation(start, endPosition); | 71 selection.setWithoutValidation(start, endPosition); |
| 72 return selection; | 72 return selection; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 ASSERT(layoutView == startLayoutObject->view() && layoutView == endLayoutObj
ect->view()); | 133 ASSERT(layoutView == startLayoutObject->view() && layoutView == endLayoutObj
ect->view()); |
| 134 layoutView.setSelection(startLayoutObject, startPos.computeEditingOffset(),
endLayoutObject, endPos.computeEditingOffset()); | 134 layoutView.setSelection(startLayoutObject, startPos.computeEditingOffset(),
endLayoutObject, endPos.computeEditingOffset()); |
| 135 } | 135 } |
| 136 | 136 |
| 137 DEFINE_TRACE(PendingSelection) | 137 DEFINE_TRACE(PendingSelection) |
| 138 { | 138 { |
| 139 visitor->trace(m_frameSelection); | 139 visitor->trace(m_frameSelection); |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace blink | 142 } // namespace blink |
| OLD | NEW |