Changeset 20909 for S60/trunk/WebKit

Timestamp:

04/16/07 11:38:47 (21 months ago)

Author:

spadma

Message:

2007-04-16 spadma

Reviewed by Zalan
DESC: Unable to play flash content in embedded browser Averell 3.1
http://bugs.webkit.org/show_bug.cgi?id=13363
TSW ID: EDHV-6YDHC2

• Plugin/inc/PluginHandler.h:
• Plugin/src/PluginHandler.cpp: (CPluginInfo::ParseDefaultDataL): (CPluginInfo::ParseDisplayNameL): (CPluginHandler::ConstructL): (CPluginHandler::Initialize): (CPluginHandler::LoadPluginsL): (CPluginHandler::FindPlugin): (CPluginHandler::FindPluginByExtension): (CPluginHandler::LoadPluginL): (CPluginHandler::UnloadPlugin): (CPluginHandler::GetIndexFromHandle): (CPluginHandler::ReloadPlugins): (CPluginHandler::GetPluginName): (CPluginHandler::GetPluginFileName): (CPluginHandler::GetPluginDescription): (CPluginHandler::GetPluginCount): (CPluginHandler::GetMimeTypes): (CPluginHandler::GetMimeExtensions): (CPluginHandler::GetMimeDescriptions): (CPluginHandler::ReloadPluginsL):

Location:

S60/trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugin/inc/PluginHandler.h (modified) (1 diff)
• Plugin/src/PluginHandler.cpp (modified) (15 diffs)

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-04-16  spadma  
+
+        Reviewed by Zalan
+        DESC: Unable to play flash content in embedded browser Averell 3.1
+        http://bugs.webkit.org/show_bug.cgi?id=13363
+        TSW ID: EDHV-6YDHC2
+        * Plugin/inc/PluginHandler.h:
+        * Plugin/src/PluginHandler.cpp:
+        (CPluginInfo::ParseDefaultDataL):
+        (CPluginInfo::ParseDisplayNameL):
+        (CPluginHandler::ConstructL):
+        (CPluginHandler::Initialize):
+        (CPluginHandler::LoadPluginsL):
+        (CPluginHandler::FindPlugin):
+        (CPluginHandler::FindPluginByExtension):
+        (CPluginHandler::LoadPluginL):
+        (CPluginHandler::UnloadPlugin):
+        (CPluginHandler::GetIndexFromHandle):
+        (CPluginHandler::ReloadPlugins):
+        (CPluginHandler::GetPluginName):
+        (CPluginHandler::GetPluginFileName):
+        (CPluginHandler::GetPluginDescription):
+        (CPluginHandler::GetPluginCount):
+        (CPluginHandler::GetMimeTypes):
+        (CPluginHandler::GetMimeExtensions):
+        (CPluginHandler::GetMimeDescriptions):
+        (CPluginHandler::ReloadPluginsL):
+
 bradley, rs'd by padma
  DESC:  move namespace declaration to top of file

S60/trunk/WebKit/Plugin/inc/PluginHandler.h

@@ -349 +349 @@
         CIdle*                      iIdle;              //Active Object to initailise
                                                         //the plugins from drives
+        TBool             iPluginsLoaded;
     };
 

S60/trunk/WebKit/Plugin/src/PluginHandler.cpp

@@ -65 +65 @@
 typedef void (*NPP_ShutdownFunc)(void);
 
+#define LOAD_PLUGINS  if(!iPluginsLoaded) { TRAP_IGNORE(LoadPluginsL()); iPluginsLoaded = ETrue; }
+
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -551 +553 @@
 TBool CPluginHandler::LoadPluginsL()
     {
+    if(iPluginsLoaded)
+        {
+        return EFalse;
+        }
+
     // 1) fetch CImplementationInformation instances from the ECOM infrastructure
     // 2) create plugin info for each plugin
@@ -589 +596 @@
     ecomPluginInfoArray.Close();
 
+    iPluginsLoaded = ETrue;
     return EFalse;
     }
@@ -600 +608 @@
 TInt CPluginHandler::FindPlugin(const TDesC& aMIMEType)
     {
+    LOAD_PLUGINS
+    
     TInt  pluginIndex;
     TInt  mimeIndex;
@@ -625 +635 @@
 TInt CPluginHandler::FindPluginByExtension(const TDesC& aFileName)
     {
+    LOAD_PLUGINS
+    
     TInt  pluginIndex;
     TInt  extIndex;
@@ -654 +666 @@
 void CPluginHandler::LoadPluginL(TInt aHandle, NPPluginFuncs** aPluginFuncs)
     {
+    LOAD_PLUGINS
+    
     TUint index(GetIndexFromHandle(aHandle));
     __ASSERT_DEBUG(index < (TUint)iPluginInfoArray.Count(), PanicHandler());
@@ -688 +702 @@
 void CPluginHandler::UnloadPlugin(TInt aHandle)
     {
+    LOAD_PLUGINS
+    
     TUint index(GetIndexFromHandle(aHandle));
     __ASSERT_DEBUG(index < (TUint) iPluginInfoArray.Count(), PanicHandler());
@@ -713 +729 @@
 TUint CPluginHandler::GetIndexFromHandle(TInt aHandle)
     {
+    LOAD_PLUGINS
+    
     TUint  index;
     TUint  count(iPluginInfoArray.Count());
@@ -751 +769 @@
 TPtrC CPluginHandler::GetPluginName(TInt aIndex)
     {
+    LOAD_PLUGINS
+    
      CPluginInfo* pluginInfo = iPluginInfoArray[aIndex];
      if (pluginInfo && pluginInfo->iName)
@@ -766 +786 @@
 TPtrC CPluginHandler::GetPluginFileName(TInt aIndex)
     {
+    LOAD_PLUGINS
+    
      CPluginInfo* pluginInfo = iPluginInfoArray[aIndex];
      if (pluginInfo && pluginInfo->iFileName)
@@ -782 +804 @@
 TPtrC CPluginHandler::GetPluginDescription(TInt aIndex)
     {
+    LOAD_PLUGINS
+    
      CPluginInfo* pluginInfo = iPluginInfoArray[aIndex];
      if (pluginInfo && pluginInfo->iDescription)
@@ -799 +823 @@
 TInt CPluginHandler::GetPluginCount()
     {
+    LOAD_PLUGINS
+    
     return iPluginInfoArray.Count();
     }
@@ -811 +837 @@
 const RPointerArray <HBufC>& CPluginHandler::GetMimeTypes(TInt aIndex)
    {
+    LOAD_PLUGINS
+   
    CPluginInfo *pluginInfo =  iPluginInfoArray[aIndex];
    return pluginInfo->MimeTypes();
@@ -824 +852 @@
 HBufC* CPluginHandler::GetMimeExtensions(TInt aIndex, const TDesC &aMimeType)
    {
+    LOAD_PLUGINS
+   
    CPluginInfo *pluginInfo =  iPluginInfoArray[aIndex];
    HBufC* extn = NULL;
@@ -840 +870 @@
 const RPointerArray <HBufC>&  CPluginHandler::GetMimeDescriptions(TInt aIndex)
    {
+    LOAD_PLUGINS
+   
    CPluginInfo *pluginInfo =  iPluginInfoArray[aIndex];
    return pluginInfo->MimeDescriptions();