48864 2010-11-02 13:09:28 -0700 Add some support for remote and local NPObjects to NPRemoteObjectMap 2010-11-02 13:26:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 303598 0 andersca 2010-11-02 13:09:28 -0700 Add some support for remote and local NPObjects to NPRemoteObjectMap 303603 1 72724 andersca 2010-11-02 13:13:08 -0700 Created attachment 72724 Patch 303605 2 72724 aroben 2010-11-02 13:17:08 -0700 Comment on attachment 72724 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72724&action=review > WebKit2/Shared/Plugins/NPVariantData.cpp:109 > + // We special case LocalNPObjectID and RemoteNPObjectID here so a LocalNPObjectID is > + // encoded as a RemoteNPObjectID and vice versa. Should be "special-case" and "decoded", not "special case" and "encoded". Maybe you could explain a little more, saying that the encoded type is from the perspective of the other process, so we have to adjust it to match our own perspective? 303609 3 andersca 2010-11-02 13:26:06 -0700 Committed r71156: <http://trac.webkit.org/changeset/71156> 72724 2010-11-02 13:13:08 -0700 2010-11-02 13:17:07 -0700 Patch bug-48864-20101102131306.patch text/plain 7524 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MDJmMGIxNmViNThiOTJlNTNhNjNjZWM0OWJhNzE1MDI2YTk4MDNmYi4uMzEyMWU3NGZiMjE0NzNk OTg1ODc4MDYwZDkyMjM3MjllODllMjE5NSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzOCBAQAogMjAxMC0xMS0wMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzb21lIHN1cHBvcnQgZm9yIHJlbW90ZSBh bmQgbG9jYWwgTlBPYmplY3RzIHRvIE5QUmVtb3RlT2JqZWN0TWFwCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODg2NAorCisgICAgICAgICogU2hhcmVk L1BsdWdpbnMvTlBSZW1vdGVPYmplY3RNYXAuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUFJlbW90 ZU9iamVjdE1hcDo6bnBWYXJpYW50VG9OUFZhcmlhbnREYXRhKToKKyAgICAgICAgSWYgdGhlIE5Q VmFyaWFudCBjb250YWlucyBhbiBOUE9iamVjdCB0aGF0IGlzbid0IGFuIE5QT2JqZWN0UHJveHks IHJlZ2lzdGVyIGl0CisgICAgICAgIGFuZCByZXR1cm4gaXRzIElELgorCisgICAgICAgIChXZWJL aXQ6Ok5QUmVtb3RlT2JqZWN0TWFwOjpucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQpOgorICAgICAg ICBJZiB0aGUgTlBWYXJpYW50RGF0YSBjb250YWlucyBhIHJlbW90ZSBvYmplY3QsIGNyZWF0ZSBh biBOUE9iamVjdFByb3h5IGFuZCByZXR1cm4gaXQuCisKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lu cy9OUFZhcmlhbnREYXRhLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBWYXJpYW50RGF0YTo6TlBW YXJpYW50RGF0YSk6CisgICAgICAgIEluaXRpYWxpemUgbV9sb2NhbE5QT2JqZWN0SURWYWx1ZSBh bmQgbV9yZW1vdGVOUE9iamVjdElEVmFsdWUuCisKKyAgICAgICAgKFdlYktpdDo6TlBWYXJpYW50 RGF0YTo6bWFrZUxvY2FsTlBPYmplY3RJRCk6CisgICAgICAgIENyZWF0ZSBhbiBOUFZhcmlhbnRE YXRhIHRoYXQgY29udGFpbnMgYSBsb2NhbCBOUE9iamVjdCBJRC4KKworICAgICAgICAoV2ViS2l0 OjpOUFZhcmlhbnREYXRhOjplbmNvZGUpOgorICAgICAgICBIYW5kbGUgbG9jYWwgYW5kIHJlbW90 ZSBOUE9iamVjdCBJRHMuCisKKyAgICAgICAgKFdlYktpdDo6TlBWYXJpYW50RGF0YTo6ZGVjb2Rl KToKKyAgICAgICAgRGVjb2RlIGxvY2FsIGFuZCByZW1vdGUgTlBPYmplY3QgSURzIGFuZCAic3dh cCB0aGVtIiBzbyBhbiBlbmNvZGVkIHJlbW90ZSBOUE9iamVjdCBJRCBpcworICAgICAgICBkZWNv ZGVkIGFzIGEgbG9jYWwgTlBPYmplY3RJRCAoYW5kIHZpY2UgdmVyc2EpLgorCisgICAgICAgICog U2hhcmVkL1BsdWdpbnMvTlBWYXJpYW50RGF0YS5oOgorICAgICAgICAoV2ViS2l0OjpOUFZhcmlh bnREYXRhOjpsb2NhbE5QT2JqZWN0SURWYWx1ZSk6CisgICAgICAgIChXZWJLaXQ6Ok5QVmFyaWFu dERhdGE6OnJlbW90ZU5QT2JqZWN0SURWYWx1ZSk6CisKKzIwMTAtMTEtMDIgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBBdHRlbXB0IHRvIGZpeCBhIEdD QyByZWxlYXNlIG9ubHkgd2FybmluZy4KIAogICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05QVmFy aWFudERhdGEuY3BwOgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFJlbW90 ZU9iamVjdE1hcC5jcHAgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFw LmNwcAppbmRleCA1ZjA4NzlhZTM5OWEwMzU2ODUzM2ZhODdiZmI0Y2Y0NjIyZGM1YmQ2Li4zNDQ0 MGVmZTA0MTU1MDY0NTM5OWMzNDU1YmQ1ZTgwNGVhYjJiYjdhIDEwMDY0NAotLS0gYS9XZWJLaXQy L1NoYXJlZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcAorKysgYi9XZWJLaXQyL1NoYXJl ZC9QbHVnaW5zL05QUmVtb3RlT2JqZWN0TWFwLmNwcApAQCAtMTAyLDkgKzEwMiwyMSBAQCBOUFZh cmlhbnREYXRhIE5QUmVtb3RlT2JqZWN0TWFwOjpucFZhcmlhbnRUb05QVmFyaWFudERhdGEoY29u c3QgTlBWYXJpYW50JiB2YXJpYQogICAgIGNhc2UgTlBWYXJpYW50VHlwZV9OdWxsOgogICAgIGNh c2UgTlBWYXJpYW50VHlwZV9JbnQzMjoKICAgICBjYXNlIE5QVmFyaWFudFR5cGVfU3RyaW5nOgot ICAgIGNhc2UgTlBWYXJpYW50VHlwZV9PYmplY3Q6CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7 CiAgICAgICAgIHJldHVybiBOUFZhcmlhbnREYXRhOjptYWtlVm9pZCgpOworCisgICAgY2FzZSBO UFZhcmlhbnRUeXBlX09iamVjdDogeworICAgICAgICBOUE9iamVjdCogbnBPYmplY3QgPSB2YXJp YW50LnZhbHVlLm9iamVjdFZhbHVlOworICAgICAgICBpZiAoTlBPYmplY3RQcm94eTo6aXNOUE9i amVjdFByb3h5KG5wT2JqZWN0KSkgeworICAgICAgICAgICAgLy8gRklYTUU6IEhhbmRsZSB0aGlz LgorICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHJldHVybiBOUFZh cmlhbnREYXRhOjptYWtlVm9pZCgpOworICAgICAgICB9CisKKyAgICAgICAgdWludDY0X3QgbnBP YmplY3RJRCA9IHJlZ2lzdGVyTlBPYmplY3QobnBPYmplY3QpOworICAgICAgICByZXR1cm4gTlBW YXJpYW50RGF0YTo6bWFrZUxvY2FsTlBPYmplY3RJRChucE9iamVjdElEKTsKKyAgICB9CisKICAg ICB9CiAKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTEyNSw2ICsxMzcsMTUgQEAgTlBW YXJpYW50IE5QUmVtb3RlT2JqZWN0TWFwOjpucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQoY29uc3Qg TlBWYXJpYW50RGF0YSYgbnBWYXIKICAgICBjYXNlIE5QVmFyaWFudERhdGE6OkRvdWJsZToKICAg ICAgICAgRE9VQkxFX1RPX05QVkFSSUFOVChucFZhcmlhbnREYXRhLmRvdWJsZVZhbHVlKCksIG5w VmFyaWFudCk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgTlBWYXJpYW50RGF0YTo6TG9jYWxO UE9iamVjdElEOgorICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICBWT0lEX1RPX05Q VkFSSUFOVChucFZhcmlhbnQpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIE5QVmFyaWFudERh dGE6OlJlbW90ZU5QT2JqZWN0SUQ6IHsKKyAgICAgICAgTlBPYmplY3QqIG5wT2JqZWN0UHJveHkg PSBjcmVhdGVOUE9iamVjdFByb3h5KG5wVmFyaWFudERhdGEucmVtb3RlTlBPYmplY3RJRFZhbHVl KCkpOworICAgICAgICBPQkpFQ1RfVE9fTlBWQVJJQU5UKG5wT2JqZWN0UHJveHksIG5wVmFyaWFu dCk7CisgICAgICAgIGJyZWFrOworICAgIH0KICAgICB9CiAKICAgICByZXR1cm4gbnBWYXJpYW50 OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFZhcmlhbnREYXRhLmNwcCBi L1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBWYXJpYW50RGF0YS5jcHAKaW5kZXggYTM2NTk0ZTcx MWJjZDA3NjIyNThlYjE2ZjkwMWI4N2JkOGViNGJkMi4uOTA4NmUyN2MxMDY5MDcyNTVkNjgxNTY1 OTc0MzRkMTdlODUxYTk3NCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFZh cmlhbnREYXRhLmNwcAorKysgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QVmFyaWFudERhdGEu Y3BwCkBAIC0zNyw2ICszNyw4IEBAIE5QVmFyaWFudERhdGE6Ok5QVmFyaWFudERhdGEoKQogICAg IDogbV90eXBlKE5QVmFyaWFudERhdGE6OlZvaWQpCiAgICAgLCBtX2Jvb2xWYWx1ZShmYWxzZSkK ICAgICAsIG1fZG91YmxlVmFsdWUoMCkKKyAgICAsIG1fbG9jYWxOUE9iamVjdElEVmFsdWUoMCkK KyAgICAsIG1fcmVtb3RlTlBPYmplY3RJRFZhbHVlKDApCiB7CiB9CiAKQEAgLTY1LDYgKzY3LDE2 IEBAIE5QVmFyaWFudERhdGEgTlBWYXJpYW50RGF0YTo6bWFrZURvdWJsZShkb3VibGUgdmFsdWUp CiAgICAgcmV0dXJuIG5wVmFyaWFudERhdGE7CiB9CiAKK05QVmFyaWFudERhdGEgTlBWYXJpYW50 RGF0YTo6bWFrZUxvY2FsTlBPYmplY3RJRCh1aW50NjRfdCB2YWx1ZSkKK3sKKyAgICBOUFZhcmlh bnREYXRhIG5wVmFyaWFudERhdGE7CisKKyAgICBucFZhcmlhbnREYXRhLm1fdHlwZSA9IE5QVmFy aWFudERhdGE6OkxvY2FsTlBPYmplY3RJRDsKKyAgICBucFZhcmlhbnREYXRhLm1fbG9jYWxOUE9i amVjdElEVmFsdWUgPSB2YWx1ZTsKKworICAgIHJldHVybiBucFZhcmlhbnREYXRhOworfQorCiB2 b2lkIE5QVmFyaWFudERhdGE6OmVuY29kZShDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIGVuY29k ZXIpIGNvbnN0CiB7CiAgICAgZW5jb2Rlci0+ZW5jb2RlKG1fdHlwZSk7CkBAIC03MywxOSArODUs MzUgQEAgdm9pZCBOUFZhcmlhbnREYXRhOjplbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVy KiBlbmNvZGVyKSBjb25zdAogICAgIGNhc2UgTlBWYXJpYW50RGF0YTo6Vm9pZDoKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBOUFZhcmlhbnREYXRhOjpCb29sOgotICAgICAgICBlbmNvZGVyLT5l bmNvZGUobV9ib29sVmFsdWUpOworICAgICAgICBlbmNvZGVyLT5lbmNvZGUoYm9vbFZhbHVlKCkp OwogICAgICAgICBicmVhazsKICAgICBjYXNlIE5QVmFyaWFudERhdGE6OkRvdWJsZToKLSAgICAg ICAgZW5jb2Rlci0+ZW5jb2RlKG1fZG91YmxlVmFsdWUpOworICAgICAgICBlbmNvZGVyLT5lbmNv ZGUoZG91YmxlVmFsdWUoKSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTlBWYXJpYW50RGF0 YTo6TG9jYWxOUE9iamVjdElEOgorICAgICAgICBlbmNvZGVyLT5lbmNvZGUobG9jYWxOUE9iamVj dElEVmFsdWUoKSk7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTlBWYXJpYW50RGF0YTo6UmVt b3RlTlBPYmplY3RJRDoKKyAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHJlbW90ZU5QT2JqZWN0SURW YWx1ZSgpKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQogCiBib29sIE5QVmFyaWFudERhdGE6 OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIE5QVmFyaWFudERhdGEm IHJlc3VsdCkKIHsKLSAgICBpZiAoIWRlY29kZXItPmRlY29kZShyZXN1bHQubV90eXBlKSkKKyAg ICB1aW50MzJfdCB0eXBlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHR5cGUpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKKyAgICAvLyBXZSBzcGVjaWFsIGNhc2UgTG9jYWxOUE9iamVjdElE IGFuZCBSZW1vdGVOUE9iamVjdElEIGhlcmUgc28gYSBMb2NhbE5QT2JqZWN0SUQgaXMKKyAgICAv LyBlbmNvZGVkIGFzIGEgUmVtb3RlTlBPYmplY3RJRCBhbmQgdmljZSB2ZXJzYS4KKyAgICBpZiAo dHlwZSA9PSBOUFZhcmlhbnREYXRhOjpMb2NhbE5QT2JqZWN0SUQpCisgICAgICAgIHR5cGUgPSBO UFZhcmlhbnREYXRhOjpSZW1vdGVOUE9iamVjdElEOworICAgIGVsc2UgaWYgKHR5cGUgPT0gTlBW YXJpYW50RGF0YTo6UmVtb3RlTlBPYmplY3RJRCkKKyAgICAgICAgdHlwZSA9IE5QVmFyaWFudERh dGE6OkxvY2FsTlBPYmplY3RJRDsKKworICAgIHJlc3VsdC5tX3R5cGUgPSB0eXBlOworCiAgICAg c3dpdGNoIChyZXN1bHQubV90eXBlKSB7CiAgICAgY2FzZSBOUFZhcmlhbnREYXRhOjpWb2lkOgog ICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTkzLDYgKzEyMSwxMCBAQCBib29sIE5QVmFyaWFudERh dGE6OmRlY29kZShDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIE5QVmFyaWFudERh dGEmIHJlcwogICAgICAgICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlKHJlc3VsdC5tX2Jvb2xWYWx1 ZSk7CiAgICAgY2FzZSBOUFZhcmlhbnREYXRhOjpEb3VibGU6CiAgICAgICAgIHJldHVybiBkZWNv ZGVyLT5kZWNvZGUocmVzdWx0Lm1fZG91YmxlVmFsdWUpOworICAgIGNhc2UgTlBWYXJpYW50RGF0 YTo6TG9jYWxOUE9iamVjdElEOgorICAgICAgICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlKHJlc3Vs dC5tX2xvY2FsTlBPYmplY3RJRFZhbHVlKTsKKyAgICBjYXNlIE5QVmFyaWFudERhdGE6OlJlbW90 ZU5QT2JqZWN0SUQ6CisgICAgICAgIHJldHVybiBkZWNvZGVyLT5kZWNvZGUocmVzdWx0Lm1fcmVt b3RlTlBPYmplY3RJRFZhbHVlKTsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUFZhcmlhbnREYXRh LmggYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QVmFyaWFudERhdGEuaAppbmRleCA3MmM2NzIy NDA4NDU2YmFmMGRjZmVhNjQyY2U4YjJmNmIzYTU4ZDkyLi5jNmRiNWJmZjY4OWI0OWM2OTJkMGFk MGQyMGY5ZTc3MTI5NGQzNGRmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05Q VmFyaWFudERhdGEuaAorKysgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QVmFyaWFudERhdGEu aApAQCAtNDMsMTIgKzQzLDE1IEBAIHB1YmxpYzoKICAgICAgICAgVm9pZCwKICAgICAgICAgQm9v bCwKICAgICAgICAgRG91YmxlLAorICAgICAgICBMb2NhbE5QT2JqZWN0SUQsCisgICAgICAgIFJl bW90ZU5QT2JqZWN0SUQsCiAgICAgfTsKICAgICBOUFZhcmlhbnREYXRhKCk7CiAKICAgICBzdGF0 aWMgTlBWYXJpYW50RGF0YSBtYWtlVm9pZCgpOwogICAgIHN0YXRpYyBOUFZhcmlhbnREYXRhIG1h a2VCb29sKGJvb2wgdmFsdWUpOwogICAgIHN0YXRpYyBOUFZhcmlhbnREYXRhIG1ha2VEb3VibGUo ZG91YmxlIHZhbHVlKTsKKyAgICBzdGF0aWMgTlBWYXJpYW50RGF0YSBtYWtlTG9jYWxOUE9iamVj dElEKHVpbnQ2NF90IHZhbHVlKTsKIAogICAgIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0 YXRpY19jYXN0PFR5cGU+KG1fdHlwZSk7IH0KIApAQCAtNjQsNiArNjcsMTggQEAgcHVibGljOgog ICAgICAgICByZXR1cm4gbV9kb3VibGVWYWx1ZTsKICAgICB9CiAKKyAgICB1aW50NjRfdCBsb2Nh bE5QT2JqZWN0SURWYWx1ZSgpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQodHlwZSgpID09 IE5QVmFyaWFudERhdGE6OkxvY2FsTlBPYmplY3RJRCk7CisgICAgICAgIHJldHVybiBtX2xvY2Fs TlBPYmplY3RJRFZhbHVlOworICAgIH0KKworICAgIHVpbnQ2NF90IHJlbW90ZU5QT2JqZWN0SURW YWx1ZSgpIGNvbnN0CisgICAgeworICAgICAgICBBU1NFUlQodHlwZSgpID09IE5QVmFyaWFudERh dGE6OlJlbW90ZU5QT2JqZWN0SUQpOworICAgICAgICByZXR1cm4gbV9yZW1vdGVOUE9iamVjdElE VmFsdWU7CisgICAgfQorCiAgICAgdm9pZCBlbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVy KikgY29uc3Q7CiAgICAgc3RhdGljIGJvb2wgZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rl ciosIE5QVmFyaWFudERhdGEmKTsKIApAQCAtNzEsNiArODYsOCBAQCBwcml2YXRlOgogICAgIHVp bnQzMl90IG1fdHlwZTsKICAgICBib29sIG1fYm9vbFZhbHVlOwogICAgIGRvdWJsZSBtX2RvdWJs ZVZhbHVlOworICAgIHVpbnQ2NF90IG1fbG9jYWxOUE9iamVjdElEVmFsdWU7CisgICAgdWludDY0 X3QgbV9yZW1vdGVOUE9iamVjdElEVmFsdWU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK