Changeset 17809 in webkit

Timestamp:

Nov 16, 2006 9:09:20 AM (17 years ago)

Author:

spadma

Message:

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

Reviewed by Yongjun.
DESC: [S60] Modify Autoload Images and Objects setting to include enabling/disabling of flash.
​http://bugs.webkit.org/show_bug.cgi?id=11605

• BrowserControl/inc/BrCtlDefs.h: (TBrCtlDefs::):
• BrowserView/inc/BrowserSettingsContainer.h:
• BrowserView/src/BrowserSettingsContainer.cpp: (CBrowserSettingsContainer::InsertDefaultSettingsL):
• BrowserView/src/WebKitControl.cpp: (CWebKitControl::SetBrowserSettingL): (CWebKitControl::GetBrowserSettingL):
• Plugin/src/PluginSkin.cpp: (CPluginSkin::ConstructL):

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserControl/inc/BrCtlDefs.h (modified) (2 diffs)
• BrowserView/inc/BrowserSettingsContainer.h (modified) (1 diff)
• BrowserView/src/BrowserSettingsContainer.cpp (modified) (1 diff)
• BrowserView/src/WebKitControl.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Plugin/src/PluginSkin.cpp (modified) (2 diffs)

S60/branches/3.1m/WebKit/BrowserControl/inc/BrCtlDefs.h

@@ -207 +207 @@
             ECommandSmartLinkSendMessage, ///<
             ECommandSmartLinkAddToPhoneBook, ///<
-            ECommandShowToolBar, ///<Shows the toolbar
+            ECommandShowToolBar ///<Shows the toolbar
             };
         /**
@@ -447 +447 @@
             ESettingsSavedPage,           ///< Save the page
             ESettingsSmartLink,
+            ESettingsDisableFlash, ///<Enable/Disable the flash
             ESettingsMaxEnum              ///< Must be last one
             };

S60/branches/3.1m/WebKit/BrowserView/inc/BrowserSettingsContainer.h

@@ -76 +76 @@
 const TBool KDefaultESettingsSmartLink = ETrue;
 #endif
+const TBool KDefaultESettingsDisableFlash = EFalse;
 
 const TInt KDefaultESettingsApId = 0;

S60/branches/3.1m/WebKit/BrowserView/src/BrowserSettingsContainer.cpp

@@ -294 +294 @@
     SettingL( TBrCtlDefs::ESettingsSmartLink ).SetBoolValueL( KDefaultESettingsSmartLink );
 #endif    
+    SettingL( TBrCtlDefs::ESettingsDisableFlash ).SetBoolValueL( KDefaultESettingsDisableFlash );
     }
 

S60/branches/3.1m/WebKit/BrowserView/src/WebKitControl.cpp

@@ -657 +657 @@
         case TBrCtlDefs::ESettingsSmartLink:
 #endif
+        case TBrCtlDefs::ESettingsDisableFlash:
             {
             TBool val( aValue );
@@ -734 +735 @@
         case TBrCtlDefs::ESettingsSmartLink:
 #endif
+        case TBrCtlDefs::ESettingsDisableFlash:
             {
             retVal = (TUint)iBrowserSettingsContainer->SettingL(

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2006-11-16  spadma  <Sachin.Padma@nokia.com>
+        Reviewed by Yongjun.
+        DESC: [S60] Modify Autoload Images and Objects setting to include enabling/disabling of flash.
+        http://bugs.webkit.org/show_bug.cgi?id=11605
+
+        * BrowserControl/inc/BrCtlDefs.h:
+        (TBrCtlDefs::):
+        * BrowserView/inc/BrowserSettingsContainer.h:
+        * BrowserView/src/BrowserSettingsContainer.cpp:
+        (CBrowserSettingsContainer::InsertDefaultSettingsL):
+        * BrowserView/src/WebKitControl.cpp:
+        (CWebKitControl::SetBrowserSettingL):
+        (CWebKitControl::GetBrowserSettingL):
+        * Plugin/src/PluginSkin.cpp:
+        (CPluginSkin::ConstructL):
+
 2006-11-15  spadma  <Sachin.Padma@nokia.com>
 

S60/branches/3.1m/WebKit/Plugin/src/PluginSkin.cpp

@@ -76 +76 @@
 _LIT(KAccessPtId, "accesspointid");
 _LIT(KContentType, "contenttype");
+_LIT(KContentTypeFlash, "flash");
 
 // The default placeholder width, matches the value set in html4.css
@@ -236 +237 @@
             else
                 {
+                TBool loadPluginContent = iWebKitFrame->WebKitView().WebKitControl().GetBrowserSettingL( TBrCtlDefs::ESettingsAutoLoadImages );
+
+                if( ( aMIMEType.Find(KContentTypeFlash) != KErrNotFound ) )
+                    {
+                    loadPluginContent = loadPluginContent && !iWebKitFrame->WebKitView().WebKitControl().GetBrowserSettingL( TBrCtlDefs::ESettingsDisableFlash );
+                    }
                 // After UI CR for adding setting for plugin, use the ESetting AutoLoadPlugins
-                if ( iWebKitFrame->WebKitView().WebKitControl().GetBrowserSettingL( TBrCtlDefs::ESettingsAutoLoadImages ) )
+                if ( loadPluginContent )
                     {
                     // Load the plugin content NOW since autoload is ON and the phone is non-US build