← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xulrunner-1.9/jaunty

« back to all changes in this revision

Viewing changes to mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2008-12-16 18:40:18 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20081216184018-j646ukfhzxnjynix
Tags: 1.9.0.5+nobinonly-0ubuntu1
* new security/stability upstream release v1.9.0.5 (FIREFOX_3_0_5_RELEASE)
  - see USN-690-1
* submit patches upstreamed:
  - bzXXX_plugin_for_mimetype_pref.patch => bz449188_att350098_plugin_for_mimetype_pref.patch
  - update debian/patches/series
* adjust XULFastLoad cache in response to interleaving landing of bmo
  #453545 and #462806
  - update debian/patches/bz368428_attachment_308130.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
302
302
        return NS_OK;
303
303
    }
304
304
 
305
 
    boundGlobal = boundDocument->GetScriptGlobalObject();
 
305
    boundGlobal = boundDocument->GetScopeObject();
306
306
  }
307
307
 
308
 
  // If we still don't have a 'boundGlobal', we're doomed. bug 95465.
309
 
  NS_ASSERTION(boundGlobal, "failed to get the nsIScriptGlobalObject. bug 95465?");
310
308
  if (!boundGlobal)
311
309
    return NS_OK;
312
310