diff options
Diffstat (limited to 'WebCore/html/HTMLAppletElement.cpp')
-rw-r--r-- | WebCore/html/HTMLAppletElement.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/WebCore/html/HTMLAppletElement.cpp b/WebCore/html/HTMLAppletElement.cpp index 9d7ab6a..de8e1cf 100644 --- a/WebCore/html/HTMLAppletElement.cpp +++ b/WebCore/html/HTMLAppletElement.cpp @@ -99,9 +99,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 +115,13 @@ 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); + else + args.set("codeBase", document()->baseURL().baseAsString()); + const AtomicString& name = getAttribute(document()->isHTMLDocument() ? nameAttr : idAttr); if (!name.isNull()) args.set("name", name); |