← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kde4libs/lucid-updates

« back to all changes in this revision

Viewing changes to khtml/misc/loader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-01-19 20:32:41 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20100119203241-6qlz4p6emiawose6
Tags: 4:4.3.95-0ubuntu1
* New upstream release candidate:
  - Remove kubuntu_71_knewstuff_crashes.diff, applied upstream
  - Remove kubuntu_72_popupapplet_crash_fix.diff, applied upstream
  - Refresh kubuntu_70_dbusmenu.diff
  - Bump RUNTIME_DEPS value in debian/rules to 4.3.90
  - Update .install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/misc/loader.cpp
1152
1152
    fprintf(stderr, "PRELOADING %s\n", resource->url().string().toLatin1().data());
1153
1153
#endif
1154
1154
}
1155
 
 
 
1155
 
1156
1156
void DocLoader::clearPreloads()
1157
1157
{
1158
1158
    printPreloadStats();
1184
1184
            fprintf(stderr,"HIT COMPLETE PRELOAD %s\n", res->url().string().toLatin1().data());
1185
1185
        else if (res->preloadResult() == CachedObject::PreloadReferencedWhileLoading)
1186
1186
            fprintf(stderr,"HIT LOADING PRELOAD %s\n", res->url().string().toLatin1().data());
1187
 
        
 
1187
 
1188
1188
        if (res->type() == CachedObject::Script) {
1189
1189
            scripts++;
1190
1190
            if (res->preloadResult() < CachedObject::PreloadReferencedWhileLoading)
1258
1258
      CachedSound* s = Cache::requestObject<CachedSound, CachedObject::Sound>( this, fullURL, 0 );
1259
1259
      return s;
1260
1260
}
1261
 
            
 
1261
 
1262
1262
CachedFont *DocLoader::requestFont( const DOM::DOMString &url )
1263
1263
{
1264
1264
    DOCLOADER_SECCHECK(true);
1429
1429
    if (!r)
1430
1430
        return;
1431
1431
    CachedObject *o = r->object;
1432
 
    
 
1432
 
1433
1433
    // Mozilla plain ignores any  mimetype that doesn't have / in it, and handles it as "",
1434
1434
    // including when being picky about mimetypes. Match that for better compatibility with broken servers.
1435
1435
    if (s.contains('/'))
1467
1467
      r->object->setExpireDate( expireDate );
1468
1468
 
1469
1469
      if ( r->object->type() == CachedObject::Image ) {
1470
 
          QString fn = j->queryMetaData("content-disposition");
 
1470
          QString fn = j->queryMetaData("content-disposition-filename");
1471
1471
          static_cast<CachedImage*>( r->object )->setSuggestedFilename(fn);
1472
1472
#ifdef IMAGE_TITLES
1473
1473
          static_cast<CachedImage*>( r->object )->setSuggestedTitle(fn);