Changeset 24955 in webkit

Timestamp:

Aug 9, 2007 8:28:07 AM (17 years ago)

Author:

spadma

Message:

2007-08-09 Mahesh Kulkarni <​mahesh.kulkarni@nokia.com>

Reviewed by Sachin.
DESC: [S60] Problem with CPluginSkin::PluginScriptableObject
​http://bugs.webkit.org/show_bug.cgi?id=14383

• WebKit\Plugin\inc\PluginWin.h: Added CPluginWin::GetPluginUid()
• WebKit\Plugin\inc\PluginHandler.h: Added CPluginInfo::Uid()
• WebKit\Plugin\inc\PluginSkin.h: Added CPluginSkin::IsPluginScriptableL()
• WebKit\Plugin\src\PluginSkin.cpp: (CPluginSkin::IsPluginScriptableL())
• WebKit\Plugin\src\PluginWin.cpp: (CPluginWin::GetPluginUid())

Location:

S60/branches/3.1m

Files:

• S60WebUi/ChangeLog (modified) (1 diff)
• S60WebUi/WebUi/inc/WebUiCRKeys.h (modified) (4 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Plugin/inc/PluginHandler.h (modified) (1 diff)
• WebKit/Plugin/inc/PluginSkin.h (modified) (1 diff)
• WebKit/Plugin/inc/PluginWin.h (modified) (1 diff)
• WebKit/Plugin/src/PluginSkin.cpp (modified) (2 diffs)
• WebKit/Plugin/src/PluginWin.cpp (modified) (1 diff)

S60/branches/3.1m/S60WebUi/ChangeLog

@@ +1 @@
+09-08-2007 Mahesh Kulkarni <mahesh.kulkarni@Nokia.com>
+        Reviewed by Sachin Padma
+        
+        DESC: [S60] Problem with CPluginSkin::PluginScriptableObject
+        http://bugs.webkit.org/show_bug.cgi?id=14383
+        
+        * WebUi/inc/WebUiCRKeys.h: Added CRKey KPluginScriptabilityAllowed 
+
+ 
 2006-08-25  w3liu  <wei.liu@nokia.com>
 

S60/branches/3.1m/S60WebUi/WebUi/inc/WebUiCRKeys.h

@@ -10 +10 @@
 *    All rights reserved.
 *  
-*       Redistribution and use in source and binary forms, with or without
-*       modification, are permitted provided that the following conditions
-*       are met:
+*   Redistribution and use in source and binary forms, with or without
+*   modification, are permitted provided that the following conditions
+*   are met:
 *  
 *      * Redistributions of source code must retain the above copyright
@@ -24 +24 @@
 *        from this software without specific prior written permission.
 *  
-*       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*       "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*       LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*       A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-*       OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-*       SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-*       LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*       DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*       THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-*       (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-*       USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-*       DAMAGE.
+*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+*   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+*   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+*   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+*   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+*   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+*   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+*   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+*   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+*   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+*   USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+*   DAMAGE.
 *  
 *    Please see file patentlicense.txt for further grants.
@@ -59 +59 @@
 // Images enabled.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGImagesEnabled =         0x00000001;
+const TUint32 KBrowserNGImagesEnabled =         0x00000001;
 
 // Browser font size.
 // Valid values:any positive 32-bit integer value
-const TUint32 KBrowserNGFontSize =              0x00000002;
+const TUint32 KBrowserNGFontSize =              0x00000002;
 
 // Browser encoding setting.
 // Valid values: any positive 32-bit integer value
 // 0 = automatic
-const TUint32 KBrowserNGEncoding =              0x00000003;
+const TUint32 KBrowserNGEncoding =              0x00000003;
 
 // Browser uses cookies.
 // Valid values: 0 = reject 1 = allow
-const TUint32 KBrowserNGCookiesEnabled =        0x00000004;
+const TUint32 KBrowserNGCookiesEnabled =        0x00000004;
 
 // Boolean value which determines whether ECMA Script 
 // setting is enabled or disabled in Browser.
 // Valid values: 0 = disabled 1 = enabled
-const TUint32 KBrowserNGECMAScriptSupport =     0x00000005;
+const TUint32 KBrowserNGECMAScriptSupport =     0x00000005;
 
 // Show HTTP security warnings.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGShowSecurityWarnings=   0x00000006;
+const TUint32 KBrowserNGShowSecurityWarnings=   0x00000006;
 
 // Show Page Overview.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGPageOverview =                  0x00000007;
+const TUint32 KBrowserNGPageOverview =        0x00000007;
 
 // Mime types for HTTP accept header.
 // Any String value
-const TUint32 KBrowserNGMimeTypes =                     0x00000008;
+const TUint32 KBrowserNGMimeTypes =         0x00000008;
 
 // Show History view on back softkey press.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGBackList =                              0x00000009;
+const TUint32 KBrowserNGBackList =          0x00000009;
 
 // Auto refresh.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGAutoRefresh =                   0x0000000A;
+const TUint32 KBrowserNGAutoRefresh =         0x0000000A;
 
 // BrowserNG engine cache size in KBytes
 // Valid values: any positive 32-bit integer value
-const TUint32 KBrowserNGMemoryCacheSize =               0x0000000B;
+const TUint32 KBrowserNGMemoryCacheSize =       0x0000000B;
 
 // The setting for encoding a URL with UTF-8 or the original encoding.
 // Valid values: 0 = off 1 = on
-const TUint32 KBrowserNGUtf8Encoding =                  0x0000000C;
+const TUint32 KBrowserNGUtf8Encoding =        0x0000000C;
 
 // Browser Adaptive Bookmarks mode setting.
@@ -144 +144 @@
 // The flag that's set if Browser build is to be used in United States (USA)
 // Valid values: 0 = not set (non-US build)  1 = set (US build)
-const TUint32 KBrowserUsBuild =                 0x00000014;
+const TUint32 KBrowserUsBuild =               0x00000014;
+
+// This Interger type will have UID's of plugins that can access scriptability
+// Valid values: TUid's
+const TUint32 KPluginScriptabilityAllowed = 0x00000015;
 
 #endif      // WEBUICRKEYS_H

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2007-08-09 Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>
+        Reviewed by Sachin.
+        DESC: [S60] Problem with CPluginSkin::PluginScriptableObject
+        http://bugs.webkit.org/show_bug.cgi?id=14383
+
+        * WebKit\Plugin\inc\PluginWin.h: Added CPluginWin::GetPluginUid()
+        * WebKit\Plugin\inc\PluginHandler.h: Added CPluginInfo::Uid()
+        * WebKit\Plugin\inc\PluginSkin.h: Added CPluginSkin::IsPluginScriptableL()
+        * WebKit\Plugin\src\PluginSkin.cpp:
+        (CPluginSkin::IsPluginScriptableL())
+        * WebKit\Plugin\src\PluginWin.cpp: 
+        (CPluginWin::GetPluginUid())
+
 2007-08-08  yadavall  <sriram.yadavalli>
 

S60/branches/3.1m/WebKit/Plugin/inc/PluginHandler.h

@@ -474 +474 @@
         void ParseDefaultDataL(const TDesC8& aMIMEDescription);
         void ParseDisplayNameL(const TDesC& aPluginDescription);
-
+        TInt32 Uid() { return iUid.iUid; }
     private:  // Private Methods
 

S60/branches/3.1m/WebKit/Plugin/inc/PluginSkin.h

@@ -388 +388 @@
         void *PluginScriptableObject(); 
 
+        /**
+        * Checks if plugin UID is present in the repository
+        * Checks if Plugin is scriptable
+        * @since 3.1
+        * @returns True if plugin is scriptable, Flase otherwise
+        */        
+        TInt IsPluginScriptableL();
+
   public: // Functions from MViewFocusObserver
 

S60/branches/3.1m/WebKit/Plugin/inc/PluginWin.h

@@ -502 +502 @@
         void *PluginScriptableObject();
 
+        /**
+        * Get plugin UID
+        * @since 3.1
+        * @return
+        */
+       TInt32 CPluginWin::GetPluginUid();
+
     protected: // New functions
 

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

@@ -79 +79 @@
 _LIT(KContentTypeFlash, "flash");
 
+const TUint KOrigBufSize = 512;
 // The default placeholder width, matches the value set in html4.css
 const TUint KPlaceholderWidth( 100 );
@@ -702 +703 @@
 #endif
 
+// -----------------------------------------------------------------------------
+// CPluginSkin::IsPluginScriptableL 
+// -----------------------------------------------------------------------------
+//        
+TInt CPluginSkin::IsPluginScriptableL()
+    {
+    // If the plugin content hasnt arrived yet or plugin is invalid, then return immediately
+    if ( !iPluginWin )
+        {
+        return KErrNotFound;
+        }
+
+    // Allocate wide buffer for data types
+    HBufC* uid = HBufC::NewLC( KOrigBufSize );
+    TPtr uidPtr( uid->Des() );
+    TInt error;
+    
+#ifndef __BROWSER_SDK
+    CRepository* rep = CRepository::NewL( KCRUidBrowser );
+#else
+    CRepository* rep = CRepository::NewL( KCRUidWebUi );
+#endif
+    CleanupStack::PushL( rep );
+    
+    // Read the data types from repository, increase the buffer
+    // if the initial size not enough.
+    error = rep->Get( KPluginScriptabilityAllowed, uidPtr );
+
+    if( error == KErrOverflow )
+        {
+        // retry with a bigger buffer
+        do
+            {
+            uid->ReAllocL( uidPtr.MaxLength() + KOrigBufSize );
+            uidPtr.Set( uid->Des() );
+
+            error = rep->Get( KPluginScriptabilityAllowed, uidPtr );
+            }
+        while( error == KErrOverflow );
+        }
+ 
+    //Integer to String;
+    TBuf16 <12> uidString;
+    uidString.Num(iPluginWin->GetPluginUid(), EHex);
+    error = uid->FindC(uidString);
+    
+    CleanupStack::PopAndDestroy( 2 ); // uidPtr, rep
+    
+    return error;
+    }
+    
 void* CPluginSkin::PluginScriptableObject()
     {
+    TInt isScriptable;
+    
     CWidgetExtension* wdgtExt = iWebKitFrame->WebKitView().WebKitControl().WidgetExtension();
-    if (wdgtExt)
-        {
+
+    if (!wdgtExt)
+        TRAPD(err, (isScriptable = IsPluginScriptableL()));
+    
+    if(wdgtExt || (!err && !isScriptable))        {
         return iPluginWin?iPluginWin->PluginScriptableObject():0;
         }

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

@@ -1254 +1254 @@
     iTopUrl = aUrl.AllocL();
     }
+
+// -----------------------------------------------------------------------------
+// CPluginWin::GetPluginUid 
+// -----------------------------------------------------------------------------
+//        
+TInt32 CPluginWin::GetPluginUid()
+    {
+    RPointerArray<CPluginInfo> pluginInfoArray = iPluginHandler->PluginInfoArray();
+    TInt index = iPluginHandler->GetIndexFromHandle(iHandle);
+    CPluginInfo* plugin = pluginInfoArray[index];
+    return plugin->Uid();
+    }
+    
 // -----------------------------------------------------------------------------
 // CPluginData::CPluginData