summaryrefslogtreecommitdiff
path: root/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp')
-rw-r--r--src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp
index 9d7ab6a6b1..13dd911727 100644
--- a/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp
+++ b/src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp
@@ -27,6 +27,7 @@
#include "Frame.h"
#include "HTMLDocument.h"
#include "HTMLNames.h"
+#include "MappedAttribute.h"
#include "RenderApplet.h"
#include "RenderInline.h"
#include "Settings.h"
@@ -99,9 +100,12 @@ void HTMLAppletElement::removedFromDocument()
HTMLPlugInElement::removedFromDocument();
}
-bool HTMLAppletElement::rendererIsNeeded(RenderStyle*)
+bool HTMLAppletElement::rendererIsNeeded(RenderStyle* style)
{
- return !getAttribute(codeAttr).isNull();
+ if (getAttribute(codeAttr).isNull())
+ return false;
+
+ return HTMLPlugInElement::rendererIsNeeded(style);
}
RenderObject* HTMLAppletElement::createRenderer(RenderArena*, RenderStyle* style)
@@ -112,9 +116,11 @@ RenderObject* HTMLAppletElement::createRenderer(RenderArena*, RenderStyle* style
HashMap<String, String> args;
args.set("code", getAttribute(codeAttr));
+
const AtomicString& codeBase = getAttribute(codebaseAttr);
- if(!codeBase.isNull())
+ if (!codeBase.isNull())
args.set("codeBase", codeBase);
+
const AtomicString& name = getAttribute(document()->isHTMLDocument() ? nameAttr : idAttr);
if (!name.isNull())
args.set("name", name);