Changeset 17042 in webkit

Timestamp:

Oct 13, 2006 2:18:38 PM (18 years ago)

Author:

spadma

Message:

2006-10-13 sareen <​shyam.sareen@nokia.com>

Reviewed by (​Sachin.padma@nokia.com).
DESC: New Enum need to add for finding the whether the plugin

is interactive or not.

​http://bugs.webkit.org/show_bug.cgi?id=11281.

• Plugin/inc/PluginAdapterInterface.h: (MPluginAdapter::SetOptionMenuHandler):
• Plugin/inc/PluginSkin.h:
• Plugin/inc/PluginWin.h:
• Plugin/inc/npapi.h:
• Plugin/src/PluginSkin.cpp:
• Plugin/src/PluginWin.cpp: (CPluginWin::ConstructL): (CPluginWin::IsContentInteractive):

Location:

S60/trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugin/inc/PluginAdapterInterface.h (modified) (1 diff)
• Plugin/inc/PluginSkin.h (modified) (2 diffs)
• Plugin/inc/PluginWin.h (modified) (4 diffs)
• Plugin/inc/npapi.h (modified) (1 diff)
• Plugin/src/PluginSkin.cpp (modified) (2 diffs)
• Plugin/src/PluginWin.cpp (modified) (2 diffs)

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2006-10-13  sareen  <shyam.sareen@nokia.com>
+
+        Reviewed by (Sachin.padma@nokia.com).
+        DESC: New Enum need to add for finding the whether the plugin 
+              is interactive or not.
+        http://bugs.webkit.org/show_bug.cgi?id=11281.
+
+        * Plugin/inc/PluginAdapterInterface.h:
+        (MPluginAdapter::SetOptionMenuHandler):
+        * Plugin/inc/PluginSkin.h:
+        * Plugin/inc/PluginWin.h:
+        * Plugin/inc/npapi.h:
+        * Plugin/src/PluginSkin.cpp:
+        * Plugin/src/PluginWin.cpp:
+        (CPluginWin::ConstructL):
+        (CPluginWin::IsContentInteractive):
+
 2006-10-12  brmorris  <thisisbradley@gmail.com>
 

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

@@ -125 +125 @@
         */
     virtual void SetOptionMenuHandler(MOptionMenuHandler* /*aOptionMenuHandler*/) {};
-#ifdef RD_32_BROWSER
-        /**
-        * Tells the plugin adapter if plugin content can accept user interaction.  This function
-        * is called from the plugin.
-        * @since Series 60 3nd Edition
-        * @param None
-        * @return None
-        */
-    virtual void SetContentInteractive(TBool /*aInteractive*/ ) = 0;
-#endif
     };
 

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

@@ -278 +278 @@
         void SetRect(const TRect& aRect);
 
-#ifdef RD_32_BROWSER
+
         /**
         * IsFocusable
@@ -289 +289 @@
         TBool IsFocusable() const;
 
-        
+#ifdef RD_32_BROWSER       
         HBufC* Url()                            { return iUrl; }
 #endif

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

@@ -237 +237 @@
         void ResizePluginRect(TRect& aRect);
 
-#ifdef RD_32_BROWSER
         /**
         * Check if the plugin content is able to accept user interaction
@@ -245 +244 @@
         * @return void
         */
-        TBool IsContentInteractive() const                  { return iContentInteractive; }
-#endif
+        TBool IsContentInteractive() const ;                
     public: // Functions from CCoeControl
 
@@ -450 +448 @@
         void SetOptionMenuHandler(MOptionMenuHandler* aOptionMenuHandler) {iOptionMenuHandler = aOptionMenuHandler;}
 #ifdef RD_32_BROWSER
-        /**
-        * Tells the plugin adapter that plugin content can accept user interaction.  This function
-        * is called from the plugin.
-        * @since Series 60 3nd Edition
-        * @param None
-        * @return None
-        */
-        void SetContentInteractive( TBool aInteractive )            { iContentInteractive = aInteractive; }
-
         HBufC* PluginDataUrl();
 #endif
@@ -611 +600 @@
                                                                // browser to send option menu commands to plugin
         TBool                               iDeleted;       // Flag to check if plugin control has been deleted
-#ifdef RD_32_BROWSER
-        TBool                               iContentInteractive;
-#endif
     };
 

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

@@ -404 +404 @@
   /* 12 and over are available on Mozilla builds starting with 0.9.9 */
   NPPVjavascriptPushCallerBool = 12,
-  NPPVpluginKeepLibraryInMemory = 13   /* available in Mozilla 1.0 */
+  NPPVpluginKeepLibraryInMemory = 13,   /* available in Mozilla 1.0 */
+  /* The following is specific to Nokia, so value is 
+   * started from 100. The numbers 13 to 1000 are left
+   * for standarization and other future use. Value return is zero for
+   * ineteractive and 'one' for non-interactive.
+   */
+  NPPVpluginInteractiveBool = 1000
 } NPPVariable;
 

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

@@ -652 +652 @@
     }
     
-#ifdef RD_32_BROWSER
 // -----------------------------------------------------------------------------
 // CPluginSkin::IsFocusable
@@ -665 +664 @@
         return EFalse;
     }
-#endif
+

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

@@ -147 +147 @@
     // Add the focus/foreground observer    
     ControlEnv()->AddForegroundObserverL( *this ) ;
-#ifdef RD_32_BROWSER    
-    iContentInteractive = ETrue;
-#endif
     }
 
@@ -1203 +1200 @@
   }
 
+
+// -----------------------------------------------------------------------------
+// CPluginWin::IsContentInteractive()
+// Tells  that plugin content can accept user interaction. 
+// The return value of iPluginFuncs->getvalue "0" or false means  plugin is interactive. 
+// If return value of iPluginFuncs->getvalue is true or 1 then plugin is 
+// not interactive. This is due to the backword functional compatibility.
+//
+// CPluginWin::IsContentInteractive() return value = 0 implies plug is not interactive
+// CPluginWin::IsContentInteractive() return value = 1 implies plug is interactive
+// -----------------------------------------------------------------------------
+//
+TBool CPluginWin::IsContentInteractive() const
+    {
+    TBool retVal = ETrue;
+    if ( iPluginFuncs && (iPluginFuncs->getvalue) )
+        {
+            NPError err( NPERR_NO_ERROR );
+            TBool isNotInteractive = EFalse; 
+
+            err = iPluginFuncs->getvalue (iInstance, NPPVpluginInteractiveBool, &isNotInteractive);
+
+            if( err == NPERR_NO_ERROR)
+            {
+             retVal = !isNotInteractive;
+            }
+
+        }
+    return retVal;
+    }
 // -----------------------------------------------------------------------------
 // CPluginData::CPluginData