← Back to branch summary

~ubuntu-branches/ubuntu/karmic/webkit/karmic-proposed

« back to all changes in this revision

Viewing changes to WebCore/html/HTMLAppletElement.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-05-15 18:30:58 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090515183058-50q5exjo9b1kxy9s
Tags: 1.1.7-1
http://bugs.debian.org/526683
* New upstream release
* debian/libwebkit-1.0-2.symbols:
- updated with the new symbols in 1.1.7
* debian/libwebkit-dev.install, debian/libwebkit-dev.links,
  debian/rules:
- Build, and ship gtk-doc documentation (Closes: #526683)
* debian/copyright:
- updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/html/HTMLAppletElement.cpp
27
27
#include "Frame.h"
28
28
#include "HTMLDocument.h"
29
29
#include "HTMLNames.h"
 
30
#include "MappedAttribute.h"
30
31
#include "RenderApplet.h"
31
32
#include "RenderInline.h"
32
33
#include "Settings.h"
119
120
        const AtomicString& codeBase = getAttribute(codebaseAttr);
120
121
        if (!codeBase.isNull())
121
122
            args.set("codeBase", codeBase);
122
 
        else
123
 
            args.set("codeBase", document()->baseURL().baseAsString());
124
123
 
125
124
        const AtomicString& name = getAttribute(document()->isHTMLDocument() ? nameAttr : idAttr);
126
125
        if (!name.isNull())