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

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: Updated TextExpectations to include height variants too 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 3262 matching lines...) Expand 10 before | Expand all | Expand 10 after
3273 { 3273 {
3274 ASSERT(isStyledElement()); 3274 ASSERT(isStyledElement());
3275 if (!inlineStyle()) 3275 if (!inlineStyle())
3276 return; 3276 return;
3277 ensureMutableInlineStyle().clear(); 3277 ensureMutableInlineStyle().clear();
3278 inlineStyleChanged(); 3278 inlineStyleChanged();
3279 } 3279 }
3280 3280
3281 void Element::updatePresentationAttributeStyle() 3281 void Element::updatePresentationAttributeStyle()
3282 { 3282 {
3283 synchronizeAllAttributes();
3283 // ShareableElementData doesn't store presentation attribute style, so make sure we have a UniqueElementData. 3284 // ShareableElementData doesn't store presentation attribute style, so make sure we have a UniqueElementData.
3284 UniqueElementData& elementData = ensureUniqueElementData(); 3285 UniqueElementData& elementData = ensureUniqueElementData();
3285 elementData.m_presentationAttributeStyleIsDirty = false; 3286 elementData.m_presentationAttributeStyleIsDirty = false;
3286 elementData.m_presentationAttributeStyle = computePresentationAttributeStyle (*this); 3287 elementData.m_presentationAttributeStyle = computePresentationAttributeStyle (*this);
3287 } 3288 }
3288 3289
3289 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* s tyle, CSSPropertyID propertyID, CSSValueID identifier) 3290 void Element::addPropertyToPresentationAttributeStyle(MutableStylePropertySet* s tyle, CSSPropertyID propertyID, CSSValueID identifier)
3290 { 3291 {
3291 ASSERT(isStyledElement()); 3292 ASSERT(isStyledElement());
3292 style->setProperty(propertyID, cssValuePool().createIdentifierValue(identifi er)); 3293 style->setProperty(propertyID, cssValuePool().createIdentifierValue(identifi er));
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
3342 || isHTMLObjectElement(*this) 3343 || isHTMLObjectElement(*this)
3343 || isHTMLAppletElement(*this) 3344 || isHTMLAppletElement(*this)
3344 || isHTMLCanvasElement(*this)) 3345 || isHTMLCanvasElement(*this))
3345 return false; 3346 return false;
3346 if (FullscreenElementStack::isActiveFullScreenElement(this)) 3347 if (FullscreenElementStack::isActiveFullScreenElement(this))
3347 return false; 3348 return false;
3348 return true; 3349 return true;
3349 } 3350 }
3350 3351
3351 } // namespace WebCore 3352 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/svg/foreignObject/fO-percentage-height-style-expected.txt ('k') | Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698