| 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, 2007, 2008, 2009, 2011 Apple Inc. All rights 
     reserved. | 5  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights 
     reserved. | 
| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 178     String codebase; | 178     String codebase; | 
| 179     if (MIMETypeRegistry::isJavaAppletMIMEType(serviceType)) { | 179     if (MIMETypeRegistry::isJavaAppletMIMEType(serviceType)) { | 
| 180         codebase = "codebase"; | 180         codebase = "codebase"; | 
| 181         uniqueParamNames.add(codebase.impl()); // pretend we found it in a PARAM
      already | 181         uniqueParamNames.add(codebase.impl()); // pretend we found it in a PARAM
      already | 
| 182     } | 182     } | 
| 183 | 183 | 
| 184     // Turn the attributes of the <object> element into arrays, but don't overri
     de <param> values. | 184     // Turn the attributes of the <object> element into arrays, but don't overri
     de <param> values. | 
| 185     if (hasAttributes()) { | 185     if (hasAttributes()) { | 
| 186         unsigned attributeCount = this->attributeCount(); | 186         unsigned attributeCount = this->attributeCount(); | 
| 187         for (unsigned i = 0; i < attributeCount; ++i) { | 187         for (unsigned i = 0; i < attributeCount; ++i) { | 
| 188             const Attribute* attribute = attributeItem(i); | 188             const Attribute& attribute = attributeItem(i); | 
| 189             const AtomicString& name = attribute->name().localName(); | 189             const AtomicString& name = attribute.name().localName(); | 
| 190             if (!uniqueParamNames.contains(name.impl())) { | 190             if (!uniqueParamNames.contains(name.impl())) { | 
| 191                 paramNames.append(name.string()); | 191                 paramNames.append(name.string()); | 
| 192                 paramValues.append(attribute->value().string()); | 192                 paramValues.append(attribute.value().string()); | 
| 193             } | 193             } | 
| 194         } | 194         } | 
| 195     } | 195     } | 
| 196 | 196 | 
| 197     mapDataParamToSrc(¶mNames, ¶mValues); | 197     mapDataParamToSrc(¶mNames, ¶mValues); | 
| 198 | 198 | 
| 199     // HTML5 says that an object resource's URL is specified by the object's dat
     a | 199     // HTML5 says that an object resource's URL is specified by the object's dat
     a | 
| 200     // attribute, not by a param element. However, for compatibility, allow the | 200     // attribute, not by a param element. However, for compatibility, allow the | 
| 201     // resource's URL to be given by a param named "src", "movie", "code" or "ur
     l" | 201     // resource's URL to be given by a param named "src", "movie", "code" or "ur
     l" | 
| 202     // if we know that resource points to a plug-in. | 202     // if we know that resource points to a plug-in. | 
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 477 { | 477 { | 
| 478     return fastHasAttribute(usemapAttr); | 478     return fastHasAttribute(usemapAttr); | 
| 479 } | 479 } | 
| 480 | 480 | 
| 481 bool HTMLObjectElement::useFallbackContent() const | 481 bool HTMLObjectElement::useFallbackContent() const | 
| 482 { | 482 { | 
| 483     return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; | 483     return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; | 
| 484 } | 484 } | 
| 485 | 485 | 
| 486 } | 486 } | 
| OLD | NEW | 
|---|