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

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

Issue 1226123008: CSSValue Immediates: Replace CSSPrimitiveValue usage with const references (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cssvalue_patch_4_attempt_2
Patch Set: Rebase 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/markup.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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 // FIXME: executeToggleStyleInList does not handle complicated cases such as <b> <u>hello</u>world</b> properly. 135 // FIXME: executeToggleStyleInList does not handle complicated cases such as <b> <u>hello</u>world</b> properly.
136 // This function must use Editor::selectionHasStyle to determine the curr ent style but we cannot fix this 136 // This function must use Editor::selectionHasStyle to determine the curr ent style but we cannot fix this
137 // until https://bugs.webkit.org/show_bug.cgi?id=27818 is resolved. 137 // until https://bugs.webkit.org/show_bug.cgi?id=27818 is resolved.
138 static bool executeToggleStyleInList(LocalFrame& frame, EditorCommandSource sour ce, EditAction action, CSSPropertyID propertyID, CSSValue value) 138 static bool executeToggleStyleInList(LocalFrame& frame, EditorCommandSource sour ce, EditAction action, CSSPropertyID propertyID, CSSValue value)
139 { 139 {
140 RefPtrWillBeRawPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelec tionStart(frame.selection().selection()); 140 RefPtrWillBeRawPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelec tionStart(frame.selection().selection());
141 if (!selectionStyle || !selectionStyle->style()) 141 if (!selectionStyle || !selectionStyle->style())
142 return false; 142 return false;
143 143
144 NullableCSSValue selectedCSSValue = selectionStyle->style()->getPropertyCSSV alue(propertyID); 144 const NullableCSSValue& selectedCSSValue = selectionStyle->style()->getPrope rtyCSSValue(propertyID);
145 String newStyle("none"); 145 String newStyle("none");
146 if (selectedCSSValue && selectedCSSValue->isValueList()) { 146 if (selectedCSSValue && selectedCSSValue->isValueList()) {
147 RefPtrWillBeRawPtr<CSSValueList> selectedCSSValueList = toCSSValueList(s electedCSSValue); 147 RefPtrWillBeRawPtr<CSSValueList> selectedCSSValueList = toCSSValueList(s electedCSSValue);
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 && selectedCSSValue->cssText() == "none") { 153 } else if (selectedCSSValue && selectedCSSValue->cssText() == "none") {
154 newStyle = value.cssText(); 154 newStyle = value.cssText();
(...skipping 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1788 { 1788 {
1789 return m_command && m_command->isTextInsertion; 1789 return m_command && m_command->isTextInsertion;
1790 } 1790 }
1791 1791
1792 int Editor::Command::idForHistogram() const 1792 int Editor::Command::idForHistogram() const
1793 { 1793 {
1794 return isSupported() ? m_command->idForUserMetrics : 0; 1794 return isSupported() ? m_command->idForUserMetrics : 0;
1795 } 1795 }
1796 1796
1797 } // namespace blink 1797 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/markup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698