55967 2011-03-08 14:20:29 -0800 NPAPI - jvalue conversion should not be in JavaInstance 2011-03-09 10:17:53 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 55966 55383 55765 1 steveblock webkit-unassigned andreip jorlow steveblock oldest_to_newest 364155 0 steveblock 2011-03-08 14:20:29 -0800 The logic to convert between NPAPI and jvalue values does not belong in JavaInstance, as this class logically represents a Java object and should not know about NPAPI types. Instead, this logic should be moved out of JavaInstance (and into JavaNPObject in the case of V8). This will also allow all implementors of the new JavaInstance interface to share this logic. See Bug 55383. 364412 1 85153 steveblock 2011-03-09 03:47:06 -0800 Created attachment 85153 Patch 364556 2 85153 jorlow 2011-03-09 09:59:50 -0800 Comment on attachment 85153 Patch r=me 364561 3 andreip 2011-03-09 10:05:50 -0800 LGTM 364566 4 steveblock 2011-03-09 10:17:53 -0800 Committed r80647: <http://trac.webkit.org/changeset/80647> 85153 2011-03-09 03:47:06 -0800 2011-03-09 09:59:50 -0800 Patch bug-55967-20110309114704.patch text/plain 6112 steveblock U3VidmVyc2lvbiBSZXZpc2lvbjogODA2MzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAxOWFlMWQ1NTI0YjdiYTI2 N2I3Y2I4NDhmZDE5NmVmNTQyMmI0Y2VhLi40NTY5YTUwMDBmYjkxOTZmOGE5OGQzOTc4YTRiMjM0 ZTdjMjEzNDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMDkgIFN0ZXZl IEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5QQVBJIC0ganZhbHVlIGNvbnZlcnNpb24gc2hvdWxk IG5vdCBiZSBpbiBKYXZhSW5zdGFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU1OTY3CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCByZWZhY3Rvcmlu ZyBvbmx5LgorCisgICAgICAgICogYnJpZGdlL2puaS92OC9KYXZhSW5zdGFuY2VWOC5jcHA6Cisg ICAgICAgIChKYXZhSW5zdGFuY2U6Omludm9rZU1ldGhvZCk6CisgICAgICAgICogYnJpZGdlL2pu aS92OC9KYXZhSW5zdGFuY2VWOC5oOgorICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSmF2YU5QT2Jq ZWN0VjguY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6SmF2YU5QT2JqZWN0SW52b2tlKToK KwogMjAxMS0wMy0wOCAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYnJpZGdlL2puaS92OC9KYXZhSW5zdGFuY2VWOC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9icmlk Z2Uvam5pL3Y4L0phdmFJbnN0YW5jZVY4LmNwcAppbmRleCBkMmE1ZDYzNDI0N2JkYzljMThmYzc2 NzRhZjg2YzMzY2NhNDk3MWViLi5iYjBhYjk5NTE3YjdiNzRkMTQ1NWVjNzQwNTAwMjhhNjlkMWVi OGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5j ZVY4LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0phdmFJbnN0YW5jZVY4 LmNwcApAQCAtNjgsNDYgKzY4LDEwIEBAIEphdmFDbGFzcyogSmF2YUluc3RhbmNlOjpnZXRDbGFz cygpIGNvbnN0CiAgICAgcmV0dXJuIG1fY2xhc3M7CiB9CiAKLWJvb2wgSmF2YUluc3RhbmNlOjpp bnZva2VNZXRob2QoY29uc3QgY2hhciogbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmdz LCBpbnQgY291bnQsIE5QVmFyaWFudCogcmVzdWx0VmFsdWUpCitqdmFsdWUgSmF2YUluc3RhbmNl OjppbnZva2VNZXRob2QoY29uc3QgSmF2YU1ldGhvZCogbWV0aG9kLCBqdmFsdWUqIGFyZ3MpCiB7 Ci0gICAgVk9JRF9UT19OUFZBUklBTlQoKnJlc3VsdFZhbHVlKTsKLQotICAgIE1ldGhvZExpc3Qg bWV0aG9kTGlzdCA9IGdldENsYXNzKCktPm1ldGhvZHNOYW1lZChtZXRob2ROYW1lKTsKLQotICAg IHNpemVfdCBudW1NZXRob2RzID0gbWV0aG9kTGlzdC5zaXplKCk7Ci0KLSAgICAvLyBUcnkgdG8g ZmluZCBhIGdvb2QgbWF0Y2ggZm9yIHRoZSBvdmVybG9hZGVkIG1ldGhvZC4gIFRoZQotICAgIC8v IGZ1bmRhbWVudGFsIHByb2JsZW0gaXMgdGhhdCBKYXZhU2NyaXB0IGRvZXNuJ3QgaGF2ZSB0aGUK LSAgICAvLyBub3Rpb24gb2YgbWV0aG9kIG92ZXJsb2FkaW5nIGFuZCBKYXZhIGRvZXMuICBXZSBj b3VsZAotICAgIC8vIGdldCBhIGJpdCBtb3JlIHNvcGhpc3RpY2F0ZWQgYW5kIGF0dGVtcHQgdG8g ZG9lcyBzb21lCi0gICAgLy8gdHlwZSBjaGVja2luZyBhcyB3ZSBhcyBjaGVja2luZyB0aGUgbnVt YmVyIG9mIHBhcmFtZXRlcnMuCi0gICAgSmF2YU1ldGhvZCogYU1ldGhvZDsKLSAgICBKYXZhTWV0 aG9kKiBtZXRob2QgPSAwOwotICAgIGZvciAoc2l6ZV90IG1ldGhvZEluZGV4ID0gMDsgbWV0aG9k SW5kZXggPCBudW1NZXRob2RzOyBtZXRob2RJbmRleCsrKSB7Ci0gICAgICAgIGFNZXRob2QgPSBt ZXRob2RMaXN0W21ldGhvZEluZGV4XTsKLSAgICAgICAgaWYgKGFNZXRob2QtPm51bVBhcmFtZXRl cnMoKSA9PSBjb3VudCkgewotICAgICAgICAgICAgbWV0aG9kID0gYU1ldGhvZDsKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotICAgIGlmICghbWV0aG9kKQotICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0KLSAgICBjb25zdCBKYXZhTWV0aG9kKiBqTWV0aG9kID0gc3RhdGljX2Nh c3Q8Y29uc3QgSmF2YU1ldGhvZCo+KG1ldGhvZCk7Ci0KLSAgICBqdmFsdWUqIGpBcmdzID0gMDsK LSAgICBpZiAoY291bnQgPiAwKQotICAgICAgICBqQXJncyA9IHN0YXRpY19jYXN0PGp2YWx1ZSo+ KG1hbGxvYyhjb3VudCAqIHNpemVvZihqdmFsdWUpKSk7Ci0KLSAgICBmb3IgKGludCBpID0gMDsg aSA8IGNvdW50OyBpKyspCi0gICAgICAgIGpBcmdzW2ldID0gY29udmVydE5QVmFyaWFudFRvSlZh bHVlKGFyZ3NbaV0sIGpNZXRob2QtPnBhcmFtZXRlckF0KGkpKTsKLQotICAgIGp2YWx1ZSByZXN1 bHQgPSBjYWxsSk5JTWV0aG9kKGphdmFJbnN0YW5jZSgpLCBqTWV0aG9kLT5KTklSZXR1cm5UeXBl KCksIGpNZXRob2QtPm5hbWUoKS51dGY4KCkuZGF0YSgpLCBqTWV0aG9kLT5zaWduYXR1cmUoKSwg akFyZ3MpOwotCi0gICAgY29udmVydEpWYWx1ZVRvTlBWYXJpYW50KHJlc3VsdCwgak1ldGhvZC0+ Sk5JUmV0dXJuVHlwZSgpLCBqTWV0aG9kLT5yZXR1cm5UeXBlKCksIHJlc3VsdFZhbHVlKTsKLSAg ICBmcmVlKGpBcmdzKTsKLQotICAgIHJldHVybiB0cnVlOworICAgIEFTU0VSVChnZXRDbGFzcygp LT5tZXRob2RzTmFtZWQobWV0aG9kLT5uYW1lKCkudXRmOCgpKS5maW5kKG1ldGhvZCkgIT0gbm90 Rm91bmQpOworICAgIHJldHVybiBjYWxsSk5JTWV0aG9kKGphdmFJbnN0YW5jZSgpLCBtZXRob2Qt PkpOSVJldHVyblR5cGUoKSwgbWV0aG9kLT5uYW1lKCkudXRmOCgpLCBtZXRob2QtPnNpZ25hdHVy ZSgpLCBhcmdzKTsKIH0KIAogI2VuZGlmIC8vIEVOQUJMRShKQVZBX0JSSURHRSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUluc3RhbmNlVjguaCBiL1NvdXJj ZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YUluc3RhbmNlVjguaAppbmRleCA4ZWUzMTk1NjIw Nzk3ODI5MWI2MTJkMWNhNGRiYTQwMWFkNzU4ZjQwLi43ZDUyYzI0OWEzMjkwMzM0ZTM1OTY0ZmZi NWZjYmViMjlkNGE5NzI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9icmlkZ2Uvam5pL3Y4 L0phdmFJbnN0YW5jZVY4LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZh SW5zdGFuY2VWOC5oCkBAIC00Myw2ICs0Myw3IEBAIG5hbWVzcGFjZSBKU0MgewogbmFtZXNwYWNl IEJpbmRpbmdzIHsKIAogY2xhc3MgSmF2YUNsYXNzOworY2xhc3MgSmF2YU1ldGhvZDsKIAogY2xh c3MgSmF2YUluc3RhbmNlIDogcHVibGljIFJlZkNvdW50ZWQ8SmF2YUluc3RhbmNlPiB7CiBwdWJs aWM6CkBAIC01MCw5ICs1MSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5KYXZhSW5zdGFuY2Uo KTsKIAogICAgIEphdmFDbGFzcyogZ2V0Q2xhc3MoKSBjb25zdDsKLQotICAgIGJvb2wgaW52b2tl TWV0aG9kKGNvbnN0IGNoYXIqIG5hbWUsIGNvbnN0IE5QVmFyaWFudCogYXJncywgaW50IGFyZ3ND b3VudCwgTlBWYXJpYW50KiByZXN1bHQpOwotCisgICAganZhbHVlIGludm9rZU1ldGhvZChjb25z dCBKYXZhTWV0aG9kKiwganZhbHVlKiBhcmdzKTsKICAgICBqb2JqZWN0IGphdmFJbnN0YW5jZSgp IGNvbnN0IHsgcmV0dXJuIG1faW5zdGFuY2UtPm1faW5zdGFuY2U7IH0KIAogICAgIC8vIFRoZXNl IGZ1bmN0aW9ucyBhcmUgY2FsbGVkIGJlZm9yZSBhbmQgYWZ0ZXIgdGhlIG1haW4gZW50cnkgcG9p bnRzIGludG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9qbmkvdjgvSmF2YU5Q T2JqZWN0VjguY3BwIGIvU291cmNlL1dlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhTlBPYmplY3RW OC5jcHAKaW5kZXggOTY4OWE5OWVhMmFhYmU1ZGQ3MDk0MmQ4MWI1MzU5NTZhNzMyNWU2Mi4uMzY4 MWZjMDVkMzM5ZDgwNTI5MGZjZGRiYTM4ZTgwNmRkYmZhZWJlMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYnJpZGdlL2puaS92OC9KYXZhTlBPYmplY3RWOC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYnJpZGdlL2puaS92OC9KYXZhTlBPYmplY3RWOC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAK ICNpbmNsdWRlICJKYXZhQ2xhc3NWOC5oIgogI2luY2x1ZGUgIkphdmFGaWVsZFY4LmgiCiAjaW5j bHVkZSAiSmF2YUluc3RhbmNlVjguaCIKKyNpbmNsdWRlICJKYXZhTWV0aG9kLmgiCiAjaW5jbHVk ZSAibnBydW50aW1lX2ltcGwuaCIKIAogbmFtZXNwYWNlIEpTQyB7CkBAIC0xMTUsMTIgKzExNiw0 MyBAQCBib29sIEphdmFOUE9iamVjdEludm9rZShOUE9iamVjdCogb2JqLCBOUElkZW50aWZpZXIg aWRlbnRpZmllciwgY29uc3QgTlBWYXJpYW50KgogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBpbnN0YW5jZS0+YmVnaW4oKTsKLSAgICBib29sIHIgPSBpbnN0YW5jZS0+aW52b2tlTWV0aG9k KG5hbWUsIGFyZ3MsIGFyZ0NvdW50LCByZXN1bHQpOwotICAgIGluc3RhbmNlLT5lbmQoKTsKIAor ICAgIE1ldGhvZExpc3QgbWV0aG9kTGlzdCA9IGluc3RhbmNlLT5nZXRDbGFzcygpLT5tZXRob2Rz TmFtZWQobmFtZSk7CiAgICAgLy8gVE9ETzogdXNlIE5QTl9NZW1GcmVlCiAgICAgZnJlZShuYW1l KTsKLSAgICByZXR1cm4gcjsKKworICAgIC8vIFRyeSB0byBmaW5kIGEgZ29vZCBtYXRjaCBmb3Ig dGhlIG92ZXJsb2FkZWQgbWV0aG9kLiBUaGUKKyAgICAvLyBmdW5kYW1lbnRhbCBwcm9ibGVtIGlz IHRoYXQgSmF2YVNjcmlwdCBkb2Vzbid0IGhhdmUgdGhlCisgICAgLy8gbm90aW9uIG9mIG1ldGhv ZCBvdmVybG9hZGluZyBhbmQgSmF2YSBkb2VzLiBXZSBjb3VsZAorICAgIC8vIGdldCBhIGJpdCBt b3JlIHNvcGhpc3RpY2F0ZWQgYW5kIGF0dGVtcHQgdG8gZG8gc29tZQorICAgIC8vIHR5cGUgY2hl Y2tpbmcgYXMgd2VsbCBhcyBjaGVja2luZyB0aGUgbnVtYmVyIG9mIHBhcmFtZXRlcnMuCisgICAg c2l6ZV90IG51bU1ldGhvZHMgPSBtZXRob2RMaXN0LnNpemUoKTsKKyAgICBKYXZhTWV0aG9kKiBh TWV0aG9kOworICAgIEphdmFNZXRob2QqIGpNZXRob2QgPSAwOworICAgIGZvciAoc2l6ZV90IG1l dGhvZEluZGV4ID0gMDsgbWV0aG9kSW5kZXggPCBudW1NZXRob2RzOyBtZXRob2RJbmRleCsrKSB7 CisgICAgICAgIGFNZXRob2QgPSBtZXRob2RMaXN0W21ldGhvZEluZGV4XTsKKyAgICAgICAgaWYg KGFNZXRob2QtPm51bVBhcmFtZXRlcnMoKSA9PSBzdGF0aWNfY2FzdDxpbnQ+KGFyZ0NvdW50KSkg eworICAgICAgICAgICAgak1ldGhvZCA9IGFNZXRob2Q7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgfQorICAgIH0KKyAgICBpZiAoIWpNZXRob2QpCisgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgIGp2YWx1ZSogakFyZ3MgPSAwOworICAgIGlmIChhcmdDb3VudCA+IDApCisgICAgICAg IGpBcmdzID0gc3RhdGljX2Nhc3Q8anZhbHVlKj4obWFsbG9jKGFyZ0NvdW50ICogc2l6ZW9mKGp2 YWx1ZSkpKTsKKworICAgIGZvciAodW5zaWduZWQgaW50IGkgPSAwOyBpIDwgYXJnQ291bnQ7IGkr KykKKyAgICAgICAgakFyZ3NbaV0gPSBjb252ZXJ0TlBWYXJpYW50VG9KVmFsdWUoYXJnc1tpXSwg ak1ldGhvZC0+cGFyYW1ldGVyQXQoaSkpOworCisgICAganZhbHVlIGpSZXN1bHQgPSBpbnN0YW5j ZS0+aW52b2tlTWV0aG9kKGpNZXRob2QsIGpBcmdzKTsKKyAgICBpbnN0YW5jZS0+ZW5kKCk7Cisg ICAgZnJlZShqQXJncyk7CisKKyAgICBWT0lEX1RPX05QVkFSSUFOVCgqcmVzdWx0KTsKKyAgICBj b252ZXJ0SlZhbHVlVG9OUFZhcmlhbnQoalJlc3VsdCwgak1ldGhvZC0+Sk5JUmV0dXJuVHlwZSgp LCBqTWV0aG9kLT5yZXR1cm5UeXBlKCksIHJlc3VsdCk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAK IGJvb2wgSmF2YU5QT2JqZWN0SGFzUHJvcGVydHkoTlBPYmplY3QqIG9iaiwgTlBJZGVudGlmaWVy IGlkZW50aWZpZXIpCg==