RESOLVED FIXED Bug 114943
PluginDatabase: add plugin directory for the BlackBerry port.
https://bugs.webkit.org/show_bug.cgi?id=114943
Summary PluginDatabase: add plugin directory for the BlackBerry port.
Alberto Garcia
Reported 2013-04-22 02:22:53 PDT
PluginDatabase::defaultPluginDirectories() doesn't have the BlackBerry plugin directory.
Attachments
Patch (1.30 KB, patch)
2013-04-22 02:24 PDT, Alberto Garcia
no flags
Patch (2.45 KB, patch)
2013-05-09 08:13 PDT, Alberto Garcia
no flags
Alberto Garcia
Comment 1 2013-04-22 02:24:51 PDT
Carlos Garcia Campos
Comment 2 2013-04-22 02:44:44 PDT
Comment on attachment 199008 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199008&action=review > Source/WebCore/plugins/PluginDatabase.cpp:398 > -#if defined(XP_UNIX) > +#if PLATFORM(BLACKBERRY) > + paths.append(BlackBerry::Platform::Settings::instance()->applicationPluginDirectory().c_str()); > +#elif defined(XP_UNIX) This is tricky because XP_UNIX is defined for BlackBerry port. Maybe we could do something like: #if defined(XP_UNIX) && !PLATFORM(BLACKBERRY) .... #elif PLATFORM(BLACKBERRY) ...
Alberto Garcia
Comment 3 2013-04-22 02:59:49 PDT
(In reply to comment #2) > This is tricky because XP_UNIX is defined for BlackBerry port. Maybe we could do something like: > > #if defined(XP_UNIX) && !PLATFORM(BLACKBERRY) > .... > #elif PLATFORM(BLACKBERRY) > ... That's indeed an alternative, I was just following the same solution we already have in PluginDatabase::isPreferredPluginDirectory().
Alberto Garcia
Comment 4 2013-05-09 08:13:33 PDT
Created attachment 201237 [details] Patch Ok, this patch adds an explicit !PLATFORM(BLACKBERRY) where XP_UNIX is used but we don't want to use that code.
Rob Buis
Comment 5 2013-05-09 08:19:37 PDT
Comment on attachment 199008 [details] Patch Ok.
Rob Buis
Comment 6 2013-05-09 08:21:04 PDT
Comment on attachment 201237 [details] Patch Ok.
Alberto Garcia
Comment 7 2013-05-09 08:21:11 PDT
Comment on attachment 199008 [details] Patch This is actually obsoleted by the other patch.
WebKit Commit Bot
Comment 8 2013-05-09 08:43:31 PDT
Comment on attachment 201237 [details] Patch Clearing flags on attachment: 201237 Committed r149812: <http://trac.webkit.org/changeset/149812>
WebKit Commit Bot
Comment 9 2013-05-09 08:43:33 PDT
All reviewed patches have been landed. Closing bug.
Note You need to log in before you can comment on or make changes to this bug.