Changeset 17790 in webkit

Timestamp:

Nov 15, 2006 12:06: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/trunk/WebKit

Files:

• BrowserControl/src/WKWmlInterfaceImpl.cpp (modified) (2 diffs)
• BrowserView/inc/WebKitLoader.h (modified) (1 diff)
• BrowserView/src/WebKitLoader.cpp (modified) (2 diffs)
• BrowserView/src/webkitbridge.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

S60/trunk/WebKit/BrowserControl/src/WKWmlInterfaceImpl.cpp

@@ -215 +215 @@
 // -----------------------------------------------------------------------------
 void CWKWmlInterfaceImpl::WKWmlLoadUrlL( const TDesC& aURL, TDesC& aRereferrer, TInt /*aApId*/,
-                               TBrCtlDefs::TBrCtlCacheMode /*aBrCtlCacheMode*/)
+                               TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode)
 {
  //iBrCtl.LoadUrlL( aURL, aRereferrer, aApId, aBrCtlCacheMode );
@@ -225 +225 @@
  CWebKitLoader&  loader        = webkitBridge.Loader();
 
-  loader.LoadPageL( aURL, aRereferrer, true, true, KNullDesC, EEventNull );
+  loader.LoadPageL( aURL, aRereferrer, aBrCtlCacheMode, true, KNullDesC, EEventNull );
 }
 

S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h

@@ -128 +128 @@
         * @return void
         */
-        void LoadPageL( const TDesC& aURL, const TDesC& aRereferrer, TBool aReload,
+        void LoadPageL( const TDesC& aURL, const TDesC& aRereferrer, TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode,
                       TBool aOnLoad, const TDesC& aTarget, TEventCode aTriggeringEvent );
 

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

@@ -294 +294 @@
     const TDesC& aURL,
     const TDesC& aRereferrer,
-    TBool aReload,
+    TBrCtlDefs::TBrCtlCacheMode aBrCtlCacheMode,
     TBool /*aOnLoad*/,
     const TDesC& /*aTarget*/,
@@ -309 +309 @@
         }
     urlRequestInfo->SetRefererUrlL( aRereferrer );
-    urlRequestInfo->SetCacheMode( aReload ? TBrCtlDefs::ECacheModeNoCache : TBrCtlDefs::ECacheModeNormal );
+    urlRequestInfo->SetCacheMode( aBrCtlCacheMode );
     urlRequestInfo->SetClientResolvesUrl( iWebKitControl->BrCtl().Capabilities() & TBrCtlDefs::ECapabilityClientNotifyURL );
 

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

@@ -299 +299 @@
         if( aUrl.Length() )
             {
-            TRAP_IGNORE( view->MainFrame().WebKitBridge().Loader().LoadPageL( aUrl, iWebCoreBridge->Referrer(), ETrue,
+            TRAP_IGNORE( view->MainFrame().WebKitBridge().Loader().LoadPageL( aUrl, iWebCoreBridge->Referrer(), TBrCtlDefs::ECacheModeNormal,
                 aUserInitiated, KNullDesC, EEventNull) );
             }
@@ -470 +470 @@
         TRAP( err,
             newFrame->SetNameL(aFrameName);
-            newFrame->WebKitBridge().Loader().LoadPageL( aUrl, newFrame->WebKitView().WebKitControl().CacheMode() );
+            newFrame->WebKitBridge().Loader().LoadPageL( aUrl, aReferrer, iFrame->WebKitView().WebKitControl().CacheMode(), EFalse, KNullDesC(), EEventNull );
             )
         return bridge;
@@ -1227 +1227 @@
         if ( load )
             {
+            TBrCtlDefs::TBrCtlCacheMode cacheMode = aReload ? TBrCtlDefs::ECacheModeNoCache:TBrCtlDefs::ECacheModeNormal;
             // reset cache mode, back to normal.
-            targetFrame->WebKitView().WebKitControl().SetCacheMode( TBrCtlDefs::ECacheModeNormal );
-            targetFrame->WebKitBridge().Loader().LoadPageL( aURL, hideReferrer?KNullDesC:aReferrer, aReload,
+            targetFrame->WebKitView().WebKitControl().SetCacheMode( cacheMode);
+            targetFrame->WebKitBridge().Loader().LoadPageL( aURL, hideReferrer?KNullDesC:aReferrer, cacheMode,
                         aOnLoad, aTarget, aTriggeringEvent );
             }

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+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):
+
 2006-11-10  yadavall  <sriram.yadavalli@nokia.com>