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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 218403009: Map width/height to style for foreignObject (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use |value| sent to collectStyleForPresentationAttribute as suggested in review Created 6 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3286 matching lines...) Expand 10 before | Expand all | Expand 10 after
3297 if (!inlineStyle()) 3297 if (!inlineStyle())
3298 return; 3298 return;
3299 ensureMutableInlineStyle().clear(); 3299 ensureMutableInlineStyle().clear();
3300 inlineStyleChanged(); 3300 inlineStyleChanged();
3301 } 3301 }
3302 3302
3303 void Element::updatePresentationAttributeStyle() 3303 void Element::updatePresentationAttributeStyle()
3304 { 3304 {
3305 // ShareableElementData doesn't store presentation attribute style, so make sure we have a UniqueElementData. 3305 // ShareableElementData doesn't store presentation attribute style, so make sure we have a UniqueElementData.
3306 UniqueElementData& elementData = ensureUniqueElementData(); 3306 UniqueElementData& elementData = ensureUniqueElementData();
3307 if (elementData.m_animatedSVGAttributesAreDirty) {
3308 // Presentation attributes may depend on animated svg attributes.
3309 ASSERT(isSVGElement());
3310 toSVGElement(this)->synchronizeAnimatedSVGAttribute(anyQName());
3311 }
3307 elementData.m_presentationAttributeStyleIsDirty = false; 3312 elementData.m_presentationAttributeStyleIsDirty = false;
3308 elementData.m_presentationAttributeStyle = computePresentationAttributeStyle (*this); 3313 elementData.m_presentationAttributeStyle = computePresentationAttributeStyle (*this);
3309 } 3314 }
3310 3315
3311 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* s tyle, CSSPropertyID propertyID, CSSValueID identifier) 3316 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* s tyle, CSSPropertyID propertyID, CSSValueID identifier)
3312 { 3317 {
3313 ASSERT(isStyledElement()); 3318 ASSERT(isStyledElement());
3314 style->setProperty(propertyID, cssValuePool().createIdentifierValue(identifi er)); 3319 style->setProperty(propertyID, cssValuePool().createIdentifierValue(identifi er));
3315 } 3320 }
3316 3321
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
3364 || isHTMLObjectElement(*this) 3369 || isHTMLObjectElement(*this)
3365 || isHTMLAppletElement(*this) 3370 || isHTMLAppletElement(*this)
3366 || isHTMLCanvasElement(*this)) 3371 || isHTMLCanvasElement(*this))
3367 return false; 3372 return false;
3368 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3373 if (FullscreenElementStack::isActiveFullScreenElement(this))
3369 return false; 3374 return false;
3370 return true; 3375 return true;
3371 } 3376 }
3372 3377
3373 } // namespace WebCore 3378 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698