| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 // the updating of certain attributes should bring about "redetermination" | 237 // the updating of certain attributes should bring about "redetermination" |
| 238 // of what the element contains. | 238 // of what the element contains. |
| 239 bool needsInvalidation; | 239 bool needsInvalidation; |
| 240 if (name == typeAttr) { | 240 if (name == typeAttr) { |
| 241 needsInvalidation = !fastHasAttribute(classidAttr) && !fastHasAttribute(
dataAttr); | 241 needsInvalidation = !fastHasAttribute(classidAttr) && !fastHasAttribute(
dataAttr); |
| 242 } else if (name == dataAttr) { | 242 } else if (name == dataAttr) { |
| 243 needsInvalidation = !fastHasAttribute(classidAttr); | 243 needsInvalidation = !fastHasAttribute(classidAttr); |
| 244 } else if (name == classidAttr) { | 244 } else if (name == classidAttr) { |
| 245 needsInvalidation = true; | 245 needsInvalidation = true; |
| 246 } else { | 246 } else { |
| 247 ASSERT_NOT_REACHED(); | 247 NOTREACHED(); |
| 248 needsInvalidation = false; | 248 needsInvalidation = false; |
| 249 } | 249 } |
| 250 setNeedsWidgetUpdate(true); | 250 setNeedsWidgetUpdate(true); |
| 251 if (needsInvalidation) | 251 if (needsInvalidation) |
| 252 lazyReattachIfNeeded(); | 252 lazyReattachIfNeeded(); |
| 253 } | 253 } |
| 254 | 254 |
| 255 // TODO(schenney): crbug.com/572908 This should be unified with HTMLEmbedElement
::updateWidget and | 255 // TODO(schenney): crbug.com/572908 This should be unified with HTMLEmbedElement
::updateWidget and |
| 256 // moved down into HTMLPluginElement.cpp | 256 // moved down into HTMLPluginElement.cpp |
| 257 void HTMLObjectElement::updateWidgetInternal() | 257 void HTMLObjectElement::updateWidgetInternal() |
| 258 { | 258 { |
| 259 ASSERT(!layoutEmbeddedItem().showsUnavailablePluginIndicator()); | 259 DCHECK(!layoutEmbeddedItem().showsUnavailablePluginIndicator()); |
| 260 ASSERT(needsWidgetUpdate()); | 260 DCHECK(needsWidgetUpdate()); |
| 261 setNeedsWidgetUpdate(false); | 261 setNeedsWidgetUpdate(false); |
| 262 // TODO(schenney): crbug.com/572908 This should ASSERT isFinishedParsingChil
dren() instead. | 262 // TODO(schenney): crbug.com/572908 This should ASSERT isFinishedParsingChil
dren() instead. |
| 263 if (!isFinishedParsingChildren()) { | 263 if (!isFinishedParsingChildren()) { |
| 264 dispatchErrorEvent(); | 264 dispatchErrorEvent(); |
| 265 return; | 265 return; |
| 266 } | 266 } |
| 267 | 267 |
| 268 // TODO(schenney): crbug.com/572908 I'm not sure it's ever possible to get i
nto updateWidget during a | 268 // TODO(schenney): crbug.com/572908 I'm not sure it's ever possible to get i
nto updateWidget during a |
| 269 // removal, but just in case we should avoid loading the frame to prevent se
curity bugs. | 269 // removal, but just in case we should avoid loading the frame to prevent se
curity bugs. |
| 270 if (!SubframeLoadingDisabler::canLoadFrame(*this)) { | 270 if (!SubframeLoadingDisabler::canLoadFrame(*this)) { |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 { | 425 { |
| 426 return fastHasAttribute(usemapAttr); | 426 return fastHasAttribute(usemapAttr); |
| 427 } | 427 } |
| 428 | 428 |
| 429 bool HTMLObjectElement::useFallbackContent() const | 429 bool HTMLObjectElement::useFallbackContent() const |
| 430 { | 430 { |
| 431 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; | 431 return HTMLPlugInElement::useFallbackContent() || m_useFallbackContent; |
| 432 } | 432 } |
| 433 | 433 |
| 434 } // namespace blink | 434 } // namespace blink |
| OLD | NEW |