Changeset 17909 in webkit

Timestamp:

Nov 28, 2006 2:05:05 PM (17 years ago)

Author:

spadma

Message:

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

Reviewed by Yongjun.
DESC: [S60] browser fails to run the script when the page saved
​http://bugs.webkit.org/show_bug.cgi?id=11706

• BrowserView/src/WebKitControl.cpp: (CWebKitControl::LoadSavedPageL):

Location:

S60/trunk/WebKit

Files:

• BrowserView/src/WebKitControl.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -898 +898 @@
     CDataLoadInfo* dataloadInfo = CDataLoadInfo::NewL( dataLoadSupplier, ETrue );
     CleanupStack::PushL( dataloadInfo );
-    // we need to disable javascript (if enabled) before re-loading the page
-    TUint jsSetting = GetBrowserSettingL( TBrCtlDefs::ESettingsECMAScriptEnabled );
-    TBool jsSettingChanged( EFalse );
-    if( jsSetting == 1 )
-        {
-        jsSettingChanged = ETrue;
-        SetBrowserSettingL( TBrCtlDefs::ESettingsECMAScriptEnabled, 0 );
-        }
     CWebKitLoader* loader = &iWebKitView->MainFrame().WebKitBridge().Loader();
     // tell loader that we are handling a SavedPage
@@ -916 +908 @@
     // push data to CBufferTransaction
     ((CBrCtlDataLoadSupplier*)dataLoadSupplier)->DataLoad( *tmpData );
-    // now restore javascript setting to prior value
-    if( jsSettingChanged )
-        {
-        SetBrowserSettingL( TBrCtlDefs::ESettingsECMAScriptEnabled, jsSetting );
-        }
     CleanupStack::PopAndDestroy( tmpData );
     CleanupStack::PopAndDestroy( dataloadInfo );

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2006-11-28  spadma  <Sachin.Padma@nokia.com>
+
+        Reviewed by Yongjun.
+        DESC: [S60] browser fails to run the script when the page saved
+        http://bugs.webkit.org/show_bug.cgi?id=11706
+
+        * BrowserView/src/WebKitControl.cpp:
+        (CWebKitControl::LoadSavedPageL):
+
 2006-11-21  sareen  <shyam.sareen@nokia.com>
         Reviewed by sachin.padma@nokia.com