Changeset 17791 in webkit


Ignore:
Timestamp:
Nov 15, 2006 12:09:58 PM (17 years ago)
Author:
spadma
Message:

2006-11-15 spadma <Sachin.Padma@nokia.com>

Reviewed by Zalan.
DESC: [S60] Browser: The phone can't login on the html web page
http://bugs.webkit.org/show_bug.cgi?id=11602

  • BrowserControl/src/WKWmlInterfaceImpl.cpp: (CWKWmlInterfaceImpl::WKWmlLoadUrlL):
  • BrowserView/inc/WebKitLoader.h:
  • BrowserView/src/WebKitLoader.cpp: (CWebKitLoader::LoadPageL):
  • BrowserView/src/webkitbridge.cpp: (CWebKitBridge::CreateWindowWithUrl): (CWebKitBridge::CreateChildFrameNamed): (CWebKitBridge::LoadUrlL):
Location:
S60/branches/3.1m/WebKit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • S60/branches/3.1m/WebKit/BrowserControl/src/WKWmlInterfaceImpl.cpp

    r15509 r17791  
    215215// -----------------------------------------------------------------------------
    216216void CWKWmlInterfaceImpl::WKWmlLoadUrlL( const TDesC& aURL, TDesC& aRereferrer, TInt /*aApId*/,
    217                                TBrCtlDefs::TBrCtlCacheMode /*aBrCtlCacheMode*/)
     217                               TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode)
    218218{
    219219 //iBrCtl.LoadUrlL( aURL, aRereferrer, aApId, aBrCtlCacheMode );
     
    225225 CWebKitLoader&  loader        = webkitBridge.Loader();
    226226
    227   loader.LoadPageL( aURL, aRereferrer, true, true, KNullDesC, EEventNull );
     227  loader.LoadPageL( aURL, aRereferrer, aBrCtlCacheMode, true, KNullDesC, EEventNull );
    228228}
    229229
  • S60/branches/3.1m/WebKit/BrowserView/inc/WebKitLoader.h

    r16644 r17791  
    128128        * @return void
    129129        */
    130         void LoadPageL( const TDesC& aURL, const TDesC& aRereferrer, TBool aReload,
     130        void LoadPageL( const TDesC& aURL, const TDesC& aRereferrer, TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode,
    131131                      TBool aOnLoad, const TDesC& aTarget, TEventCode aTriggeringEvent );
    132132
  • S60/branches/3.1m/WebKit/BrowserView/src/WebKitLoader.cpp

    r17339 r17791  
    294294    const TDesC& aURL,
    295295    const TDesC& aRereferrer,
    296     TBool aReload,
     296    TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode,
    297297    TBool /*aOnLoad*/,
    298298    const TDesC& /*aTarget*/,
     
    305305    urlRequestInfo->SetUrlL( aURL );
    306306    urlRequestInfo->SetRefererUrlL( aRereferrer );
    307     urlRequestInfo->SetCacheMode( aReload ? TBrCtlDefs::ECacheModeNoCache : TBrCtlDefs::ECacheModeNormal );
     307    urlRequestInfo->SetCacheMode( aBrCtlCacheMode );
    308308    urlRequestInfo->SetClientResolvesUrl( iWebKitControl->BrCtl().Capabilities() & TBrCtlDefs::ECapabilityClientNotifyURL );
    309309
  • S60/branches/3.1m/WebKit/BrowserView/src/webkitbridge.cpp

    r16644 r17791  
    296296        if( aUrl.Length() )
    297297            {
    298             TRAP_IGNORE( view->MainFrame().WebKitBridge().Loader().LoadPageL( aUrl, iWebCoreBridge->Referrer(), ETrue,
     298            TRAP_IGNORE( view->MainFrame().WebKitBridge().Loader().LoadPageL( aUrl, iWebCoreBridge->Referrer(), TBrCtlDefs::ECacheModeNormal,
    299299                aUserInitiated, KNullDesC, EEventNull) );
    300300            }
     
    467467        TRAP( err,
    468468            newFrame->SetNameL(aFrameName);
    469             newFrame->WebKitBridge().Loader().LoadPageL( aUrl, newFrame->WebKitView().WebKitControl().CacheMode() );
     469            newFrame->WebKitBridge().Loader().LoadPageL( aUrl, aReferrer, iFrame->WebKitView().WebKitControl().CacheMode(), EFalse, KNullDesC(), EEventNull );
    470470            )
    471471        return bridge;
     
    12231223        if ( load )
    12241224            {
     1225            TBrCtlDefs::TBrCtlCacheMode cacheMode = aReload ? TBrCtlDefs::ECacheModeNoCache:TBrCtlDefs::ECacheModeNormal;
    12251226            // reset cache mode, back to normal.
    1226             targetFrame->WebKitView().WebKitControl().SetCacheMode( TBrCtlDefs::ECacheModeNormal );
    1227             targetFrame->WebKitBridge().Loader().LoadPageL( aURL, hideReferrer?KNullDesC:aReferrer, aReload,
     1227            targetFrame->WebKitView().WebKitControl().SetCacheMode( cacheMode);
     1228            targetFrame->WebKitBridge().Loader().LoadPageL( aURL, hideReferrer?KNullDesC:aReferrer, cacheMode,
    12281229                        aOnLoad, aTarget, aTriggeringEvent );
    12291230            }
  • S60/branches/3.1m/WebKit/ChangeLog

    r17757 r17791  
     12006-11-15  spadma  <Sachin.Padma@nokia.com>
     2
     3        Reviewed by Zalan.
     4        DESC: [S60] Browser: The phone can't login on the html web page
     5        http://bugs.webkit.org/show_bug.cgi?id=11602
     6
     7        * BrowserControl/src/WKWmlInterfaceImpl.cpp:
     8        (CWKWmlInterfaceImpl::WKWmlLoadUrlL):
     9        * BrowserView/inc/WebKitLoader.h:
     10        * BrowserView/src/WebKitLoader.cpp:
     11        (CWebKitLoader::LoadPageL):
     12        * BrowserView/src/webkitbridge.cpp:
     13        (CWebKitBridge::CreateWindowWithUrl):
     14        (CWebKitBridge::CreateChildFrameNamed):
     15        (CWebKitBridge::LoadUrlL):
     16
    1172006-11-10  yadavall  <sriram.yadavalli@nokia.com>
    218
Note: See TracChangeset for help on using the changeset viewer.