114943 2013-04-22 02:22:53 -0700 PluginDatabase: add plugin directory for the BlackBerry port. 2013-05-09 08:43:33 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111729 0 berto webkit-unassigned cgarcia commit-queue rwlbuis xan.lopez oldest_to_newest 879039 0 berto 2013-04-22 02:22:53 -0700 PluginDatabase::defaultPluginDirectories() doesn't have the BlackBerry plugin directory. 879040 1 199008 berto 2013-04-22 02:24:51 -0700 Created attachment 199008 Patch 879047 2 199008 cgarcia 2013-04-22 02:44:44 -0700 Comment on attachment 199008 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) ... 879052 3 berto 2013-04-22 02:59:49 -0700 (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(). 886859 4 201237 berto 2013-05-09 08:13:33 -0700 Created attachment 201237 Patch Ok, this patch adds an explicit !PLATFORM(BLACKBERRY) where XP_UNIX is used but we don't want to use that code. 886865 5 199008 rwlbuis 2013-05-09 08:19:37 -0700 Comment on attachment 199008 Patch Ok. 886867 6 201237 rwlbuis 2013-05-09 08:21:04 -0700 Comment on attachment 201237 Patch Ok. 886868 7 199008 berto 2013-05-09 08:21:11 -0700 Comment on attachment 199008 Patch This is actually obsoleted by the other patch. 886885 8 201237 commit-queue 2013-05-09 08:43:31 -0700 Comment on attachment 201237 Patch Clearing flags on attachment: 201237 Committed r149812: <http://trac.webkit.org/changeset/149812> 886886 9 commit-queue 2013-05-09 08:43:33 -0700 All reviewed patches have been landed. Closing bug. 199008 2013-04-22 02:24:51 -0700 2013-05-09 08:21:11 -0700 Patch 114943.diff text/plain 1327 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMTFhMDA2Li4wMDc1ZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTMtMDQtMjIgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFBsdWdpbkRhdGFiYXNlOiBhZGQgcGx1Z2luIGRpcmVjdG9yeSBmb3IgdGhlIEJsYWNr QmVycnkgcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDk0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVn aW5EYXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKToKKwogMjAxMy0wNC0yMSAgRGly ayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFtQYXJ0IDRdIFBhcnNlIHRo ZSBjdXN0b20oKSBmdW5jdGlvbiBpbiAtd2Via2l0LWZpbHRlcjogcGFyc2UgdGhlIG1hdE4oKSBm dW5jdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YWJh c2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAKaW5kZXgg NGQwZmZiZS4uNGRhZmE1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVn aW5EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFz ZS5jcHAKQEAgLTM5Myw3ICszOTMsOSBAQCBWZWN0b3I8U3RyaW5nPiBQbHVnaW5EYXRhYmFzZTo6 ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKCkKICAgICBWZWN0b3I8U3RyaW5nPiBwYXRoczsKIAog ICAgIC8vIEFkZCBwYXRocyBzcGVjaWZpYyB0byBlYWNoIHBsYXRmb3JtCi0jaWYgZGVmaW5lZChY UF9VTklYKQorI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCisgICAgcGF0aHMuYXBwZW5kKEJsYWNr QmVycnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2UoKS0+YXBwbGljYXRpb25QbHVnaW5E aXJlY3RvcnkoKS5jX3N0cigpKTsKKyNlbGlmIGRlZmluZWQoWFBfVU5JWCkKICAgICBTdHJpbmcg dXNlclBsdWdpblBhdGggPSBob21lRGlyZWN0b3J5UGF0aCgpOwogICAgIHVzZXJQbHVnaW5QYXRo LmFwcGVuZChTdHJpbmcoIi8ubW96aWxsYS9wbHVnaW5zIikpOwogICAgIHBhdGhzLmFwcGVuZCh1 c2VyUGx1Z2luUGF0aCk7Cg== 201237 2013-05-09 08:13:33 -0700 2013-05-09 08:43:30 -0700 Patch 114943.diff text/plain 2510 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZTc5MGQ1Li5lYjU4Y2U4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDUtMDkgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFBsdWdpbkRhdGFiYXNlOiBhZGQgcGx1Z2luIGRpcmVjdG9yeSBmb3IgdGhlIEJsYWNr QmVycnkgcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDk0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFhQX1VOSVggaXMgZGVmaW5lZCBmb3IgdGhlIEJsYWNrQmVycnkgcG9ydCwgYnV0IHdlIGRv bid0IHdhbnQgdG8KKyAgICAgICAgc2hhcmUgdGhlIHNhbWUgY29kZSBoZXJlLgorCisgICAgICAg ICogcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5E YXRhYmFzZTo6ZGVmYXVsdFBsdWdpbkRpcmVjdG9yaWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpbkRhdGFiYXNlOjppc1ByZWZlcnJlZFBsdWdpbkRpcmVjdG9yeSk6CisKIDIwMTMtMDUtMDkg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQgR1RLIGJ1aWxkIGZpeCBhZnRlciByMTQ5Nzk2LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGx1Z2lucy9QbHVnaW5EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL1Bs dWdpbkRhdGFiYXNlLmNwcAppbmRleCA3NjUwYjU0Li4yZDE3YWJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpbkRhdGFiYXNlLmNwcApAQCAtMzkzLDcgKzM5Myw3IEBAIFZlY3RvcjxT dHJpbmc+IFBsdWdpbkRhdGFiYXNlOjpkZWZhdWx0UGx1Z2luRGlyZWN0b3JpZXMoKQogICAgIFZl Y3RvcjxTdHJpbmc+IHBhdGhzOwogCiAgICAgLy8gQWRkIHBhdGhzIHNwZWNpZmljIHRvIGVhY2gg cGxhdGZvcm0KLSNpZiBkZWZpbmVkKFhQX1VOSVgpCisjaWYgZGVmaW5lZChYUF9VTklYKSAmJiAh UExBVEZPUk0oQkxBQ0tCRVJSWSkKICAgICBTdHJpbmcgdXNlclBsdWdpblBhdGggPSBob21lRGly ZWN0b3J5UGF0aCgpOwogICAgIHVzZXJQbHVnaW5QYXRoLmFwcGVuZChTdHJpbmcoIi8ubW96aWxs YS9wbHVnaW5zIikpOwogICAgIHBhdGhzLmFwcGVuZCh1c2VyUGx1Z2luUGF0aCk7CkBAIC00Mjks NiArNDI5LDggQEAgVmVjdG9yPFN0cmluZz4gUGx1Z2luRGF0YWJhc2U6OmRlZmF1bHRQbHVnaW5E aXJlY3RvcmllcygpCiAgICAgU3RyaW5nIG1velBhdGgoZ2V0ZW52KCJNT1pfUExVR0lOX1BBVEgi KSk7CiAgICAgbW96UGF0aC5zcGxpdChVQ2hhcignOicpLCAvKiBhbGxvd0VtcHR5RW50cmllcyAq LyBmYWxzZSwgbW96UGF0aHMpOwogICAgIHBhdGhzLmFwcGVuZFZlY3Rvcihtb3pQYXRocyk7Cisj ZWxpZiBQTEFURk9STShCTEFDS0JFUlJZKQorICAgIHBhdGhzLmFwcGVuZChCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6U2V0dGluZ3M6Omluc3RhbmNlKCktPmFwcGxpY2F0aW9uUGx1Z2luRGlyZWN0b3J5 KCkuY19zdHIoKSk7CiAjZWxpZiBkZWZpbmVkKFhQX01BQ09TWCkKICAgICBTdHJpbmcgdXNlclBs dWdpblBhdGggPSBob21lRGlyZWN0b3J5UGF0aCgpOwogICAgIHVzZXJQbHVnaW5QYXRoLmFwcGVu ZChTdHJpbmcoIi9MaWJyYXJ5L0ludGVybmV0IFBsdWctSW5zIikpOwpAQCAtNDU1LDEwICs0NTcs MTAgQEAgYm9vbCBQbHVnaW5EYXRhYmFzZTo6aXNQcmVmZXJyZWRQbHVnaW5EaXJlY3RvcnkoY29u c3QgU3RyaW5nJiBwYXRoKQogewogICAgIFN0cmluZyBwcmVmZXJyZWRQYXRoID0gaG9tZURpcmVj dG9yeVBhdGgoKTsKIAotI2lmIFBMQVRGT1JNKEJMQUNLQkVSUlkpCi0gICAgcHJlZmVycmVkUGF0 aCA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0aW5nczo6aW5zdGFuY2UoKS0+YXBwbGljYXRp b25QbHVnaW5EaXJlY3RvcnkoKS5jX3N0cigpOwotI2VsaWYgZGVmaW5lZChYUF9VTklYKQorI2lm IGRlZmluZWQoWFBfVU5JWCkgJiYgIVBMQVRGT1JNKEJMQUNLQkVSUlkpCiAgICAgcHJlZmVycmVk UGF0aC5hcHBlbmQoU3RyaW5nKCIvLm1vemlsbGEvcGx1Z2lucyIpKTsKKyNlbGlmIFBMQVRGT1JN KEJMQUNLQkVSUlkpCisgICAgcHJlZmVycmVkUGF0aCA9IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpT ZXR0aW5nczo6aW5zdGFuY2UoKS0+YXBwbGljYXRpb25QbHVnaW5EaXJlY3RvcnkoKS5jX3N0cigp OwogI2VsaWYgZGVmaW5lZChYUF9NQUNPU1gpCiAgICAgcHJlZmVycmVkUGF0aC5hcHBlbmQoU3Ry aW5nKCIvTGlicmFyeS9JbnRlcm5ldCBQbHVnLUlucyIpKTsKICNlbGlmIGRlZmluZWQoWFBfV0lO KQo=