| 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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 // If my parent is an <object> and is not set to use fallback content, I | 185 // If my parent is an <object> and is not set to use fallback content, I |
| 186 // should be ignored and not get a renderer. | 186 // should be ignored and not get a renderer. |
| 187 ContainerNode* p = parentNode(); | 187 ContainerNode* p = parentNode(); |
| 188 if (p && p->hasTagName(objectTag)) { | 188 if (p && p->hasTagName(objectTag)) { |
| 189 ASSERT(p->renderer()); | 189 ASSERT(p->renderer()); |
| 190 if (!static_cast<HTMLObjectElement*>(p)->useFallbackContent()) { | 190 if (!static_cast<HTMLObjectElement*>(p)->useFallbackContent()) { |
| 191 ASSERT(!p->renderer()->isEmbeddedObject()); | 191 ASSERT(!p->renderer()->isEmbeddedObject()); |
| 192 return false; | 192 return false; |
| 193 } | 193 } |
| 194 } | 194 } |
| 195 | |
| 196 #if ENABLE(DASHBOARD_SUPPORT) | |
| 197 // Workaround for <rdar://problem/6642221>. | |
| 198 if (Settings* settings = frame->settings()) { | |
| 199 if (settings->usesDashboardBackwardCompatibilityMode()) | |
| 200 return true; | |
| 201 } | |
| 202 #endif | |
| 203 | |
| 204 return HTMLPlugInImageElement::rendererIsNeeded(context); | 195 return HTMLPlugInImageElement::rendererIsNeeded(context); |
| 205 } | 196 } |
| 206 | 197 |
| 207 bool HTMLEmbedElement::isURLAttribute(const Attribute& attribute) const | 198 bool HTMLEmbedElement::isURLAttribute(const Attribute& attribute) const |
| 208 { | 199 { |
| 209 return attribute.name() == srcAttr || HTMLPlugInImageElement::isURLAttribute
(attribute); | 200 return attribute.name() == srcAttr || HTMLPlugInImageElement::isURLAttribute
(attribute); |
| 210 } | 201 } |
| 211 | 202 |
| 212 const AtomicString& HTMLEmbedElement::imageSourceURL() const | 203 const AtomicString& HTMLEmbedElement::imageSourceURL() const |
| 213 { | 204 { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 227 return getURLAttribute(srcAttr); | 218 return getURLAttribute(srcAttr); |
| 228 } | 219 } |
| 229 | 220 |
| 230 void HTMLEmbedElement::setItemValueText(const String& value, ExceptionCode&) | 221 void HTMLEmbedElement::setItemValueText(const String& value, ExceptionCode&) |
| 231 { | 222 { |
| 232 setAttribute(srcAttr, value); | 223 setAttribute(srcAttr, value); |
| 233 } | 224 } |
| 234 #endif | 225 #endif |
| 235 | 226 |
| 236 } | 227 } |
| OLD | NEW |