Summary: | PluginDatabase: add plugin directory for the BlackBerry port. | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Alberto Garcia <berto> | ||||||
Component: | WebKit BlackBerry | Assignee: | Nobody <webkit-unassigned> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | cgarcia, commit-queue, rwlbuis, xan.lopez | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Bug Depends on: | |||||||||
Bug Blocks: | 111729 | ||||||||
Attachments: |
|
Description
Alberto Garcia
2013-04-22 02:22:53 PDT
Created attachment 199008 [details]
Patch
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) ... (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(). 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 on attachment 199008 [details]
Patch
Ok.
Comment on attachment 201237 [details]
Patch
Ok.
Comment on attachment 199008 [details]
Patch
This is actually obsoleted by the other patch.
Comment on attachment 201237 [details] Patch Clearing flags on attachment: 201237 Committed r149812: <http://trac.webkit.org/changeset/149812> All reviewed patches have been landed. Closing bug. |