← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/bindings/js/JSDOMWindowBase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-02-04 19:30:57 UTC
  • mfrom: (1.2.8 upstream) (4.3.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100204193057-d3018lm1fipb0703
* New upstream release
* debian/copyright:
- Updated with changes since 1.1.19.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/bindings/js/JSDOMWindowBase.cpp
41
41
 
42
42
namespace WebCore {
43
43
 
44
 
const ClassInfo JSDOMWindowBase::s_info = { "Window", 0, 0, 0 };
 
44
const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, 0 };
45
45
 
46
46
JSDOMWindowBase::JSDOMWindowBaseData::JSDOMWindowBaseData(PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
47
47
    : JSDOMGlobalObjectData(shell->world(), destroyJSDOMWindowBaseData)
76
76
String JSDOMWindowBase::crossDomainAccessErrorMessage(const JSGlobalObject* other) const
77
77
{
78
78
    KURL originURL = asJSDOMWindow(other)->impl()->url();
79
 
    KURL targetURL = impl()->frame()->document()->url();
 
79
    KURL targetURL = d()->shell->window()->impl()->url();
80
80
    if (originURL.isNull() || targetURL.isNull())
81
81
        return String();
82
82
 
171
171
    delete static_cast<JSDOMWindowBaseData*>(jsDOMWindowBaseData);
172
172
}
173
173
 
174
 
// JSDOMGlobalObject* is ignored, accesing a window in any context will
 
174
// JSDOMGlobalObject* is ignored, accessing a window in any context will
175
175
// use that DOMWindow's prototype chain.
176
176
JSValue toJS(ExecState* exec, JSDOMGlobalObject*, DOMWindow* domWindow)
177
177
{