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

Side by Side Diff: Source/core/editing/EditorCommand.cpp

Issue 1292303005: Make core/editing/ files to match Blink coding style (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-18T10:48:50 Created 5 years, 4 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 | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/FrameSelection.h » ('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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 RefPtrWillBeRawPtr<CSSValue> selectedCSSValue = selectionStyle->style()->get PropertyCSSValue(propertyID); 144 RefPtrWillBeRawPtr<CSSValue> selectedCSSValue = selectionStyle->style()->get PropertyCSSValue(propertyID);
145 String newStyle("none"); 145 String newStyle("none");
146 if (selectedCSSValue->isValueList()) { 146 if (selectedCSSValue->isValueList()) {
147 RefPtrWillBeRawPtr<CSSValueList> selectedCSSValueList = toCSSValueList(s electedCSSValue.get()); 147 RefPtrWillBeRawPtr<CSSValueList> selectedCSSValueList = toCSSValueList(s electedCSSValue.get());
148 if (!selectedCSSValueList->removeAll(value)) 148 if (!selectedCSSValueList->removeAll(value))
149 selectedCSSValueList->append(value); 149 selectedCSSValueList->append(value);
150 if (selectedCSSValueList->length()) 150 if (selectedCSSValueList->length())
151 newStyle = selectedCSSValueList->cssText(); 151 newStyle = selectedCSSValueList->cssText();
152 152
153 } else if (selectedCSSValue->cssText() == "none") 153 } else if (selectedCSSValue->cssText() == "none") {
154 newStyle = value->cssText(); 154 newStyle = value->cssText();
155 }
155 156
156 // FIXME: We shouldn't be having to convert new style into text. We should have setPropertyCSSValue. 157 // FIXME: We shouldn't be having to convert new style into text. We should have setPropertyCSSValue.
157 RefPtrWillBeRawPtr<MutableStylePropertySet> newMutableStyle = MutableStylePr opertySet::create(); 158 RefPtrWillBeRawPtr<MutableStylePropertySet> newMutableStyle = MutableStylePr opertySet::create();
158 newMutableStyle->setProperty(propertyID, newStyle); 159 newMutableStyle->setProperty(propertyID, newStyle);
159 return applyCommandToFrame(frame, source, action, newMutableStyle.get()); 160 return applyCommandToFrame(frame, source, action, newMutableStyle.get());
160 } 161 }
161 162
162 static bool executeToggleStyle(LocalFrame& frame, EditorCommandSource source, Ed itAction action, CSSPropertyID propertyID, const char* offValue, const char* onV alue) 163 static bool executeToggleStyle(LocalFrame& frame, EditorCommandSource source, Ed itAction action, CSSPropertyID propertyID, const char* offValue, const char* onV alue)
163 { 164 {
164 // Style is considered present when 165 // Style is considered present when
(...skipping 1625 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 { 1791 {
1791 return m_command && m_command->isTextInsertion; 1792 return m_command && m_command->isTextInsertion;
1792 } 1793 }
1793 1794
1794 int Editor::Command::idForHistogram() const 1795 int Editor::Command::idForHistogram() const
1795 { 1796 {
1796 return isSupported() ? m_command->idForUserMetrics : 0; 1797 return isSupported() ? m_command->idForUserMetrics : 0;
1797 } 1798 }
1798 1799
1799 } // namespace blink 1800 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/FrameSelection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698