← Back to branch summary

~ubuntu-branches/ubuntu/precise/xulrunner-1.9/precise

« back to all changes in this revision

Viewing changes to mozilla/content/base/src/nsScriptLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin, Alexander Sack, Fabien Tassin
  • Date: 2008-06-10 12:51:56 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20080610125156-3okw8z9vx2kzbe18
Tags: 1.9+nobinonly-0ubuntu1
https://launchpad.net/bugs/237690
https://launchpad.net/bugs/236266
https://launchpad.net/bugs/236984
* New upstream release 1.9 (LP: #237690)

[ Alexander Sack <asac@ubuntu.com> ]
* Fix LP: #236266 - "Build Failure on HPPA architecture" by applying patch
  from bugzilla https://bugzilla.mozilla.org/show_bug.cgi?id=436133
  - add debian/patches/bz436133_att322801.patch
  - update debian/patches/series
* drop image scaling patches - previously applied and finally superseeded
  upstream to fix Vista bug https://bugzilla.mozilla.org/show_bug.cgi?id=434157
  - delete debian/patches/bz394103_dont_scale_images.patch
  - delete debian/patches/bz394103_scale_images_for_192+dpi.patch
  - update debian/patches/series
* update patch for Bug 368428 – "XUL FastLoad cache corruption when
  application running"; fix deadlock by using "antiLockZipGrip".
  (LP: #236984)
  - update debian/patches/bz368428_attachment_308130.patch

[ Fabien Tassin <fta@sofaraway.org> ]
* drop synchronous = NORMAL patch, now applied upstream
  - delete debian/patches/bz421482_att320806_synchronous_NORMAL_for_storage_connections.patch
  - update debian/patches/series
* Fix regression with venkman accessing chrome by applying patch
  from bugzilla https://bugzilla.mozilla.org/show_bug.cgi?id=428848
  - add debian/patches/bz428848_att319775_fix_venkman_chrome_access.patch
  - update debian/patches/series
* Touch .autoreg in postinst with the exact GRE version as the glob is
  causing troubles when multiple xulrunner are installed
  - update debian/xulrunner-1.9.postinst
  - update debian/xulrunner-1.9-gnome-support.postinst
* Don't install a libsqlite3.so.0 symlink if we are using system sqlite
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/content/base/src/nsScriptLoader.cpp
537
537
    return NS_ERROR_FAILURE;
538
538
  }
539
539
 
540
 
  nsIScriptGlobalObject *globalObject = mDocument->GetScriptGlobalObject();
541
 
  NS_ENSURE_TRUE(globalObject, NS_ERROR_FAILURE);
 
540
  nsPIDOMWindow *pwin = mDocument->GetInnerWindow();
 
541
  if (!pwin || !pwin->IsInnerWindow()) {
 
542
    return NS_ERROR_FAILURE;
 
543
  }
 
544
  nsCOMPtr<nsIScriptGlobalObject> globalObject = do_QueryInterface(pwin);
 
545
  NS_ASSERTION(globalObject, "windows must be global objects");
542
546
 
543
547
  // Get the script-type to be used by this element.
544
548
  nsCOMPtr<nsIContent> scriptContent(do_QueryInterface(aRequest->mElement));