← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« 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-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/bindings/js/JSDOMWindowBase.cpp
24
24
#include "JSDOMWindowBase.h"
25
25
 
26
26
#include "CString.h"
 
27
#include "Chrome.h"
27
28
#include "Console.h"
28
29
#include "DOMWindow.h"
29
30
#include "Frame.h"
60
61
    addStaticGlobals(staticGlobals, sizeof(staticGlobals) / sizeof(GlobalPropertyInfo));
61
62
}
62
63
 
63
 
void JSDOMWindowBase::updateDocument(DOMWrapperWorld* world)
 
64
void JSDOMWindowBase::updateDocument()
64
65
{
65
66
    ASSERT(d()->impl->document());
66
67
    ExecState* exec = globalExec();
67
 
    EnterDOMWrapperWorld worldEntry(exec, world);
68
68
    symbolTablePutWithAttributes(Identifier(exec, "document"), toJS(exec, this, d()->impl->document()), DontDelete | ReadOnly);
69
69
}
70
70