| 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 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1349 if (flag == m_areMarkedTextMatchesHighlighted) | 1349 if (flag == m_areMarkedTextMatchesHighlighted) |
| 1350 return; | 1350 return; |
| 1351 | 1351 |
| 1352 m_areMarkedTextMatchesHighlighted = flag; | 1352 m_areMarkedTextMatchesHighlighted = flag; |
| 1353 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); | 1353 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); |
| 1354 } | 1354 } |
| 1355 | 1355 |
| 1356 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, Fra
meSelection::SetSelectionOptions options) | 1356 void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, Fra
meSelection::SetSelectionOptions options) |
| 1357 { | 1357 { |
| 1358 spellChecker().respondToChangedSelection(oldSelection, options); | 1358 spellChecker().respondToChangedSelection(oldSelection, options); |
| 1359 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid(); | |
| 1360 notifyComponentsOnChangedSelection(); | 1359 notifyComponentsOnChangedSelection(); |
| 1361 } | 1360 } |
| 1362 | 1361 |
| 1363 SpellChecker& Editor::spellChecker() const | 1362 SpellChecker& Editor::spellChecker() const |
| 1364 { | 1363 { |
| 1365 return frame().spellChecker(); | 1364 return frame().spellChecker(); |
| 1366 } | 1365 } |
| 1367 | 1366 |
| 1368 void Editor::toggleOverwriteModeEnabled() | 1367 void Editor::toggleOverwriteModeEnabled() |
| 1369 { | 1368 { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1420 | 1419 |
| 1421 DEFINE_TRACE(Editor) | 1420 DEFINE_TRACE(Editor) |
| 1422 { | 1421 { |
| 1423 visitor->trace(m_frame); | 1422 visitor->trace(m_frame); |
| 1424 visitor->trace(m_lastEditCommand); | 1423 visitor->trace(m_lastEditCommand); |
| 1425 visitor->trace(m_undoStack); | 1424 visitor->trace(m_undoStack); |
| 1426 visitor->trace(m_mark); | 1425 visitor->trace(m_mark); |
| 1427 } | 1426 } |
| 1428 | 1427 |
| 1429 } // namespace blink | 1428 } // namespace blink |
| OLD | NEW |