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

Side by Side Diff: third_party/WebKit/Source/core/editing/commands/RemoveCSSPropertyCommand.cpp

Issue 2607403002: Disallow setting invalid values for registered properties via CSSOM (Closed)
Patch Set: fix comments Created 3 years, 11 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 if (!style) 50 if (!style)
51 return; 51 return;
52 52
53 m_oldValue = style->getPropertyValue(m_property); 53 m_oldValue = style->getPropertyValue(m_property);
54 m_important = style->propertyIsImportant(m_property); 54 m_important = style->propertyIsImportant(m_property);
55 55
56 // Mutate using the CSSOM wrapper so we get the same event behavior as a 56 // Mutate using the CSSOM wrapper so we get the same event behavior as a
57 // script. Setting to null string removes the property. We don't have internal 57 // script. Setting to null string removes the property. We don't have internal
58 // version of removeProperty. 58 // version of removeProperty.
59 m_element->style()->setPropertyInternal(m_property, String(), String(), false, 59 m_element->style()->setPropertyInternal(m_property, String(), String(), false,
60 IGNORE_EXCEPTION); 60 nullptr, IGNORE_EXCEPTION);
61 } 61 }
62 62
63 void RemoveCSSPropertyCommand::doUnapply() { 63 void RemoveCSSPropertyCommand::doUnapply() {
64 m_element->style()->setPropertyInternal(m_property, String(), m_oldValue, 64 m_element->style()->setPropertyInternal(
65 m_important, IGNORE_EXCEPTION); 65 m_property, String(), m_oldValue, m_important, nullptr, IGNORE_EXCEPTION);
66 } 66 }
67 67
68 DEFINE_TRACE(RemoveCSSPropertyCommand) { 68 DEFINE_TRACE(RemoveCSSPropertyCommand) {
69 visitor->trace(m_element); 69 visitor->trace(m_element);
70 SimpleEditCommand::trace(visitor); 70 SimpleEditCommand::trace(visitor);
71 } 71 }
72 72
73 } // namespace blink 73 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698