92780 2012-07-31 11:59:07 -0700 Prefer the Oracle Java plug-in over the Apple Java plug-in 2012-07-31 15:45:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 683345 0 andersca 2012-07-31 11:59:07 -0700 Prefer the Oracle Java plug-in over the Apple Java plug-in 683351 1 155601 andersca 2012-07-31 12:03:27 -0700 Created attachment 155601 Patch 683549 2 andersca 2012-07-31 15:45:03 -0700 Committed r124259: <http://trac.webkit.org/changeset/124259> 155601 2012-07-31 12:03:27 -0700 2012-07-31 15:32:50 -0700 Patch bug-92780-20120731120311.patch text/plain 3493 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTgzZTczZDYzZDFlNzI4 MzUwNzJmODE1NTU4NzllZWZkM2Y2Nzk4NS4uYTQ4YmI2ZDJkYTRhNWYxNDM2ZWQwODQxNGM4YTQ0 OTI4ODNkMzRiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA3LTMxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUHJlZmVyIHRoZSBP cmFjbGUgSmF2YSBwbHVnLWluIG92ZXIgdGhlIEFwcGxlIEphdmEgcGx1Zy1pbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI3ODAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5z L21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW06CisgICAgICAgIChXZWJLaXQ6OmZpbmRQbHVnaW5X aXRoQnVuZGxlSWRlbnRpZmllcik6CisgICAgICAgIEFkZCBhIG5ldyBoZWxwZXIgZm9yIGZpbmRp bmcgYSBwbHVnLWluIHdpdGggdGhlIGdpdmVuIGJ1bmRsZSBpZGVudGlmaWVyLgorCisgICAgICAg IChXZWJLaXQ6OmNoZWNrRm9yUHJlZmVycmVkUGx1Z2luKToKKyAgICAgICAgSGVscGVyIGZ1bmN0 aW9uIGZvciBtYWtpbmcgc3VyZSB0aGF0IGFuIG9sZCBwbHVnLWluIGlzIG5ldmVyIGxvYWRlZCBp ZiBhIG5ldyBwbHVnLWluIGlzIGZvdW5kLCBhbmQgdGhhdCB0aGUgb2xkIHBsdWctaW4KKyAgICAg ICAgaXMgcmVtb3ZlZCBmcm9tIHRoZSBsaXN0IG9mIGxvYWRlZCBwbHVnLWlucyBpZiB0aGUgbmV3 IHBsdWctaW4gaXMgZm91bmQuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpz aG91bGRVc2VQbHVnaW4pOgorICAgICAgICBQcmVmZXIgdGhlIE9yYWNsZSBKYXZhIHBsdWctaW4g b3ZlciB0aGUgQXBwbGUgSmF2YSBwbHVnLWluLgorCiAyMDEyLTA3LTMwICBSYWZhZWwgQnJhbmRh byAgPHJhZmFlbC5sb2JvQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgW1dLMl0gS2lsbCB0aGUg Y29uY2VwdCBvZiBzZWNvbmRhcnkgc2hhcmVkIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCmlu ZGV4IDg2ODhjZmE3OWViNDZkY2QyZjYxYTJiODk5MmE3MjFkYTY2NDIyNjguLjJhZjgxOGQxNDI3 ZDRiMGFkYzVlYTI0OTM0NDRkY2I5NGZjYmMzZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQpAQCAt ODIsNiArODIsMzMgQEAgYm9vbCBQbHVnaW5JbmZvU3RvcmU6OmdldFBsdWdpbkluZm8oY29uc3Qg U3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW5Nb2R1bGVJbmZvJgogI2VuZGlmCiB9CiAKK3N0YXRp YyBzaXplX3QgZmluZFBsdWdpbldpdGhCdW5kbGVJZGVudGlmaWVyKGNvbnN0IFZlY3RvcjxQbHVn aW5Nb2R1bGVJbmZvPiYgcGx1Z2lucywgY29uc3QgU3RyaW5nJiBidW5kbGVJZGVudGlmaWVyKQor eworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcGx1Z2lucy5zaXplKCk7ICsraSkgeworICAg ICAgICBpZiAocGx1Z2luc1tpXS5idW5kbGVJZGVudGlmaWVyID09IGJ1bmRsZUlkZW50aWZpZXIp CisgICAgICAgICAgICByZXR1cm4gaTsKKyAgICB9CisKKyAgICByZXR1cm4gbm90Rm91bmQ7Cit9 CisKKy8vIFJldHVybnMgdHJ1ZSBpZiB0aGUgZ2l2ZW4gcGx1Zy1pbiBzaG91bGQgYmUgbG9hZGVk LCBmYWxzZSBvdGhlcndpc2UuCitzdGF0aWMgYm9vbCBjaGVja0ZvclByZWZlcnJlZFBsdWdpbihW ZWN0b3I8UGx1Z2luTW9kdWxlSW5mbz4mIGFscmVhZHlMb2FkZWRQbHVnaW5zLCBjb25zdCBQbHVn aW5Nb2R1bGVJbmZvJiBwbHVnaW4sIGNvbnN0IFN0cmluZyYgb2xkUGx1Z2luQnVuZGxlSWRlbnRp ZmllciwgY29uc3QgU3RyaW5nJiBuZXdQbHVnaW5CdW5kbGVJZGVudGlmaWVyKQoreworICAgIGlm IChwbHVnaW4uYnVuZGxlSWRlbnRpZmllciA9PSBvbGRQbHVnaW5CdW5kbGVJZGVudGlmaWVyKSB7 CisgICAgICAgIC8vIElmIHdlJ3ZlIGFscmVhZHkgZm91bmQgdGhlIG5ldyBwbHVnLWluLCB3ZSBk b24ndCB3YW50IHRvIGxvYWQgdGhlIG9sZCBwbHVnLWluLgorICAgICAgICBpZiAoZmluZFBsdWdp bldpdGhCdW5kbGVJZGVudGlmaWVyKGFscmVhZHlMb2FkZWRQbHVnaW5zLCBuZXdQbHVnaW5CdW5k bGVJZGVudGlmaWVyKSAhPSBub3RGb3VuZCkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9IGVsc2UgaWYgKHBsdWdpbi5idW5kbGVJZGVudGlmaWVyID09IG5ld1BsdWdpbkJ1bmRsZUlk ZW50aWZpZXIpIHsKKyAgICAgICAgLy8gSWYgd2UndmUgYWxyZWFkeSBmb3VuZCB0aGUgb2xkIHBs dWctaW4sIHJlbW92ZSBpdCBmcm9tIHRoZSBsaXN0IG9mIGxvYWRlZCBwbHVnLWlucy4KKyAgICAg ICAgc2l6ZV90IG9sZFBsdWdpbkluZGV4ID0gZmluZFBsdWdpbldpdGhCdW5kbGVJZGVudGlmaWVy KGFscmVhZHlMb2FkZWRQbHVnaW5zLCBvbGRQbHVnaW5CdW5kbGVJZGVudGlmaWVyKTsKKyAgICAg ICAgaWYgKG9sZFBsdWdpbkluZGV4ICE9IG5vdEZvdW5kKQorICAgICAgICAgICAgYWxyZWFkeUxv YWRlZFBsdWdpbnMucmVtb3ZlKG9sZFBsdWdpbkluZGV4KTsKKyAgICB9CisKKyAgICByZXR1cm4g dHJ1ZTsKK30KKwogYm9vbCBQbHVnaW5JbmZvU3RvcmU6OnNob3VsZFVzZVBsdWdpbihWZWN0b3I8 UGx1Z2luTW9kdWxlSW5mbz4mIGFscmVhZHlMb2FkZWRQbHVnaW5zLCBjb25zdCBQbHVnaW5Nb2R1 bGVJbmZvJiBwbHVnaW4pCiB7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBhbHJlYWR5TG9h ZGVkUGx1Z2lucy5zaXplKCk7ICsraSkgewpAQCAtOTIsNiArMTE5LDEwIEBAIGJvb2wgUGx1Z2lu SW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4oVmVjdG9yPFBsdWdpbk1vZHVsZUluZm8+JiBhbHJl YWR5TG9hZGVkUGx1CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgLy8g UHJlZmVyIHRoZSBPcmFjbGUgSmF2YSBwbHVnLWluIG92ZXIgdGhlIEFwcGxlIGphdmEgcGx1Zy1p bi4KKyAgICBpZiAoIWNoZWNrRm9yUHJlZmVycmVkUGx1Z2luKGFscmVhZHlMb2FkZWRQbHVnaW5z LCBwbHVnaW4sICJjb20uYXBwbGUuamF2YS5KYXZhQXBwbGV0UGx1Z2luIiwgImNvbS5vcmFjbGUu amF2YS5KYXZhQXBwbGV0UGx1Z2luIikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHJl dHVybiB0cnVlOwogfQogCg==