← 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): 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/base/src/nsScriptLoader.cpp
102
102
  nsString mScriptText;              // Holds script for loaded scripts
103
103
  PRUint32 mJSVersion;
104
104
  nsCOMPtr<nsIURI> mURI;
 
105
  nsCOMPtr<nsIURI> mFinalURI;
105
106
  PRInt32 mLineNo;
106
107
};
107
108
 
564
565
 
565
566
  nsCAutoString url;
566
567
 
567
 
  if (aRequest->mURI) {
568
 
    rv = aRequest->mURI->GetSpec(url);
569
 
    if (NS_FAILED(rv)) {
570
 
      return rv;
571
 
    }
 
568
  nsIURI* uri = aRequest->mFinalURI ? aRequest->mFinalURI : aRequest->mURI;
 
569
  rv = uri->GetSpec(url);
 
570
  if (NS_FAILED(rv)) {
 
571
    return rv;
572
572
  }
573
573
 
574
574
  PRBool oldProcessingScriptTag = context->GetProcessingScriptTag();
843
843
  }
844
844
 
845
845
  nsCOMPtr<nsIChannel> channel = do_QueryInterface(req);
 
846
  NS_GetFinalChannelURI(channel, getter_AddRefs(aRequest->mFinalURI));
846
847
  if (aStringLen) {
847
848
    // Check the charset attribute to determine script charset.
848
849
    nsAutoString hintCharset;