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

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

Issue 119533003: Clear mutable inline style when it is empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed typo. Created 6 years, 12 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 ASSERT(m_element); 43 ASSERT(m_element);
44 } 44 }
45 45
46 RemoveCSSPropertyCommand::~RemoveCSSPropertyCommand() 46 RemoveCSSPropertyCommand::~RemoveCSSPropertyCommand()
47 { 47 {
48 } 48 }
49 49
50 void RemoveCSSPropertyCommand::doApply() 50 void RemoveCSSPropertyCommand::doApply()
51 { 51 {
52 const StylePropertySet* style = m_element->inlineStyle(); 52 const StylePropertySet* style = m_element->inlineStyle();
53 if (!style) {
eseidel 2013/12/23 21:22:43 Although (I think?) we allow {} around one-line if
chrishtr 2013/12/23 22:06:46 Done.
54 return;
55 }
56
53 m_oldValue = style->getPropertyValue(m_property); 57 m_oldValue = style->getPropertyValue(m_property);
54 m_important = style->propertyIsImportant(m_property); 58 m_important = style->propertyIsImportant(m_property);
55 59
56 // Mutate using the CSSOM wrapper so we get the same event behavior as a scr ipt. 60 // Mutate using the CSSOM wrapper so we get the same event behavior as a scr ipt.
57 // Setting to null string removes the property. We don't have internal versi on of removeProperty. 61 // Setting to null string removes the property. We don't have internal versi on of removeProperty.
58 m_element->style()->setPropertyInternal(m_property, String(), false, IGNORE_ EXCEPTION); 62 m_element->style()->setPropertyInternal(m_property, String(), false, IGNORE_ EXCEPTION);
59 } 63 }
60 64
61 void RemoveCSSPropertyCommand::doUnapply() 65 void RemoveCSSPropertyCommand::doUnapply()
62 { 66 {
63 m_element->style()->setPropertyInternal(m_property, m_oldValue, m_important, IGNORE_EXCEPTION); 67 m_element->style()->setPropertyInternal(m_property, m_oldValue, m_important, IGNORE_EXCEPTION);
64 } 68 }
65 69
66 } // namespace WebCore 70 } // namespace WebCore
OLDNEW
« Source/core/dom/Element.cpp ('K') | « Source/core/editing/ApplyStyleCommand.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698