Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(492)

Side by Side Diff: sky/engine/core/editing/Editor.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sky/engine/core/editing/EditingStyle.cpp ('k') | sky/engine/core/editing/EditorCommand.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 11 matching lines...) Expand all
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 "sky/engine/config.h" 27 #include "sky/engine/config.h"
28 #include "sky/engine/core/editing/Editor.h" 28 #include "sky/engine/core/editing/Editor.h"
29 29
30 #include "gen/sky/core/CSSPropertyNames.h" 30 #include "gen/sky/core/CSSPropertyNames.h"
31 #include "gen/sky/core/EventNames.h" 31 #include "gen/sky/core/EventNames.h"
32 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 32 #include "sky/engine/bindings2/exception_state_placeholder.h"
33 #include "sky/engine/core/css/CSSComputedStyleDeclaration.h" 33 #include "sky/engine/core/css/CSSComputedStyleDeclaration.h"
34 #include "sky/engine/core/css/StylePropertySet.h" 34 #include "sky/engine/core/css/StylePropertySet.h"
35 #include "sky/engine/core/dom/DocumentFragment.h" 35 #include "sky/engine/core/dom/DocumentFragment.h"
36 #include "sky/engine/core/dom/DocumentMarkerController.h" 36 #include "sky/engine/core/dom/DocumentMarkerController.h"
37 #include "sky/engine/core/dom/NodeTraversal.h" 37 #include "sky/engine/core/dom/NodeTraversal.h"
38 #include "sky/engine/core/dom/Text.h" 38 #include "sky/engine/core/dom/Text.h"
39 #include "sky/engine/core/editing/DeleteSelectionCommand.h" 39 #include "sky/engine/core/editing/DeleteSelectionCommand.h"
40 #include "sky/engine/core/editing/InputMethodController.h" 40 #include "sky/engine/core/editing/InputMethodController.h"
41 #include "sky/engine/core/editing/RenderedPosition.h" 41 #include "sky/engine/core/editing/RenderedPosition.h"
42 #include "sky/engine/core/editing/ReplaceSelectionCommand.h" 42 #include "sky/engine/core/editing/ReplaceSelectionCommand.h"
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 return m_frame.spellChecker(); 815 return m_frame.spellChecker();
816 } 816 }
817 817
818 void Editor::toggleOverwriteModeEnabled() 818 void Editor::toggleOverwriteModeEnabled()
819 { 819 {
820 m_overwriteModeEnabled = !m_overwriteModeEnabled; 820 m_overwriteModeEnabled = !m_overwriteModeEnabled;
821 frame().selection().setShouldShowBlockCursor(m_overwriteModeEnabled); 821 frame().selection().setShouldShowBlockCursor(m_overwriteModeEnabled);
822 } 822 }
823 823
824 } // namespace blink 824 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/editing/EditingStyle.cpp ('k') | sky/engine/core/editing/EditorCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698