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

Side by Side Diff: sky/engine/core/editing/EditorCommand.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/Editor.cpp ('k') | sky/engine/core/editing/FrameSelection.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 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 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 * Copyright (C) 2009 Igalia S.L. 4 * Copyright (C) 2009 Igalia S.L.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 12 matching lines...) Expand all
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "sky/engine/config.h" 28 #include "sky/engine/config.h"
29 #include "sky/engine/core/editing/Editor.h" 29 #include "sky/engine/core/editing/Editor.h"
30 30
31 #include "gen/sky/core/CSSPropertyNames.h" 31 #include "gen/sky/core/CSSPropertyNames.h"
32 #include "gen/sky/core/CSSValueKeywords.h" 32 #include "gen/sky/core/CSSValueKeywords.h"
33 #include "sky/engine/bindings/core/v8/ExceptionState.h" 33 #include "sky/engine/bindings2/exception_state.h"
34 #include "sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h" 34 #include "sky/engine/bindings2/exception_state_placeholder.h"
35 #include "sky/engine/core/css/CSSValueList.h" 35 #include "sky/engine/core/css/CSSValueList.h"
36 #include "sky/engine/core/css/StylePropertySet.h" 36 #include "sky/engine/core/css/StylePropertySet.h"
37 #include "sky/engine/core/dom/DocumentFragment.h" 37 #include "sky/engine/core/dom/DocumentFragment.h"
38 #include "sky/engine/core/editing/FrameSelection.h" 38 #include "sky/engine/core/editing/FrameSelection.h"
39 #include "sky/engine/core/editing/ReplaceSelectionCommand.h" 39 #include "sky/engine/core/editing/ReplaceSelectionCommand.h"
40 #include "sky/engine/core/editing/SpellChecker.h" 40 #include "sky/engine/core/editing/SpellChecker.h"
41 #include "sky/engine/core/editing/TypingCommand.h" 41 #include "sky/engine/core/editing/TypingCommand.h"
42 #include "sky/engine/core/editing/htmlediting.h" 42 #include "sky/engine/core/editing/htmlediting.h"
43 #include "sky/engine/core/events/Event.h" 43 #include "sky/engine/core/events/Event.h"
44 #include "sky/engine/core/frame/FrameHost.h" 44 #include "sky/engine/core/frame/FrameHost.h"
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 { 640 {
641 return m_command && m_command->isTextInsertion; 641 return m_command && m_command->isTextInsertion;
642 } 642 }
643 643
644 int Editor::Command::idForHistogram() const 644 int Editor::Command::idForHistogram() const
645 { 645 {
646 return isSupported() ? m_command->idForUserMetrics : 0; 646 return isSupported() ? m_command->idForUserMetrics : 0;
647 } 647 }
648 648
649 } // namespace blink 649 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/editing/Editor.cpp ('k') | sky/engine/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698