| 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 1556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1567 | 1567 |
| 1568 void Editor::setMarkedTextMatchesAreHighlighted(bool flag) { | 1568 void Editor::setMarkedTextMatchesAreHighlighted(bool flag) { |
| 1569 if (flag == m_areMarkedTextMatchesHighlighted) | 1569 if (flag == m_areMarkedTextMatchesHighlighted) |
| 1570 return; | 1570 return; |
| 1571 | 1571 |
| 1572 m_areMarkedTextMatchesHighlighted = flag; | 1572 m_areMarkedTextMatchesHighlighted = flag; |
| 1573 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); | 1573 frame().document()->markers().repaintMarkers(DocumentMarker::TextMatch); |
| 1574 } | 1574 } |
| 1575 | 1575 |
| 1576 void Editor::respondToChangedSelection( | 1576 void Editor::respondToChangedSelection( |
| 1577 const VisibleSelection& oldSelection, | 1577 const Position& oldSelectionStart, |
| 1578 FrameSelection::SetSelectionOptions options) { | 1578 FrameSelection::SetSelectionOptions options) { |
| 1579 spellChecker().respondToChangedSelection(oldSelection, options); | 1579 spellChecker().respondToChangedSelection(oldSelectionStart, options); |
| 1580 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid(); | 1580 frame().inputMethodController().cancelCompositionIfSelectionIsInvalid(); |
| 1581 client().respondToChangedSelection(&frame(), | 1581 client().respondToChangedSelection(&frame(), |
| 1582 frame().selection().getSelectionType()); | 1582 frame().selection().getSelectionType()); |
| 1583 setStartNewKillRingSequence(true); | 1583 setStartNewKillRingSequence(true); |
| 1584 } | 1584 } |
| 1585 | 1585 |
| 1586 SpellChecker& Editor::spellChecker() const { | 1586 SpellChecker& Editor::spellChecker() const { |
| 1587 return frame().spellChecker(); | 1587 return frame().spellChecker(); |
| 1588 } | 1588 } |
| 1589 | 1589 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1644 } | 1644 } |
| 1645 | 1645 |
| 1646 DEFINE_TRACE(Editor) { | 1646 DEFINE_TRACE(Editor) { |
| 1647 visitor->trace(m_frame); | 1647 visitor->trace(m_frame); |
| 1648 visitor->trace(m_lastEditCommand); | 1648 visitor->trace(m_lastEditCommand); |
| 1649 visitor->trace(m_undoStack); | 1649 visitor->trace(m_undoStack); |
| 1650 visitor->trace(m_mark); | 1650 visitor->trace(m_mark); |
| 1651 } | 1651 } |
| 1652 | 1652 |
| 1653 } // namespace blink | 1653 } // namespace blink |
| OLD | NEW |