| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "Editor.h" | 28 #include "Editor.h" |
| 29 | 29 |
| 30 #include "AXObjectCache.h" | |
| 31 #include "AlternativeTextController.h" | 30 #include "AlternativeTextController.h" |
| 32 #include "ApplyStyleCommand.h" | 31 #include "ApplyStyleCommand.h" |
| 33 #include "CSSComputedStyleDeclaration.h" | 32 #include "CSSComputedStyleDeclaration.h" |
| 34 #include "CSSPropertyNames.h" | 33 #include "CSSPropertyNames.h" |
| 35 #include "CSSValueKeywords.h" | 34 #include "CSSValueKeywords.h" |
| 36 #include "CachedResourceLoader.h" | 35 #include "CachedResourceLoader.h" |
| 37 #include "Clipboard.h" | 36 #include "Clipboard.h" |
| 38 #include "ClipboardEvent.h" | 37 #include "ClipboardEvent.h" |
| 39 #include "CompositionEvent.h" | 38 #include "CompositionEvent.h" |
| 40 #include "CreateLinkCommand.h" | 39 #include "CreateLinkCommand.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 #include "StylePropertySet.h" | 81 #include "StylePropertySet.h" |
| 83 #include "StyleResolver.h" | 82 #include "StyleResolver.h" |
| 84 #include "Text.h" | 83 #include "Text.h" |
| 85 #include "TextCheckerClient.h" | 84 #include "TextCheckerClient.h" |
| 86 #include "TextCheckingHelper.h" | 85 #include "TextCheckingHelper.h" |
| 87 #include "TextEvent.h" | 86 #include "TextEvent.h" |
| 88 #include "TextIterator.h" | 87 #include "TextIterator.h" |
| 89 #include "TypingCommand.h" | 88 #include "TypingCommand.h" |
| 90 #include "UserTypingGestureIndicator.h" | 89 #include "UserTypingGestureIndicator.h" |
| 91 #include "VisibleUnits.h" | 90 #include "VisibleUnits.h" |
| 91 #include "core/accessibility/AXObjectCache.h" |
| 92 #include "htmlediting.h" | 92 #include "htmlediting.h" |
| 93 #include "markup.h" | 93 #include "markup.h" |
| 94 #include <wtf/UnusedParam.h> | |
| 95 #include <wtf/unicode/CharacterNames.h> | 94 #include <wtf/unicode/CharacterNames.h> |
| 96 #include <wtf/unicode/Unicode.h> | 95 #include <wtf/unicode/Unicode.h> |
| 96 #include <wtf/UnusedParam.h> |
| 97 | 97 |
| 98 namespace WebCore { | 98 namespace WebCore { |
| 99 | 99 |
| 100 using namespace std; | 100 using namespace std; |
| 101 using namespace HTMLNames; | 101 using namespace HTMLNames; |
| 102 using namespace WTF; | 102 using namespace WTF; |
| 103 using namespace Unicode; | 103 using namespace Unicode; |
| 104 | 104 |
| 105 // When an event handler has moved the selection outside of a text control | 105 // When an event handler has moved the selection outside of a text control |
| 106 // we should use the target control's selection for this editing operation. | 106 // we should use the target control's selection for this editing operation. |
| (...skipping 2822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2929 { | 2929 { |
| 2930 return m_alternativeTextController->dictationAlternativesForMarker(marker); | 2930 return m_alternativeTextController->dictationAlternativesForMarker(marker); |
| 2931 } | 2931 } |
| 2932 | 2932 |
| 2933 void Editor::applyDictationAlternativelternative(const String& alternativeString
) | 2933 void Editor::applyDictationAlternativelternative(const String& alternativeString
) |
| 2934 { | 2934 { |
| 2935 m_alternativeTextController->applyDictationAlternative(alternativeString); | 2935 m_alternativeTextController->applyDictationAlternative(alternativeString); |
| 2936 } | 2936 } |
| 2937 | 2937 |
| 2938 } // namespace WebCore | 2938 } // namespace WebCore |
| OLD | NEW |