| 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 268     ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); | 268     ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); | 
| 269     ASSERT(needsWidgetUpdate()); | 269     ASSERT(needsWidgetUpdate()); | 
| 270     setNeedsWidgetUpdate(false); | 270     setNeedsWidgetUpdate(false); | 
| 271     // FIXME: This should ASSERT isFinishedParsingChildren() instead. | 271     // FIXME: This should ASSERT isFinishedParsingChildren() instead. | 
| 272     if (!isFinishedParsingChildren()) | 272     if (!isFinishedParsingChildren()) | 
| 273         return; | 273         return; | 
| 274 | 274 | 
| 275     // FIXME: I'm not sure it's ever possible to get into updateWidget during a | 275     // FIXME: I'm not sure it's ever possible to get into updateWidget during a | 
| 276     // removal, but just in case we should avoid loading the frame to prevent | 276     // removal, but just in case we should avoid loading the frame to prevent | 
| 277     // security bugs. | 277     // security bugs. | 
| 278     if (!SubframeLoadingDisabler::canLoadFrame(this)) | 278     if (!SubframeLoadingDisabler::canLoadFrame(*this)) | 
| 279         return; | 279         return; | 
| 280 | 280 | 
| 281     String url = this->url(); | 281     String url = this->url(); | 
| 282     String serviceType = m_serviceType; | 282     String serviceType = m_serviceType; | 
| 283 | 283 | 
| 284     // FIXME: These should be joined into a PluginParameters class. | 284     // FIXME: These should be joined into a PluginParameters class. | 
| 285     Vector<String> paramNames; | 285     Vector<String> paramNames; | 
| 286     Vector<String> paramValues; | 286     Vector<String> paramValues; | 
| 287     parametersForPlugin(paramNames, paramValues, url, serviceType); | 287     parametersForPlugin(paramNames, paramValues, url, serviceType); | 
| 288 | 288 | 
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 505 { | 505 { | 
| 506     return FormAssociatedElement::form(); | 506     return FormAssociatedElement::form(); | 
| 507 } | 507 } | 
| 508 | 508 | 
| 509 bool HTMLObjectElement::isInteractiveContent() const | 509 bool HTMLObjectElement::isInteractiveContent() const | 
| 510 { | 510 { | 
| 511     return fastHasAttribute(usemapAttr); | 511     return fastHasAttribute(usemapAttr); | 
| 512 } | 512 } | 
| 513 | 513 | 
| 514 } | 514 } | 
| OLD | NEW | 
|---|