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

Side by Side Diff: Source/core/css/PropertySetCSSStyleDeclaration.cpp

Issue 1036653002: Clamp shape-margin to zero (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add contentWidthExcludingScrollbar Created 5 years, 8 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved. 4 * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 void AbstractPropertySetCSSStyleDeclaration::setProperty(const String& propertyN ame, const String& value, const String& priority, ExceptionState& exceptionState ) 210 void AbstractPropertySetCSSStyleDeclaration::setProperty(const String& propertyN ame, const String& value, const String& priority, ExceptionState& exceptionState )
211 { 211 {
212 CSSPropertyID propertyID = cssPropertyID(propertyName); 212 CSSPropertyID propertyID = cssPropertyID(propertyName);
213 if (!propertyID) 213 if (!propertyID)
214 return; 214 return;
215 215
216 bool important = equalIgnoringCase(priority, "important"); 216 bool important = equalIgnoringCase(priority, "important");
217 if (!important && !priority.isEmpty()) 217 if (!important && !priority.isEmpty())
218 return; 218 return;
219 219
220 propertySet().setForceOverride(true);
220 setPropertyInternal(propertyID, value, important, exceptionState); 221 setPropertyInternal(propertyID, value, important, exceptionState);
222 propertySet().setForceOverride(false);
221 } 223 }
222 224
223 String AbstractPropertySetCSSStyleDeclaration::removeProperty(const String& prop ertyName, ExceptionState& exceptionState) 225 String AbstractPropertySetCSSStyleDeclaration::removeProperty(const String& prop ertyName, ExceptionState& exceptionState)
224 { 226 {
225 StyleAttributeMutationScope mutationScope(this); 227 StyleAttributeMutationScope mutationScope(this);
226 CSSPropertyID propertyID = cssPropertyID(propertyName); 228 CSSPropertyID propertyID = cssPropertyID(propertyName);
227 if (!propertyID) 229 if (!propertyID)
228 return String(); 230 return String();
229 231
230 willMutate(); 232 willMutate();
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 } 389 }
388 #endif 390 #endif
389 391
390 DEFINE_TRACE(InlineCSSStyleDeclaration) 392 DEFINE_TRACE(InlineCSSStyleDeclaration)
391 { 393 {
392 visitor->trace(m_parentElement); 394 visitor->trace(m_parentElement);
393 AbstractPropertySetCSSStyleDeclaration::trace(visitor); 395 AbstractPropertySetCSSStyleDeclaration::trace(visitor);
394 } 396 }
395 397
396 } // namespace blink 398 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698