Changeset 20686 for S60/trunk/WebKit

Timestamp:

04/03/07 13:50:30 (22 months ago)

Author:

spadma

Message:

2007-03-30 ligman <joseph.ligman@nokia.com>

Reviewed by Sachin.
DESC: When the request dispatcher does not define a loader

no pending transaction will exist, so set this undefined status
to KErrCancel so the callers don't wait indefinitely. Also, create, use,
and close the download property string when it's needed to avoid closing
the rstring after the string pool which it's using has somehow gone away.

http://bugs.webkit.org/show_bug.cgi?id=13232

• BrowserView/src/WebKitLoader.cpp: (CWebKitLoader::LoadPageL):
• ResourceLoader/inc/BaseTransaction.h:
• ResourceLoader/src/HttpTransaction.cpp: (CHttpTransaction::~CHttpTransaction): (CHttpTransaction::MHFRunL): (CHttpTransaction::MHFRunError): (CHttpTransaction::HandleGotResponseHeadersL):

Location:

S60/trunk/WebKit

Files:

• BrowserView/src/WebKitLoader.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• ResourceLoader/inc/BaseTransaction.h (modified) (1 diff)
• ResourceLoader/src/HttpTransaction.cpp (modified) (6 diffs)

S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp

@@ -284 +284 @@
             }
          }
+    else if ( status == KErrNone && !urlLoader )  //There is no pending transaction when the urlloader 
+        {                                         //does not exist. For lack of a better solution, setting 
+        status = KErrCancel;                      //the status to KErrCancel so the callers don't wait indefinitely.
+        }         
+
     return status;
     }

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-03-30  ligman  <joseph.ligman@nokia.com>
+
+        Reviewed by Sachin.
+        DESC: When the request dispatcher does not define a loader 
+              no pending transaction will exist, so set this undefined status 
+              to KErrCancel so the callers don't wait indefinitely. Also, create, use,
+              and close the download property string when it's needed to avoid closing
+              the rstring after the string pool which it's using has somehow gone away.        
+        http://bugs.webkit.org/show_bug.cgi?id=13232
+
+        * BrowserView/src/WebKitLoader.cpp:
+        (CWebKitLoader::LoadPageL):
+        * ResourceLoader/inc/BaseTransaction.h:
+        * ResourceLoader/src/HttpTransaction.cpp:
+        (CHttpTransaction::~CHttpTransaction):
+        (CHttpTransaction::MHFRunL):
+        (CHttpTransaction::MHFRunError):
+        (CHttpTransaction::HandleGotResponseHeadersL):
+        
 rathnasa, reviewed by Yongjun.
  DESC: Reset the iDownloadContent flag properly.

S60/trunk/WebKit/ResourceLoader/inc/BaseTransaction.h

@@ -484 +484 @@
       // != -1 if donwloadmanager has this transaction
       TInt32            iDownloadId;
-      // downloadmanager's property
-      RStringF          iDownloadPropStr;
       //
       CPeriodic*        iSubmitTimer;   // owned

S60/trunk/WebKit/ResourceLoader/src/HttpTransaction.cpp

@@ -213 +213 @@
     delete iPBuf;
     dead = ETrue;
-  
-  if (iCacheSupply)   
-    {
-    iCacheSupply->CloseRequest(); 
-    }
-    
+
+    if (iCacheSupply)   
+        {
+        iCacheSupply->CloseRequest(); 
+        }
+
     if( iDownloadId == -1 && iTrans )
         {
-    iDownloadPropStr.Close();           
         // close transaction
         iTrans->Close();
         delete iTrans; 
         }
-        
+
     delete iCacheSupply;
-  delete iPostDataSupplier;
+    delete iPostDataSupplier;
     }
 
@@ -298 +297 @@
         {
         THTTPHdrVal callback;
-        RStringPool strPool = aTransaction.Session().StringPool();
+        RStringF downloadPropStr = aTransaction.Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) );
         RHTTPTransactionPropertySet propSet = aTransaction.PropertySet();
-
         // this is a transaction, already forwarded to download manager
-        if( propSet.Property( iDownloadPropStr, callback ) )
+        if( propSet.Property( downloadPropStr, callback ) )
             {
             MHTTPTransactionCallback* callbackPtr = REINTERPRET_CAST( 
@@ -317 +315 @@
             __ASSERT_DEBUG( EFalse, TLoaderUtils::PanicLoader( KErrGeneral ) );
             }
+        downloadPropStr.Close();            
         }
     else
@@ -449 +448 @@
     if( iDownloadId != -1 )
         {
-        THTTPHdrVal callback;
+        
+        // save downloadmanager callback property id
+        RStringF downloadPropStr = aTransaction.Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) );
+        
+        THTTPHdrVal callback;        
         RHTTPTransactionPropertySet propSet = aTransaction.PropertySet();
-
-        if( propSet.Property( iDownloadPropStr, callback ) )
+        if( propSet.Property( downloadPropStr, callback ) )
             {
             MHTTPTransactionCallback* callbackPtr = REINTERPRET_CAST( 
@@ -467 +469 @@
             __ASSERT_DEBUG( EFalse, TLoaderUtils::PanicLoader( KErrGeneral ) );
             }
+            
+        downloadPropStr.Close();
+        
         }
     else
@@ -686 +691 @@
             // close cache item as it is handled by the download mgr
             iCacheSupply->CloseRequest();
-      }
-            // save downloadmanager callback property id
-            iDownloadPropStr = iTrans->Session().StringPool().OpenFStringL( _L8( "TransactionCallback" ) );
+      }            
             // turn off pipelining
             CLoaderContainer* loaderContainer = static_cast<CLoaderContainer*>