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

Side by Side Diff: Source/core/svg/SVGElement.cpp

Issue 327323002: Start removing the double-negative !ASSERT_DISABLED (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGElement.h ('k') | Source/core/svg/SVGUseElement.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) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Apple Inc. All rights reserved. 4 * Copyright (C) 2008 Apple Inc. All rights reserved.
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 propertyId = CSSPropertyWebkitTransformOrigin; // cssPropertyID("-webkit -transform-origin") 64 propertyId = CSSPropertyWebkitTransformOrigin; // cssPropertyID("-webkit -transform-origin")
65 } else if (propertyId == CSSPropertyTransformOrigin) { 65 } else if (propertyId == CSSPropertyTransformOrigin) {
66 propertyId = CSSPropertyWebkitTransformOrigin; 66 propertyId = CSSPropertyWebkitTransformOrigin;
67 } 67 }
68 ASSERT(propertyId > 0); 68 ASSERT(propertyId > 0);
69 propertyNameToIdMap->set(attrName.localName().impl(), propertyId); 69 propertyNameToIdMap->set(attrName.localName().impl(), propertyId);
70 } 70 }
71 71
72 SVGElement::SVGElement(const QualifiedName& tagName, Document& document, Constru ctionType constructionType) 72 SVGElement::SVGElement(const QualifiedName& tagName, Document& document, Constru ctionType constructionType)
73 : Element(tagName, &document, constructionType) 73 : Element(tagName, &document, constructionType)
74 #if !ASSERT_DISABLED 74 #if ASSERT_ENABLED
75 , m_inRelativeLengthClientsInvalidation(false) 75 , m_inRelativeLengthClientsInvalidation(false)
76 #endif 76 #endif
77 // |m_isContextElement| must be initialized before |m_className|, as SVGAnim atedString tear-off c-tor currently set this to true. 77 // |m_isContextElement| must be initialized before |m_className|, as SVGAnim atedString tear-off c-tor currently set this to true.
78 , m_isContextElement(false) 78 , m_isContextElement(false)
79 , m_SVGRareData(nullptr) 79 , m_SVGRareData(nullptr)
80 , m_className(SVGAnimatedString::create(this, HTMLNames::classAttr, SVGStrin g::create())) 80 , m_className(SVGAnimatedString::create(this, HTMLNames::classAttr, SVGStrin g::create()))
81 { 81 {
82 ScriptWrappable::init(this); 82 ScriptWrappable::init(this);
83 addToPropertyMap(m_className); 83 addToPropertyMap(m_className);
84 setHasCustomStyleCallbacks(); 84 setHasCustomStyleCallbacks();
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 svgExtensions.removeSVGRootWithRelativeLengthDescendents(toSVGSVGEle ment(clientElement)); 462 svgExtensions.removeSVGRootWithRelativeLengthDescendents(toSVGSVGEle ment(clientElement));
463 } 463 }
464 } 464 }
465 465
466 void SVGElement::invalidateRelativeLengthClients(SubtreeLayoutScope* layoutScope ) 466 void SVGElement::invalidateRelativeLengthClients(SubtreeLayoutScope* layoutScope )
467 { 467 {
468 if (!inDocument()) 468 if (!inDocument())
469 return; 469 return;
470 470
471 ASSERT(!m_inRelativeLengthClientsInvalidation); 471 ASSERT(!m_inRelativeLengthClientsInvalidation);
472 #if !ASSERT_DISABLED 472 #if ASSERT_ENABLED
473 TemporaryChange<bool> inRelativeLengthClientsInvalidationChange(m_inRelative LengthClientsInvalidation, true); 473 TemporaryChange<bool> inRelativeLengthClientsInvalidationChange(m_inRelative LengthClientsInvalidation, true);
474 #endif 474 #endif
475 475
476 RenderObject* renderer = this->renderer(); 476 RenderObject* renderer = this->renderer();
477 if (renderer && selfHasRelativeLengths()) { 477 if (renderer && selfHasRelativeLengths()) {
478 if (renderer->isSVGResourceContainer()) 478 if (renderer->isSVGResourceContainer())
479 toRenderSVGResourceContainer(renderer)->invalidateCacheAndMarkForLay out(layoutScope); 479 toRenderSVGResourceContainer(renderer)->invalidateCacheAndMarkForLay out(layoutScope);
480 else 480 else
481 renderer->setNeedsLayoutAndFullRepaint(MarkContainingBlockChain, lay outScope); 481 renderer->setNeedsLayoutAndFullRepaint(MarkContainingBlockChain, lay outScope);
482 } 482 }
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 Element::trace(visitor); 1176 Element::trace(visitor);
1177 } 1177 }
1178 1178
1179 const AtomicString& SVGElement::eventParameterName() 1179 const AtomicString& SVGElement::eventParameterName()
1180 { 1180 {
1181 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt", AtomicString::Con structFromLiteral)); 1181 DEFINE_STATIC_LOCAL(const AtomicString, evtString, ("evt", AtomicString::Con structFromLiteral));
1182 return evtString; 1182 return evtString;
1183 } 1183 }
1184 1184
1185 } 1185 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGElement.h ('k') | Source/core/svg/SVGUseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698