Changeset 20726 for S60/trunk/WebKit

Show
Ignore:
Timestamp:
04/05/07 12:55:19 (22 months ago)
Author:
spadma
Message:

2007-04-04 ligman <joseph.ligman@nokia.com>

Reviewed by Sachin.
DESC: Setting status to KErrCancel when the request dispatcher does not define a loader causes a problem for the history stack, reverting to previous.
http://bugs.webkit.org/show_bug.cgi?id=13232

  • BrowserView/src/WebKitLoader.cpp: (CWebKitLoader::LoadPageL):
Location:
S60/trunk/WebKit
Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r20686 r20726  
    284284            } 
    285285         } 
    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         }          
    290286 
    291287    return status; 

  • S60/trunk/WebKit/ChangeLog

    r20721 r20726  
     12007-04-04  ligman  <joseph.ligman@nokia.com> 
     2 
     3        Reviewed by Sachin. 
     4        DESC: Setting status to KErrCancel when the request dispatcher does not define a loader causes a problem for the history stack, reverting to previous. 
     5        http://bugs.webkit.org/show_bug.cgi?id=13232 
     6 
     7        * BrowserView/src/WebKitLoader.cpp: 
     8        (CWebKitLoader::LoadPageL): 
     9 
    110hongzhao, reviewed by yongjun.zhang@nokia.com 
    211 DESC: [S60]Animated images with DRM content won't be displayed in Browser in 3.2