OLD | NEW |
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) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights reserv
ed. |
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 } | 53 } |
54 | 54 |
55 static inline RenderPart* findPartRenderer(const Node* n) | 55 static inline RenderPart* findPartRenderer(const Node* n) |
56 { | 56 { |
57 if (!n->renderer()) | 57 if (!n->renderer()) |
58 n = Traversal<HTMLObjectElement>::firstAncestor(*n); | 58 n = Traversal<HTMLObjectElement>::firstAncestor(*n); |
59 | 59 |
60 if (n && n->renderer() && n->renderer()->isRenderPart()) | 60 if (n && n->renderer() && n->renderer()->isRenderPart()) |
61 return toRenderPart(n->renderer()); | 61 return toRenderPart(n->renderer()); |
62 | 62 |
63 return 0; | 63 return nullptr; |
64 } | 64 } |
65 | 65 |
66 RenderPart* HTMLEmbedElement::existingRenderPart() const | 66 RenderPart* HTMLEmbedElement::existingRenderPart() const |
67 { | 67 { |
68 return findPartRenderer(this); | 68 return findPartRenderer(this); |
69 } | 69 } |
70 | 70 |
71 bool HTMLEmbedElement::isPresentationAttribute(const QualifiedName& name) const | 71 bool HTMLEmbedElement::isPresentationAttribute(const QualifiedName& name) const |
72 { | 72 { |
73 if (name == hiddenAttr) | 73 if (name == hiddenAttr) |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); | 106 m_imageLoader->updateFromElement(ImageLoader::UpdateIgnorePreviousEr
ror); |
107 } | 107 } |
108 } else { | 108 } else { |
109 HTMLPlugInElement::parseAttribute(name, value); | 109 HTMLPlugInElement::parseAttribute(name, value); |
110 } | 110 } |
111 } | 111 } |
112 | 112 |
113 void HTMLEmbedElement::parametersForPlugin(Vector<String>& paramNames, Vector<St
ring>& paramValues) | 113 void HTMLEmbedElement::parametersForPlugin(Vector<String>& paramNames, Vector<St
ring>& paramValues) |
114 { | 114 { |
115 AttributeCollection attributes = this->attributes(); | 115 AttributeCollection attributes = this->attributes(); |
116 AttributeCollection::iterator end = attributes.end(); | 116 for (const Attribute& attribute : attributes) { |
117 for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it)
{ | 117 paramNames.append(attribute.localName().string()); |
118 paramNames.append(it->localName().string()); | 118 paramValues.append(attribute.value().string()); |
119 paramValues.append(it->value().string()); | |
120 } | 119 } |
121 } | 120 } |
122 | 121 |
123 // FIXME: This should be unified with HTMLObjectElement::updateWidget and | 122 // FIXME: This should be unified with HTMLObjectElement::updateWidget and |
124 // moved down into HTMLPluginElement.cpp | 123 // moved down into HTMLPluginElement.cpp |
125 void HTMLEmbedElement::updateWidgetInternal() | 124 void HTMLEmbedElement::updateWidgetInternal() |
126 { | 125 { |
127 ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); | 126 ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); |
128 ASSERT(needsWidgetUpdate()); | 127 ASSERT(needsWidgetUpdate()); |
129 setNeedsWidgetUpdate(false); | 128 setNeedsWidgetUpdate(false); |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 { | 190 { |
192 // http://www.whatwg.org/specs/web-apps/current-work/#exposed | 191 // http://www.whatwg.org/specs/web-apps/current-work/#exposed |
193 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor
(*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object))
{ | 192 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor
(*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object))
{ |
194 if (object->isExposed()) | 193 if (object->isExposed()) |
195 return false; | 194 return false; |
196 } | 195 } |
197 return true; | 196 return true; |
198 } | 197 } |
199 | 198 |
200 } | 199 } |
OLD | NEW |