| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 if (flag == m_areMarkedTextMatchesHighlighted) | 1346 if (flag == m_areMarkedTextMatchesHighlighted) |
| 1347 return; | 1347 return; |
| 1348 | 1348 |
| 1349 m_areMarkedTextMatchesHighlighted = flag; | 1349 m_areMarkedTextMatchesHighlighted = flag; |
| 1350 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); | 1350 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); |
| 1351 } | 1351 } |
| 1352 | 1352 |
| 1353 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, Fra
meSelection::SetSelectionOptions options) | 1353 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, Fra
meSelection::SetSelectionOptions options) |
| 1354 { | 1354 { |
| 1355 spellChecker().respondToChangedSelection(oldSelection, options); | 1355 spellChecker().respondToChangedSelection(oldSelection, options); |
| 1356 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid(); | |
| 1357 notifyComponentsOnChangedSelection(); | 1356 notifyComponentsOnChangedSelection(); |
| 1358 } | 1357 } |
| 1359 | 1358 |
| 1360 SpellChecker& Editor::spellChecker() const | 1359 SpellChecker& Editor::spellChecker() const |
| 1361 { | 1360 { |
| 1362 return frame().spellChecker(); | 1361 return frame().spellChecker(); |
| 1363 } | 1362 } |
| 1364 | 1363 |
| 1365 void Editor::toggleOverwriteModeEnabled() | 1364 void Editor::toggleOverwriteModeEnabled() |
| 1366 { | 1365 { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1417 | 1416 |
| 1418 DEFINE_TRACE(Editor) | 1417 DEFINE_TRACE(Editor) |
| 1419 { | 1418 { |
| 1420 visitor->trace(m_frame); | 1419 visitor->trace(m_frame); |
| 1421 visitor->trace(m_lastEditCommand); | 1420 visitor->trace(m_lastEditCommand); |
| 1422 visitor->trace(m_undoStack); | 1421 visitor->trace(m_undoStack); |
| 1423 visitor->trace(m_mark); | 1422 visitor->trace(m_mark); |
| 1424 } | 1423 } |
| 1425 | 1424 |
| 1426 } // namespace blink | 1425 } // namespace blink |
| OLD | NEW |