Changeset 24855 in webkit

Timestamp:

Aug 3, 2007 2:41:23 PM (17 years ago)

Author:

spadma

Message:

2007-07-24 vmalaiya, <​vikram.malaiya@nokia.com>

Reviewed by Sachin
DESC: VMAA-75EP3L - Browser plugin does not implement memory collection on an out-of-memory condition
​http://bugs.webkit.org/show_bug.cgi?id=14753

• Plugin/inc/PluginSkin.h:
• Plugin/src/PluginSkin.cpp: (COOMPluginCollector::COOMPluginCollector): (COOMPluginCollector::~COOMPluginCollector): (COOMPluginCollector::Collect): (COOMPluginCollector::Restore): (COOMPluginCollector::Priority): (COOMPluginCollector::IsCollecting): (CPluginSkin::ConstructL): (CPluginSkin::~CPluginSkin): (CPluginSkin::CreatePluginWinL):

Location:

S60/trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Plugin/inc/PluginSkin.h (modified) (2 diffs)
• Plugin/src/PluginSkin.cpp (modified) (5 diffs)

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+2007-07-24 vmalaiya, <vikram.malaiya@nokia.com>
+ Reviewed by Sachin
+ DESC: VMAA-75EP3L - Browser plugin does not implement memory collection on an out-of-memory condition
+ http://bugs.webkit.org/show_bug.cgi?id=14753
+        
+        * Plugin/inc/PluginSkin.h:
+        * Plugin/src/PluginSkin.cpp:
+        (COOMPluginCollector::COOMPluginCollector):
+        (COOMPluginCollector::~COOMPluginCollector):
+        (COOMPluginCollector::Collect):
+        (COOMPluginCollector::Restore):
+        (COOMPluginCollector::Priority):
+        (COOMPluginCollector::IsCollecting):
+        (CPluginSkin::ConstructL):
+        (CPluginSkin::~CPluginSkin):
+        (CPluginSkin::CreatePluginWinL):
+
 yadavall, reviewed by <sachin.padma@nokia.com>
  DESC: Center key press must be sent to Engine

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

@@ -58 +58 @@
 class CPluginLoader;
 class CWebKitControl;
+class COOMPluginCollector;
 
 /**
@@ -465 +466 @@
         HBufC* iUrl;
 
-    // ETrue if plugin has resized
-    TBool iResized;
-
-    //ETrue if plugin can be activated to interact with user. Only if plugin is generated from external js
-    TBool iCanPluginInteract;
-
-    TRect iPluginWinClipRect;
+        // ETrue if plugin has resized
+        TBool iResized;
+
+        //ETrue if plugin can be activated to interact with user. Only if plugin is generated from external js
+        TBool iCanPluginInteract;
+
+        COOMPluginCollector* iOOMCollector;
+
+        TRect iPluginWinClipRect;
     };
 #endif //  __PLUGINSKIN_H__

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

@@ -66 +66 @@
 #include "WebKitFrame.h"
 #include "CannedImages.h"
-#include "BrCtl.h"
 #include "WebKitView.h"
 #include "WebKitControl.h"
 #include "WebCoreGraphicsContext.h"
 #include "WidgetExtension.h"
+#include "MemoryManager.h"
 
 // CONSTANTS
@@ -93 +93 @@
 
 //DATATYPES
+
+class COOMPluginCollector : public MMemoryCollector, public CBase
+{
+public:
+    COOMPluginCollector(CPluginSkin* aPlugin) : iPlugin( aPlugin )   { MemoryManager::AddCollector( this ); }
+    ~COOMPluginCollector()              { MemoryManager::RemoveCollector( this );}
+    TUint Collect(TUint /*aRequired*/)  { iPlugin->RemovePluginWin(); iIsCollecting = ETrue; return 0; }
+    void Restore()                      { iIsCollecting = EFalse; }
+    TOOMPriority Priority()             { return EOOM_PriorityLow; }
+    TBool IsCollecting()                { return iIsCollecting; }    
+ private:   
+    CPluginSkin*                        iPlugin;
+    TBool                               iIsCollecting;
+};
 
 // ----------------------------------------------------------------------------
@@ -144 +158 @@
                               TBool aHasFallbackContent)
     {
+    iOOMCollector = new (ELeave) COOMPluginCollector( this );
     // Get the canned object images
     CCannedImages& cannedImages = CStaticObjectContainer::Instance().CannedImagesL();
@@ -293 +308 @@
     delete iPluginLoader;
     delete iUrl;
+    delete iOOMCollector;
     }
 
@@ -608 +624 @@
                 }
             }
-    //Set the cliprect to plugwin
-    iPluginWinClipRect = iRect;
-    iPluginWinClipRect.Intersection(iWebKitFrame->WebKitView().MainFrame().FrameRect());
+        //Set the cliprect to plugwin
+        iPluginWinClipRect = iRect;
+        iPluginWinClipRect.Intersection(iWebKitFrame->WebKitView().MainFrame().FrameRect());
 
         if ( !iIsSoundstart )