Bug 114943 - PluginDatabase: add plugin directory for the BlackBerry port.
Summary: PluginDatabase: add plugin directory for the BlackBerry port.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit BlackBerry (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 111729
  Show dependency treegraph
 
Reported: 2013-04-22 02:22 PDT by Alberto Garcia
Modified: 2013-05-09 08:43 PDT (History)
4 users (show)

See Also:


Attachments
Patch (1.30 KB, patch)
2013-04-22 02:24 PDT, Alberto Garcia
no flags Details | Formatted Diff | Diff
Patch (2.45 KB, patch)
2013-05-09 08:13 PDT, Alberto Garcia
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alberto Garcia 2013-04-22 02:22:53 PDT
PluginDatabase::defaultPluginDirectories() doesn't have the BlackBerry plugin directory.
Comment 1 Alberto Garcia 2013-04-22 02:24:51 PDT
Created attachment 199008 [details]
Patch
Comment 2 Carlos Garcia Campos 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)
...
Comment 3 Alberto Garcia 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().
Comment 4 Alberto Garcia 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.
Comment 5 Rob Buis 2013-05-09 08:19:37 PDT
Comment on attachment 199008 [details]
Patch

Ok.
Comment 6 Rob Buis 2013-05-09 08:21:04 PDT
Comment on attachment 201237 [details]
Patch

Ok.
Comment 7 Alberto Garcia 2013-05-09 08:21:11 PDT
Comment on attachment 199008 [details]
Patch

This is actually obsoleted by the other patch.
Comment 8 WebKit Commit Bot 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>
Comment 9 WebKit Commit Bot 2013-05-09 08:43:33 PDT
All reviewed patches have been landed.  Closing bug.