diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-11 09:43:24 +0200 |
| commit | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (patch) | |
| tree | 87f4fd2c7b38db320079a5de8877890d2ca3c485 /Source/WebCore/html/HTMLEmbedElement.cpp | |
| parent | 2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (diff) | |
| download | qtwebkit-1b914638db989aaa98631a1c1e02c7b2d44805d8.tar.gz | |
Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)
New snapshot to include QDeclarative* -> QQml* build fixes
Diffstat (limited to 'Source/WebCore/html/HTMLEmbedElement.cpp')
| -rw-r--r-- | Source/WebCore/html/HTMLEmbedElement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/html/HTMLEmbedElement.cpp b/Source/WebCore/html/HTMLEmbedElement.cpp index 0fc0b17a1..ffaabcd2a 100644 --- a/Source/WebCore/html/HTMLEmbedElement.cpp +++ b/Source/WebCore/html/HTMLEmbedElement.cpp @@ -132,7 +132,7 @@ void HTMLEmbedElement::parametersForPlugin(Vector<String>& paramNames, Vector<St // moved down into HTMLPluginImageElement.cpp void HTMLEmbedElement::updateWidget(PluginCreationOption pluginCreationOption) { - ASSERT(!renderEmbeddedObject()->pluginCrashedOrWasMissing()); + ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); ASSERT(needsWidgetUpdate()); setNeedsWidgetUpdate(false); @@ -208,9 +208,9 @@ bool HTMLEmbedElement::rendererIsNeeded(const NodeRenderingContext& context) return HTMLPlugInImageElement::rendererIsNeeded(context); } -bool HTMLEmbedElement::isURLAttribute(Attribute* attr) const +bool HTMLEmbedElement::isURLAttribute(const Attribute& attribute) const { - return attr->name() == srcAttr || HTMLPlugInImageElement::isURLAttribute(attr); + return attribute.name() == srcAttr || HTMLPlugInImageElement::isURLAttribute(attribute); } const QualifiedName& HTMLEmbedElement::imageSourceAttributeName() const |