Bug 14383 – [S60] Problem with CPluginSkin::PluginScriptableObject TSW ID : MKUI-75UDR2

• Status: CLOSED
• Resolution: FIXED
• Component: Plug-ins

[Mahesh Kulkarni]

_DESC:

CPluginSkin::PluginScriptableObject function in pluginSkin.cpp checks for widgets which makes only widget take use of scriptability. Where as flash can also be a scriptable. 

_PROBLEM:

AS-JS interaction of flash wont work as currently widgets are allowed t ouse scriptable object. 

_SOLUTION:

Removing widget only check from CPluginSkin::PluginScriptableObject.

_IMPACT:

WebKit\plugin

[Mahesh Kulkarni]

Created attachment 15217 [details]
Problem with CPluginSkin::PluginScriptableObject

[Mahesh Kulkarni]

Created attachment 15269 [details]
3.1 patch. added check for widget and flash

This is 3.1 patch. Removed widget only check from pluginSkin.cpp and added check for flash/widget check in pluginWin.cpp.

[Mahesh Kulkarni]

Created attachment 15270 [details]
CCB patch. Added scriptability for selected plugins

[Mahesh Kulkarni]

Comment on attachment 15269 [details]
3.1 patch. added check for widget and flash

Discarding these patch's. As sriram has suggested to use repository and uid of plugin to check if scriptability is allowed.

[Mahesh Kulkarni]

Created attachment 15482 [details]
3.1m Patch for scriptability check

According to Sriram/AnttiH/Yael comments, checking for scriptability of plugins is specific to plugin UID which is compared with the one in browser/webui repository. 

1) Added KPluginScriptabilityAllowed in KCRUidBrowser and KCRUidWebUi repository.
2) KPluginScriptabilityAllowed can have more than one plugin's UID's
3) Added Api PluginInfo->Uid() to get plugin UID
4) Added Api PluginWin->GetPluginUid() to access plugin UID in pluginSkin
5) Added Api pluginSkin->IsPluginScriptableL checks if KPluginScriptabilityAllowed present in the repository. 

Note: I have not attached xls files. Because I am not sure should we add or how to add xls files here. And even BrowserUiInternalCRKeys.h file which is not part of OssWebEngine.

[Sachin Padma]

Comment on attachment 15482 [details]
3.1m Patch for scriptability check

You cannot use leave to return a value from function. Please leave only if there is a critical error like memory allocation failure etc. Otherwise return a value. No need for uidPtr, just pass in Des()

[Mahesh Kulkarni]

Created attachment 15648 [details]
3.1 patch - Updated as per review comments

Changes made as per comments,

1) Made function return value. Leave happens only on special cases as per comments from sachin. 

2) uidPtr can not be removed, as repository->Get takes reference pointer and by trying to pass Des() of uid giving compilation error.

[Sachin Padma]

Comment on attachment 15648 [details]
3.1 patch - Updated as per review comments

Please make sure there are no tabs.

[Mahesh Kulkarni]

Created attachment 15696 [details]
3.1 patch - removed tab in one place.

Removed one tab in PluginHandler.h. Will make sure for no tabs in patches in future.

[Sachin Padma]

Comment on attachment 15696 [details]
3.1 patch - removed tab in one place.

r=me

[Sachin Padma]

Comment on attachment 15696 [details]
3.1 patch - removed tab in one place.

Please attach changelog

[Mahesh Kulkarni]

Created attachment 15740 [details]
3.1 patch - Attached changeLog

Attached change log.

[Sachin Padma]

Comment on attachment 15740 [details]
3.1 patch - Attached changeLog

Please remove the tabs.

[Mahesh Kulkarni]

Created attachment 15805 [details]
3.1 patch

Removed Tab. Which software do you use to find tabs?

[Mahesh Kulkarni]

Added TSW error report for this bug

[Sachin Padma]

Comment on attachment 15805 [details]
3.1 patch

Patch does not apply.

patching file `S60WebUi/WebUi/inc/WebUiCRKeys.h'
patching file `WebKit/ChangeLog'
Hunk #1 succeeded at 1 with fuzz 3.
patching file `WebKit/Plugin/inc/PluginHandler.h'
patching file `WebKit/Plugin/inc/PluginSkin.h'
Hunk #1 FAILED at 378.
1 out of 1 hunk FAILED -- saving rejects to WebKit/Plugin/inc/PluginSkin.h.rej
patching file `WebKit/Plugin/inc/PluginWin.h'
patching file `WebKit/Plugin/src/PluginSkin.cpp'
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
3 out of 3 hunks ignored -- saving rejects to WebKit/Plugin/src/PluginSkin.cpp.r
ej
patching file `WebKit/Plugin/src/PluginWin.cpp'

[Mahesh Kulkarni]

Created attachment 15880 [details]
3.1 patch - WITH LATEST CODE

Patched with latest 3.1 code. I also need to modify xls's for this bug as i have to update repository. Please let me know how do i go about getting xls's to link with this patch. 

Thanks

[Sachin Padma]

Comment on attachment 15880 [details]
3.1 patch - WITH LATEST CODE

r=me

[Sachin Padma]

laned in r24955

[Mahesh Kulkarni]

Created attachment 15895 [details]
3.1 patch - Build break fix

Sorry for the build break. As commented above, I was not sure if we can attach xls files in patch. Thinking xls's can not be compared with any tool. I will take care of these issues in future.

[Sachin Padma]

Comment on attachment 15895 [details]
3.1 patch - Build break fix

r=me

[Mahesh Kulkarni]

Created attachment 16143 [details]
3.1 patch

Wrong check in CPluginSkin::PluginScriptableObject for same TSW error.

[Sachin Padma]

Comment on attachment 16143 [details]
3.1 patch

r=me

[Bradley Morrison]

do both attachment 16143 [details] & 15895 need to get landed?

[Bradley Morrison]

Bulk closing of all s60 platform bugs. 

Sorry for the noise!