Summary: | [S60] Problem with CPluginSkin::PluginScriptableObject TSW ID : MKUI-75UDR2 | ||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Mahesh Kulkarni <maheshk> | ||||||||||||||||||||||||
Component: | Plug-ins | Assignee: | Nobody <webkit-unassigned> | ||||||||||||||||||||||||
Status: | CLOSED FIXED | ||||||||||||||||||||||||||
Severity: | Normal | CC: | bradley.morrison, Sachin.Padma, sriram.yadavalli | ||||||||||||||||||||||||
Priority: | P2 | ||||||||||||||||||||||||||
Version: | 523.x (Safari 3) | ||||||||||||||||||||||||||
Hardware: | S60 Emulator | ||||||||||||||||||||||||||
OS: | S60 3rd edition | ||||||||||||||||||||||||||
URL: | http://waplabdc.nokia-boston.com/browser/users/MaheshKK/Test1/get_var.html | ||||||||||||||||||||||||||
Attachments: |
|
Description
Mahesh Kulkarni
2007-06-25 07:04:59 PDT
Created attachment 15217 [details]
Problem with CPluginSkin::PluginScriptableObject
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.
Created attachment 15270 [details]
CCB patch. Added scriptability for selected plugins
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.
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.
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()
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.
Comment on attachment 15648 [details]
3.1 patch - Updated as per review comments
Please make sure there are no tabs.
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.
Comment on attachment 15696 [details]
3.1 patch - removed tab in one place.
r=me
Comment on attachment 15696 [details]
3.1 patch - removed tab in one place.
Please attach changelog
Created attachment 15740 [details]
3.1 patch - Attached changeLog
Attached change log.
Comment on attachment 15740 [details]
3.1 patch - Attached changeLog
Please remove the tabs.
Created attachment 15805 [details]
3.1 patch
Removed Tab. Which software do you use to find tabs?
Added TSW error report for this bug 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'
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
Comment on attachment 15880 [details]
3.1 patch - WITH LATEST CODE
r=me
laned in r24955 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.
Comment on attachment 15895 [details]
3.1 patch - Build break fix
r=me
Created attachment 16143 [details]
3.1 patch
Wrong check in CPluginSkin::PluginScriptableObject for same TSW error.
Comment on attachment 16143 [details]
3.1 patch
r=me
do both attachment 16143 [details] & 15895 need to get landed?
Bulk closing of all s60 platform bugs. Sorry for the noise! |