Changeset 20686 in webkit
- Timestamp:
- Apr 3, 2007 1:50:30 PM (17 years ago)
- Location:
- S60/trunk/WebKit
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp
r20408 r20686 284 284 } 285 285 } 286 else if ( status == KErrNone && !urlLoader ) //There is no pending transaction when the urlloader 287 { //does not exist. For lack of a better solution, setting 288 status = KErrCancel; //the status to KErrCancel so the callers don't wait indefinitely. 289 } 290 286 291 return status; 287 292 } -
S60/trunk/WebKit/ChangeLog
r20682 r20686 1 2007-03-30 ligman <joseph.ligman@nokia.com> 2 3 Reviewed by Sachin. 4 DESC: When the request dispatcher does not define a loader 5 no pending transaction will exist, so set this undefined status 6 to KErrCancel so the callers don't wait indefinitely. Also, create, use, 7 and close the download property string when it's needed to avoid closing 8 the rstring after the string pool which it's using has somehow gone away. 9 http://bugs.webkit.org/show_bug.cgi?id=13232 10 11 * BrowserView/src/WebKitLoader.cpp: 12 (CWebKitLoader::LoadPageL): 13 * ResourceLoader/inc/BaseTransaction.h: 14 * ResourceLoader/src/HttpTransaction.cpp: 15 (CHttpTransaction::~CHttpTransaction): 16 (CHttpTransaction::MHFRunL): 17 (CHttpTransaction::MHFRunError): 18 (CHttpTransaction::HandleGotResponseHeadersL): 19 1 20 rathnasa, reviewed by Yongjun. 2 21 DESC: Reset the iDownloadContent flag properly. -
S60/trunk/WebKit/ResourceLoader/inc/BaseTransaction.h
r19915 r20686 484 484 // != -1 if donwloadmanager has this transaction 485 485 TInt32 iDownloadId; 486 // downloadmanager's property487 RStringF iDownloadPropStr;488 486 // 489 487 CPeriodic* iSubmitTimer; // owned -
S60/trunk/WebKit/ResourceLoader/src/HttpTransaction.cpp
r20659 r20686 213 213 delete iPBuf; 214 214 dead = ETrue; 215 216 if (iCacheSupply)217 {218 iCacheSupply->CloseRequest();219 }220 215 216 if (iCacheSupply) 217 { 218 iCacheSupply->CloseRequest(); 219 } 220 221 221 if( iDownloadId == -1 && iTrans ) 222 222 { 223 iDownloadPropStr.Close();224 223 // close transaction 225 224 iTrans->Close(); 226 225 delete iTrans; 227 226 } 228 227 229 228 delete iCacheSupply; 230 delete iPostDataSupplier;229 delete iPostDataSupplier; 231 230 } 232 231 … … 298 297 { 299 298 THTTPHdrVal callback; 300 RString Pool strPool = aTransaction.Session().StringPool();299 RStringF downloadPropStr = aTransaction.Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) ); 301 300 RHTTPTransactionPropertySet propSet = aTransaction.PropertySet(); 302 303 301 // this is a transaction, already forwarded to download manager 304 if( propSet.Property( iDownloadPropStr, callback ) )302 if( propSet.Property( downloadPropStr, callback ) ) 305 303 { 306 304 MHTTPTransactionCallback* callbackPtr = REINTERPRET_CAST( … … 317 315 __ASSERT_DEBUG( EFalse, TLoaderUtils::PanicLoader( KErrGeneral ) ); 318 316 } 317 downloadPropStr.Close(); 319 318 } 320 319 else … … 449 448 if( iDownloadId != -1 ) 450 449 { 451 THTTPHdrVal callback; 450 451 // save downloadmanager callback property id 452 RStringF downloadPropStr = aTransaction.Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) ); 453 454 THTTPHdrVal callback; 452 455 RHTTPTransactionPropertySet propSet = aTransaction.PropertySet(); 453 454 if( propSet.Property( iDownloadPropStr, callback ) ) 456 if( propSet.Property( downloadPropStr, callback ) ) 455 457 { 456 458 MHTTPTransactionCallback* callbackPtr = REINTERPRET_CAST( … … 467 469 __ASSERT_DEBUG( EFalse, TLoaderUtils::PanicLoader( KErrGeneral ) ); 468 470 } 471 472 downloadPropStr.Close(); 473 469 474 } 470 475 else … … 686 691 // close cache item as it is handled by the download mgr 687 692 iCacheSupply->CloseRequest(); 688 } 689 // save downloadmanager callback property id 690 iDownloadPropStr = iTrans->Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) ); 693 } 691 694 // turn off pipelining 692 695 CLoaderContainer* loaderContainer = static_cast<CLoaderContainer*>
Note: See TracChangeset
for help on using the changeset viewer.