120052 2013-08-19 23:46:36 -0700 Remove custom getOwnPropertyDescriptor for JSProxy 2013-08-20 10:05:59 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough ggaren sam oldest_to_newest 918950 0 barraclough 2013-08-19 23:46:36 -0700 GET_OWN_PROPERTY_DESCRIPTOR_IMPL runs afoul with JSProxy due to the workaround for JSDOMWindow's broken behavior. Because the window object incorrectly searches the prototype chain in getOwnPropertySlot we check that the base object matches, but in the case of JSProxy we can end up comparing the window object to the window shell & falsely assuming this is a prototype property. Add toThis conversion to correctly identify proxied own access. I've kept the original slotBase check as a fast case, and also so that direct access on JSDOMWindow still works. 918953 1 209162 barraclough 2013-08-19 23:51:04 -0700 Created attachment 209162 Fix 919084 2 209162 ggaren 2013-08-20 09:37:53 -0700 Comment on attachment 209162 Fix r=me 919099 3 barraclough 2013-08-20 10:05:59 -0700 Committed revision 154334. 209162 2013-08-19 23:51:04 -0700 2013-08-20 09:37:52 -0700 Fix 120052.1.patch text/plain 3153 barraclough SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU0MzE1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDEzLTA4LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwMDUy CisgICAgICAgIFJlbW92ZSBjdXN0b20gZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9yIGZvciBKU1By b3h5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR0VU X09XTl9QUk9QRVJUWV9ERVNDUklQVE9SX0lNUEwgcnVucyBhZm91bCB3aXRoIEpTUHJveHkgZHVl IHRvIHRoZSB3b3JrYXJvdW5kIGZvciBKU0RPTVdpbmRvdydzIGJyb2tlbiBiZWhhdmlvci4KKyAg ICAgICAgQmVjYXVzZSB0aGUgd2luZG93IG9iamVjdCBpbmNvcnJlY3RseSBzZWFyY2hlcyB0aGUg cHJvdG90eXBlIGNoYWluIGluIGdldE93blByb3BlcnR5U2xvdCB3ZSBjaGVjayB0aGF0IHRoZSBi YXNlCisgICAgICAgIG9iamVjdCBtYXRjaGVzLCBidXQgaW4gdGhlIGNhc2Ugb2YgSlNQcm94eSB3 ZSBjYW4gZW5kIHVwIGNvbXBhcmluZyB0aGUgd2luZG93IG9iamVjdCB0byB0aGUgd2luZG93IHNo ZWxsICYgZmFsc2VseQorICAgICAgICBhc3N1bWluZyB0aGlzIGlzIGEgcHJvdG90eXBlIHByb3Bl cnR5LiBBZGQgdG9UaGlzIGNvbnZlcnNpb24gdG8gY29ycmVjdGx5IGlkZW50aWZ5IHByb3hpZWQg b3duIGFjY2Vzcy4gSSd2ZSBrZXB0CisgICAgICAgIHRoZSBvcmlnaW5hbCBzbG90QmFzZSBjaGVj ayBhcyBhIGZhc3QgY2FzZSwgYW5kIGFsc28gc28gdGhhdCBkaXJlY3QgYWNjZXNzIG9uIEpTRE9N V2luZG93IHN0aWxsIHdvcmtzLgorCisgICAgICAgICogcnVudGltZS9KU1Byb3h5LmNwcDoKKyAg ICAgICAgICAgIC0gUmVtb3ZlIGN1c3RvbSBnZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IgaW1wbGVt ZW50YXRpb24uCisgICAgICAgICogcnVudGltZS9Qcm9wZXJ0eURlc2NyaXB0b3IuaDoKKyAgICAg ICAgICAgIC0gTW9kaWZ5IG93biBwcm9wZXJ0eSBhY2Nlc3MgY2hlY2sgdG8gcGVyZm9ybSB0b1Ro aXMgY29udmVyc2lvbi4KKwogMjAxMy0wOC0xOSAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNs b3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyMDAzNApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNQ cm94eS5jcHAJKHJldmlzaW9uIDE1NDMxMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MiwxMSArODIsNyBAQCBib29sIEpT UHJveHk6OmdldE93blByb3BlcnR5U2xvdEJ5SW5kZXgoCiAgICAgcmV0dXJuIHRoaXNPYmplY3Qt PnRhcmdldCgpLT5tZXRob2RUYWJsZSgpLT5nZXRPd25Qcm9wZXJ0eVNsb3RCeUluZGV4KHRoaXNP YmplY3QtPnRhcmdldCgpLCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwogfQogCi1ib29sIEpT UHJveHk6OmdldE93blByb3BlcnR5RGVzY3JpcHRvcihKU09iamVjdCogb2JqZWN0LCBFeGVjU3Rh dGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5RGVzY3JpcHRvciYg ZGVzY3JpcHRvcikKLXsKLSAgICBKU1Byb3h5KiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTUHJveHkq PihvYmplY3QpOwotICAgIHJldHVybiB0aGlzT2JqZWN0LT50YXJnZXQoKS0+bWV0aG9kVGFibGUo KS0+Z2V0T3duUHJvcGVydHlEZXNjcmlwdG9yKHRoaXNPYmplY3QtPnRhcmdldCgpLCBleGVjLCBw cm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IpOwotfQorR0VUX09XTl9QUk9QRVJUWV9ERVNDUklQVE9S X0lNUEwoSlNQcm94eSkKIAogdm9pZCBKU1Byb3h5OjpwdXQoSlNDZWxsKiBjZWxsLCBFeGVjU3Rh dGUqIGV4ZWMsIFByb3BlcnR5TmFtZSBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmFsdWUsIFB1dFBy b3BlcnR5U2xvdCYgc2xvdCkKIHsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L1Byb3BlcnR5RGVzY3JpcHRvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL1Byb3BlcnR5RGVzY3JpcHRvci5oCShyZXZpc2lvbiAxNTQzMTMpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Qcm9wZXJ0eURlc2NyaXB0b3IuaAkod29ya2luZyBj b3B5KQpAQCAtOTIsNyArOTIsNyBAQCBib29sIENsYXNzTmFtZTo6Z2V0T3duUHJvcGVydHlEZXNj cmlwdG9yCiAgICAgaWYgKCFnZXRPd25Qcm9wZXJ0eVNsb3Qob2JqZWN0LCBleGVjLCBwcm9wZXJ0 eU5hbWUsIHNsb3QpKSBcCiAgICAgICAgIHJldHVybiBmYWxzZTsgXAogICAgIC8qIFdvcmthcm91 bmQsIEpTRE9NV2luZG93OjpnZXRPd25Qcm9wZXJ0eVNsb3Qgc2VhcmNoZXMgdGhlIHByb3RvdHlw ZSBjaGFpbi4gOi0oICovIFwKLSAgICBpZiAoc2xvdC5zbG90QmFzZSgpICYmIHNsb3Quc2xvdEJh c2UoKSAhPSBvYmplY3QpIFwKKyAgICBpZiAoc2xvdC5zbG90QmFzZSgpICE9IG9iamVjdCAmJiBz bG90LnNsb3RCYXNlKCkgJiYgc2xvdC5zbG90QmFzZSgpLT5tZXRob2RUYWJsZSgpLT50b1RoaXMo c2xvdC5zbG90QmFzZSgpLCBleGVjLCBOb3RTdHJpY3RNb2RlKSAhPSBvYmplY3QpIFwKICAgICAg ICAgcmV0dXJuIGZhbHNlOyBcCiAgICAgaWYgKHNsb3QuaXNHZXR0ZXIoKSkgXAogICAgICAgICBk ZXNjcmlwdG9yLnNldEFjY2Vzc29yRGVzY3JpcHRvcihzbG90LmdldHRlclNldHRlcigpLCBzbG90 LmF0dHJpYnV0ZXMoKSk7IFwK