<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24855] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24855">24855</a></dd>
<dt>Author</dt> <dd>spadma</dd>
<dt>Date</dt> <dd>2007-08-03 14:41:23 -0700 (Fri, 03 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
<li><a href="#S60trunkWebKitPluginincPluginSkinh">S60/trunk/WebKit/Plugin/inc/PluginSkin.h</a></li>
<li><a href="#S60trunkWebKitPluginsrcPluginSkincpp">S60/trunk/WebKit/Plugin/src/PluginSkin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (24854 => 24855)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-08-03 21:28:32 UTC (rev 24854)
+++ S60/trunk/WebKit/ChangeLog 2007-08-03 21:41:23 UTC (rev 24855)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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):
+
</ins><span class="cx"> yadavall, reviewed by <sachin.padma@nokia.com>
</span><span class="cx"> DESC: Center key press must be sent to Engine
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=14593
</span></span></pre></div>
<a id="S60trunkWebKitPluginincPluginSkinh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/Plugin/inc/PluginSkin.h (24854 => 24855)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/Plugin/inc/PluginSkin.h 2007-08-03 21:28:32 UTC (rev 24854)
+++ S60/trunk/WebKit/Plugin/inc/PluginSkin.h 2007-08-03 21:41:23 UTC (rev 24855)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> class CPluginWin;
</span><span class="cx"> class CPluginLoader;
</span><span class="cx"> class CWebKitControl;
</span><ins>+class COOMPluginCollector;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * CPluginSkin
</span><span class="lines">@@ -464,12 +465,14 @@
</span><span class="cx"> //Member variable to keep track of url
</span><span class="cx"> HBufC* iUrl;
</span><span class="cx">
</span><del>- // ETrue if plugin has resized
- TBool iResized;
</del><ins>+ // ETrue if plugin has resized
+ TBool iResized;
</ins><span class="cx">
</span><del>- //ETrue if plugin can be activated to interact with user. Only if plugin is generated from external js
- TBool iCanPluginInteract;
</del><ins>+ //ETrue if plugin can be activated to interact with user. Only if plugin is generated from external js
+ TBool iCanPluginInteract;
</ins><span class="cx">
</span><del>- TRect iPluginWinClipRect;
</del><ins>+ COOMPluginCollector* iOOMCollector;
+
+ TRect iPluginWinClipRect;
</ins><span class="cx"> };
</span><span class="cx"> #endif // __PLUGINSKIN_H__
</span></span></pre></div>
<a id="S60trunkWebKitPluginsrcPluginSkincpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/Plugin/src/PluginSkin.cpp (24854 => 24855)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/Plugin/src/PluginSkin.cpp 2007-08-03 21:28:32 UTC (rev 24854)
+++ S60/trunk/WebKit/Plugin/src/PluginSkin.cpp 2007-08-03 21:41:23 UTC (rev 24855)
</span><span class="lines">@@ -65,11 +65,11 @@
</span><span class="cx"> #include "WebKitBridge.h"
</span><span class="cx"> #include "WebKitFrame.h"
</span><span class="cx"> #include "CannedImages.h"
</span><del>-#include "BrCtl.h"
</del><span class="cx"> #include "WebKitView.h"
</span><span class="cx"> #include "WebKitControl.h"
</span><span class="cx"> #include "WebCoreGraphicsContext.h"
</span><span class="cx"> #include "WidgetExtension.h"
</span><ins>+#include "MemoryManager.h"
</ins><span class="cx">
</span><span class="cx"> // CONSTANTS
</span><span class="cx"> // scheme for RTSP url
</span><span class="lines">@@ -93,6 +93,20 @@
</span><span class="cx">
</span><span class="cx"> //DATATYPES
</span><span class="cx">
</span><ins>+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;
+};
+
</ins><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="cx"> // CPluginSkin::NewL()
</span><span class="cx"> // Two-phased constructor for CPluginSkin
</span><span class="lines">@@ -143,6 +157,7 @@
</span><span class="cx"> TBool aCanPluginInteract,
</span><span class="cx"> TBool aHasFallbackContent)
</span><span class="cx"> {
</span><ins>+ iOOMCollector = new (ELeave) COOMPluginCollector( this );
</ins><span class="cx"> // Get the canned object images
</span><span class="cx"> CCannedImages& cannedImages = CStaticObjectContainer::Instance().CannedImagesL();
</span><span class="cx"> iCannedImage = cannedImages.GetImage( CCannedImages::EImageObject );
</span><span class="lines">@@ -292,6 +307,7 @@
</span><span class="cx"> delete iAttributeValues;
</span><span class="cx"> delete iPluginLoader;
</span><span class="cx"> delete iUrl;
</span><ins>+ delete iOOMCollector;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----------------------------------------------------------------------------
</span><span class="lines">@@ -607,9 +623,9 @@
</span><span class="cx"> User::Leave( err );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- //Set the cliprect to plugwin
- iPluginWinClipRect = iRect;
- iPluginWinClipRect.Intersection(iWebKitFrame->WebKitView().MainFrame().FrameRect());
</del><ins>+ //Set the cliprect to plugwin
+ iPluginWinClipRect = iRect;
+ iPluginWinClipRect.Intersection(iWebKitFrame->WebKitView().MainFrame().FrameRect());
</ins><span class="cx">
</span><span class="cx"> if ( !iIsSoundstart )
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>