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

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

Issue 23956012: Stop passing NodeRenderingContext except in textRendererIsNeeded (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/dom/Element.h ('k') | Source/core/dom/NodeRenderingContext.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) 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 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 return base; 1190 return base;
1191 1191
1192 return KURL(parentBase, baseAttribute); 1192 return KURL(parentBase, baseAttribute);
1193 } 1193 }
1194 1194
1195 const AtomicString Element::imageSourceURL() const 1195 const AtomicString Element::imageSourceURL() const
1196 { 1196 {
1197 return getAttribute(srcAttr); 1197 return getAttribute(srcAttr);
1198 } 1198 }
1199 1199
1200 bool Element::rendererIsNeeded(const NodeRenderingContext& context) 1200 bool Element::rendererIsNeeded(const RenderStyle& style)
1201 { 1201 {
1202 return context.style()->display() != NONE; 1202 return style.display() != NONE;
1203 } 1203 }
1204 1204
1205 RenderObject* Element::createRenderer(RenderStyle* style) 1205 RenderObject* Element::createRenderer(RenderStyle* style)
1206 { 1206 {
1207 return RenderObject::createObject(this, style); 1207 return RenderObject::createObject(this, style);
1208 } 1208 }
1209 1209
1210 Node::InsertionNotificationRequest Element::insertedInto(ContainerNode* insertio nPoint) 1210 Node::InsertionNotificationRequest Element::insertedInto(ContainerNode* insertio nPoint)
1211 { 1211 {
1212 // need to do superclass processing first so inDocument() is true 1212 // need to do superclass processing first so inDocument() is true
(...skipping 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2568 { 2568 {
2569 return getAttribute(attributeName).string().toUInt(); 2569 return getAttribute(attributeName).string().toUInt();
2570 } 2570 }
2571 2571
2572 void Element::setUnsignedIntegralAttribute(const QualifiedName& attributeName, u nsigned value) 2572 void Element::setUnsignedIntegralAttribute(const QualifiedName& attributeName, u nsigned value)
2573 { 2573 {
2574 // FIXME: Need an AtomicString version of String::number. 2574 // FIXME: Need an AtomicString version of String::number.
2575 setAttribute(attributeName, String::number(value)); 2575 setAttribute(attributeName, String::number(value));
2576 } 2576 }
2577 2577
2578 bool Element::childShouldCreateRenderer(const NodeRenderingContext& childContext ) const 2578 bool Element::childShouldCreateRenderer(const Node& child) const
2579 { 2579 {
2580 // Only create renderers for SVG elements whose parents are SVG elements, or for proper <svg xmlns="svgNS"> subdocuments. 2580 // Only create renderers for SVG elements whose parents are SVG elements, or for proper <svg xmlns="svgNS"> subdocuments.
2581 if (childContext.node()->isSVGElement()) 2581 if (child.isSVGElement())
2582 return childContext.node()->hasTagName(SVGNames::svgTag) || isSVGElement (); 2582 return child.hasTagName(SVGNames::svgTag) || isSVGElement();
2583 2583
2584 return ContainerNode::childShouldCreateRenderer(childContext); 2584 return ContainerNode::childShouldCreateRenderer(child);
2585 } 2585 }
2586 2586
2587 void Element::webkitRequestFullscreen() 2587 void Element::webkitRequestFullscreen()
2588 { 2588 {
2589 FullscreenElementStack::from(&document())->requestFullScreenForElement(this, ALLOW_KEYBOARD_INPUT, FullscreenElementStack::EnforceIFrameAllowFullScreenRequi rement); 2589 FullscreenElementStack::from(&document())->requestFullScreenForElement(this, ALLOW_KEYBOARD_INPUT, FullscreenElementStack::EnforceIFrameAllowFullScreenRequi rement);
2590 } 2590 }
2591 2591
2592 void Element::webkitRequestFullScreen(unsigned short flags) 2592 void Element::webkitRequestFullScreen(unsigned short flags)
2593 { 2593 {
2594 FullscreenElementStack::from(&document())->requestFullScreenForElement(this, (flags | LEGACY_MOZILLA_REQUEST), FullscreenElementStack::EnforceIFrameAllowFul lScreenRequirement); 2594 FullscreenElementStack::from(&document())->requestFullScreenForElement(this, (flags | LEGACY_MOZILLA_REQUEST), FullscreenElementStack::EnforceIFrameAllowFul lScreenRequirement);
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
3638 return 0; 3638 return 0;
3639 } 3639 }
3640 3640
3641 Attribute* UniqueElementData::attributeItem(unsigned index) 3641 Attribute* UniqueElementData::attributeItem(unsigned index)
3642 { 3642 {
3643 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); 3643 ASSERT_WITH_SECURITY_IMPLICATION(index < length());
3644 return &m_attributeVector.at(index); 3644 return &m_attributeVector.at(index);
3645 } 3645 }
3646 3646
3647 } // namespace WebCore 3647 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Element.h ('k') | Source/core/dom/NodeRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698