43266 2010-07-30 11:26:45 -0700 Implement NPN_InvokeDefault 2010-07-30 11:47:56 -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 258309 0 andersca 2010-07-30 11:26:45 -0700 Implement NPN_InvokeDefault 258312 1 63089 andersca 2010-07-30 11:30:46 -0700 Created attachment 63089 Patch 258314 2 63089 sam 2010-07-30 11:41:38 -0700 Comment on attachment 63089 Patch Very nice. And a fine death to another ExecState. r=me 258317 3 andersca 2010-07-30 11:47:56 -0700 Committed r64365: <http://trac.webkit.org/changeset/64365> 63089 2010-07-30 11:30:46 -0700 2010-07-30 11:41:37 -0700 Patch bug-43266-20100730113045.patch text/plain 15708 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDcwMTcyZGM2ZTllZDlmMTczOTQ2YjE2NGQ1NDRlOTY0MWM5YjBiNi4uMzU5NWMwOWY2NzIyNzIx ZTRlODJhMjZmZTU2ZGUxOTllMmI4ODk2MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAxMC0wNy0zMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBOUE5fSW52b2tlRGVmYXVsdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMyNjYKKwor ICAgICAgICAqIGJpbmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjppc1BsdWdpbkVsZW1lbnQpOgorICAgICAgICBBZGQgY29udmVuaWVuY2Ug ZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYkNvcmU6OnBsdWdpbkluc3RhbmNlKToKKyAgICAgICAg Q2FsbCBpc1BsdWdpbkVsZW1lbnQuCisKKyAgICAgICAgKFdlYkNvcmU6OnBsdWdpblNjcmlwdE9i amVjdEZyb21QbHVnaW5WaWV3QmFzZSk6CisgICAgICAgIEdpdmVuIGFuIEpTSFRNTEVsZW1lbnQs IGFzayB0aGUgUGx1Z2luVmlld0Jhc2UgZm9yIHRoZSBzY3JpcHRhYmxlIG9iamVjdC4KKworICAg ICAgICAoV2ViQ29yZTo6cGx1Z2luU2NyaXB0T2JqZWN0KToKKyAgICAgICAgQ2FsbCBpc1BsdWdp bkVsZW1lbnQuIENhbGwgcGx1Z2luU2NyaXB0T2JqZWN0RnJvbVBsdWdpblZpZXdCYXNlLgorCisg ICAgICAgIChXZWJDb3JlOjpjYWxsUGx1Z2luKToKKyAgICAgICAgR2V0IHRoZSBzY3JpcHQgb2Jq ZWN0LCBhc3NlbWJsZSB0aGUgYXJndW1lbnRzIGFuZCBjYWxsICJjYWxsIiBkaXJlY3RseS4KKwor ICAgICAgICAoV2ViQ29yZTo6cnVudGltZU9iamVjdEdldENhbGxEYXRhKToKKyAgICAgICAgVHJ5 IHRvIGdldCB0aGUgc2NyaXB0IG9iamVjdCBmcm9tIHRoZSBQbHVnaW5WaWV3QmFzZSBmaXJzdC4K KworICAgICAgICAqIHBsdWdpbnMvUGx1Z2luVmlld0Jhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6 OlBsdWdpblZpZXdCYXNlOjpzY3JpcHRPYmplY3QpOgorICAgICAgICBSZW1vdmUgRXhlY1N0YXRl IHBhcmFtZXRlci4KKwogMjAxMC0wNy0zMCAgQWRhbSBSb2JlbiAgPGFyb2JlbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIHVzZXMgb2YgQ0FDRkNvbnRleHRSZWYgYW5kIENBUmVuZGVyKiBm cm9tIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQbHVnaW5FbGVt ZW50RnVuY3Rpb25zLmNwcCBiL1dlYkNvcmUvYmluZGluZ3MvanMvSlNQbHVnaW5FbGVtZW50RnVu Y3Rpb25zLmNwcAppbmRleCBjZjQzZTkxODM4NDk0NjNjOWQ2NTQzZjZmNGE3ZjQ4YWFiZmRlNzc5 Li44OTNiOTY3NTEwZjE5MTM3ZmFmZTU0OTY1MGY2MDFjNTQ2ZTVlN2QyIDEwMDY0NAotLS0gYS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTUGx1Z2luRWxlbWVudEZ1bmN0aW9ucy5jcHAKKysrIGIvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU1BsdWdpbkVsZW1lbnRGdW5jdGlvbnMuY3BwCkBAIC0zNSwxMiAr MzUsMTggQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAogLy8gUnVudGltZSBvYmplY3Qg c3VwcG9ydCBjb2RlIGZvciBKU0hUTUxBcHBsZXRFbGVtZW50LCBKU0hUTUxFbWJlZEVsZW1lbnQg YW5kIEpTSFRNTE9iamVjdEVsZW1lbnQuCiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1BsdWdpbkVs ZW1lbnQoTm9kZSogbm9kZSkKK3sKKyAgICByZXR1cm4gbm9kZS0+aGFzVGFnTmFtZShvYmplY3RU YWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoZW1iZWRUYWcpIHx8IG5vZGUtPmhhc1RhZ05hbWUoYXBw bGV0VGFnKTsKK30KKwogSW5zdGFuY2UqIHBsdWdpbkluc3RhbmNlKE5vZGUqIG5vZGUpCiB7CiAg ICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4gMDsKLSAgICBpZiAoIShub2RlLT5oYXNUYWdO YW1lKG9iamVjdFRhZykgfHwgbm9kZS0+aGFzVGFnTmFtZShlbWJlZFRhZykgfHwgbm9kZS0+aGFz VGFnTmFtZShhcHBsZXRUYWcpKSkKKyAgICBpZiAoIWlzUGx1Z2luRWxlbWVudChub2RlKSkKICAg ICAgICAgcmV0dXJuIDA7CisKICAgICBIVE1MUGx1Z0luRWxlbWVudCogcGx1Z0luRWxlbWVudCA9 IHN0YXRpY19jYXN0PEhUTUxQbHVnSW5FbGVtZW50Kj4obm9kZSk7CiAgICAgLy8gVGhlIHBsdWdp biBlbGVtZW50IGhvbGRzIGFuIG93bmluZyByZWZlcmVuY2UsIHNvIHdlIGRvbid0IGhhdmUgdG8u CiAgICAgSW5zdGFuY2UqIGluc3RhbmNlID0gcGx1Z0luRWxlbWVudC0+Z2V0SW5zdGFuY2UoKS5n ZXQoKTsKQEAgLTQ5LDIyICs1NSw0MCBAQCBJbnN0YW5jZSogcGx1Z2luSW5zdGFuY2UoTm9kZSog bm9kZSkKICAgICByZXR1cm4gaW5zdGFuY2U7CiB9CiAKK3N0YXRpYyBKU09iamVjdCogcGx1Z2lu U2NyaXB0T2JqZWN0RnJvbVBsdWdpblZpZXdCYXNlKEhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5F bGVtZW50LCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQoreworICAgIFdpZGdldCogcGx1 Z2luV2lkZ2V0ID0gcGx1Z2luRWxlbWVudC0+cGx1Z2luV2lkZ2V0KCk7CisgICAgaWYgKCFwbHVn aW5XaWRnZXQpCisgICAgICAgIHJldHVybiAwOworICAgIAorICAgIGlmICghcGx1Z2luV2lkZ2V0 LT5pc1BsdWdpblZpZXdCYXNlKCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgUGx1Z2luVmll d0Jhc2UqIHBsdWdpblZpZXdCYXNlID0gc3RhdGljX2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPihwbHVn aW5XaWRnZXQpOworICAgIHJldHVybiBwbHVnaW5WaWV3QmFzZS0+c2NyaXB0T2JqZWN0KGdsb2Jh bE9iamVjdCk7Cit9CisKK3N0YXRpYyBKU09iamVjdCogcGx1Z2luU2NyaXB0T2JqZWN0RnJvbVBs dWdpblZpZXdCYXNlKEpTSFRNTEVsZW1lbnQqIGpzSFRNTEVsZW1lbnQpCit7CisgICAgSFRNTEVs ZW1lbnQqIGVsZW1lbnQgPSBqc0hUTUxFbGVtZW50LT5pbXBsKCk7CisgICAgaWYgKCFpc1BsdWdp bkVsZW1lbnQoZWxlbWVudCkpCisgICAgICAgIHJldHVybiAwOworCisgICAgSFRNTFBsdWdJbkVs ZW1lbnQqIHBsdWdpbkVsZW1lbnQgPSBzdGF0aWNfY2FzdDxIVE1MUGx1Z0luRWxlbWVudCo+KGVs ZW1lbnQpOworICAgIHJldHVybiBwbHVnaW5TY3JpcHRPYmplY3RGcm9tUGx1Z2luVmlld0Jhc2Uo cGx1Z2luRWxlbWVudCwganNIVE1MRWxlbWVudC0+Z2xvYmFsT2JqZWN0KCkpOworfQorCiBKU09i amVjdCogcGx1Z2luU2NyaXB0T2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNIVE1MRWxlbWVudCog anNIVE1MRWxlbWVudCkKIHsKICAgICBIVE1MRWxlbWVudCogZWxlbWVudCA9IGpzSFRNTEVsZW1l bnQtPmltcGwoKTsKLSAgICBpZiAoIShlbGVtZW50LT5oYXNUYWdOYW1lKG9iamVjdFRhZykgfHwg ZWxlbWVudC0+aGFzVGFnTmFtZShlbWJlZFRhZykgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShhcHBs ZXRUYWcpKSkKKyAgICBpZiAoIWlzUGx1Z2luRWxlbWVudChlbGVtZW50KSkKICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICBIVE1MUGx1Z0luRWxlbWVudCogcGx1Z2luRWxlbWVudCA9IHN0YXRpY19j YXN0PEhUTUxQbHVnSW5FbGVtZW50Kj4oZWxlbWVudCk7CiAKICAgICAvLyBGaXJzdCwgc2VlIGlm IHdlIGNhbiBhc2sgdGhlIHBsdWctaW4gdmlldyBmb3IgaXRzIHNjcmlwdCBvYmplY3QuCi0gICAg aWYgKFdpZGdldCogcGx1Z2luV2lkZ2V0ID0gcGx1Z2luRWxlbWVudC0+cGx1Z2luV2lkZ2V0KCkp IHsKLSAgICAgICAgaWYgKHBsdWdpbldpZGdldC0+aXNQbHVnaW5WaWV3QmFzZSgpKSB7Ci0gICAg ICAgICAgICBQbHVnaW5WaWV3QmFzZSogcGx1Z2luVmlld0Jhc2UgPSBzdGF0aWNfY2FzdDxQbHVn aW5WaWV3QmFzZSo+KHBsdWdpbldpZGdldCk7Ci0gICAgICAgICAgICBpZiAoSlNPYmplY3QqIHNj cmlwdE9iamVjdCA9IHBsdWdpblZpZXdCYXNlLT5zY3JpcHRPYmplY3QoZXhlYywganNIVE1MRWxl bWVudC0+Z2xvYmFsT2JqZWN0KCkpKQotICAgICAgICAgICAgICAgIHJldHVybiBzY3JpcHRPYmpl Y3Q7Ci0gICAgICAgIH0KLSAgICB9CisgICAgaWYgKEpTT2JqZWN0KiBzY3JpcHRPYmplY3QgPSBw bHVnaW5TY3JpcHRPYmplY3RGcm9tUGx1Z2luVmlld0Jhc2UocGx1Z2luRWxlbWVudCwganNIVE1M RWxlbWVudC0+Z2xvYmFsT2JqZWN0KCkpKQorICAgICAgICByZXR1cm4gc2NyaXB0T2JqZWN0Owog CiAgICAgLy8gT3RoZXJ3aXNlLCBmYWxsIGJhY2sgdG8gZ2V0dGluZyB0aGUgb2JqZWN0IGZyb20g dGhlIGluc3RhbmNlLgogCkBAIC0xMjcsMTUgKzE1MSwzOSBAQCBib29sIHJ1bnRpbWVPYmplY3RD dXN0b21QdXQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUs IEpTVgogCiBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjYWxsUGx1Z2luKEV4 ZWNTdGF0ZSogZXhlYykKIHsKLSAgICBJbnN0YW5jZSogaW5zdGFuY2UgPSBwbHVnaW5JbnN0YW5j ZShzdGF0aWNfY2FzdDxKU0hUTUxFbGVtZW50Kj4oZXhlYy0+Y2FsbGVlKCkpLT5pbXBsKCkpOwot ICAgIGluc3RhbmNlLT5iZWdpbigpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0gaW5zdGFuY2UtPmlu dm9rZURlZmF1bHRNZXRob2QoZXhlYyk7Ci0gICAgaW5zdGFuY2UtPmVuZCgpOworICAgIEpTSFRN TEVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxKU0hUTUxFbGVtZW50Kj4oZXhlYy0+Y2Fs bGVlKCkpOworCisgICAgLy8gR2V0IHRoZSBwbHVnLWluIHNjcmlwdCBvYmplY3QuCisgICAgSlNP YmplY3QqIHNjcmlwdE9iamVjdCA9IHBsdWdpblNjcmlwdE9iamVjdChleGVjLCBlbGVtZW50KTsK KyAgICBBU1NFUlQoc2NyaXB0T2JqZWN0KTsKKworICAgIHNpemVfdCBhcmd1bWVudENvdW50ID0g ZXhlYy0+YXJndW1lbnRDb3VudCgpOworICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGFyZ3VtZW50 TGlzdDsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50Q291bnQ7IGkrKykKKyAg ICAgICAgYXJndW1lbnRMaXN0LmFwcGVuZChleGVjLT5hcmd1bWVudChpKSk7CisKKyAgICBDYWxs RGF0YSBjYWxsRGF0YTsKKyAgICBDYWxsVHlwZSBjYWxsVHlwZSA9IGdldENhbGxEYXRhKHNjcmlw dE9iamVjdCwgY2FsbERhdGEpOworICAgIEFTU0VSVChjYWxsVHlwZSA9PSBDYWxsVHlwZUhvc3Qp OworCisgICAgLy8gQ2FsbCB0aGUgb2JqZWN0LgorICAgIEpTVmFsdWUgcmVzdWx0ID0gY2FsbChl eGVjLCBzY3JpcHRPYmplY3QsIGNhbGxUeXBlLCBjYWxsRGF0YSwgZXhlYy0+aG9zdFRoaXNWYWx1 ZSgpLCBhcmd1bWVudExpc3QpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUocmVzdWx0KTsK IH0KIAogQ2FsbFR5cGUgcnVudGltZU9iamVjdEdldENhbGxEYXRhKEpTSFRNTEVsZW1lbnQqIGVs ZW1lbnQsIENhbGxEYXRhJiBjYWxsRGF0YSkKIHsKKyAgICAvLyBGaXJzdCwgYXNrIHRoZSBwbHVn LWluIHZpZXcgYmFzZSBmb3IgaXRzIHJ1bnRpbWUgb2JqZWN0LgorICAgIGlmIChKU09iamVjdCog c2NyaXB0T2JqZWN0ID0gcGx1Z2luU2NyaXB0T2JqZWN0RnJvbVBsdWdpblZpZXdCYXNlKGVsZW1l bnQpKSB7CisgICAgICAgIENhbGxEYXRhIHNjcmlwdE9iamVjdENhbGxEYXRhOworICAgICAgICAK KyAgICAgICAgaWYgKHNjcmlwdE9iamVjdC0+Z2V0Q2FsbERhdGEoc2NyaXB0T2JqZWN0Q2FsbERh dGEpID09IENhbGxUeXBlTm9uZSkKKyAgICAgICAgICAgIHJldHVybiBDYWxsVHlwZU5vbmU7CisK KyAgICAgICAgY2FsbERhdGEubmF0aXZlLmZ1bmN0aW9uID0gY2FsbFBsdWdpbjsKKyAgICAgICAg cmV0dXJuIENhbGxUeXBlSG9zdDsKKyAgICB9CisgICAgCiAgICAgSW5zdGFuY2UqIGluc3RhbmNl ID0gcGx1Z2luSW5zdGFuY2UoZWxlbWVudC0+aW1wbCgpKTsKICAgICBpZiAoIWluc3RhbmNlIHx8 ICFpbnN0YW5jZS0+c3VwcG9ydHNJbnZva2VEZWZhdWx0TWV0aG9kKCkpCiAgICAgICAgIHJldHVy biBDYWxsVHlwZU5vbmU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlld0Jh c2UuaCBiL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCmluZGV4IDNjNDNjMDA5ZGNl NTQyMzc5ZmNlMDk5NjhlODlhMjIxOTA4MGNhZDcuLjRlNWZlMWFkNTU5YTRiNzA3ZTA0NGM2ZmQw NWUyZTg1MTM5NjdiOGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFz ZS5oCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3QmFzZS5oCkBAIC00NCw3ICs0NCw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFBsYXRmb3JtTGF5ZXIqIHBsYXRmb3JtTGF5ZXIoKSBj b25zdCB7IHJldHVybiAwOyB9CiAjZW5kaWYKIAotICAgIHZpcnR1YWwgSlNDOjpKU09iamVjdCog c2NyaXB0T2JqZWN0KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU0dsb2JhbE9iamVjdCopIHsgcmV0 dXJuIDA7IH0KKyAgICB2aXJ0dWFsIEpTQzo6SlNPYmplY3QqIHNjcmlwdE9iamVjdChKU0M6OkpT R2xvYmFsT2JqZWN0KikgeyByZXR1cm4gMDsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgUGx1Z2luVmll d0Jhc2UoUGxhdGZvcm1XaWRnZXQgd2lkZ2V0KSA6IFdpZGdldCh3aWRnZXQpIHsgfQpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBmMDMwOWNi NGQzMzc5YWRkMDU1Mzc4NzM1ZGM1MzZlMGRkOTJiYmE3Li5hYmEzOGVmMjgyMTk1MTJmZGFlM2Ux MDkzNTJhOGU5MjA0NmU4MmQ3IDEwMDY0NAotLS0gYS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9X ZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEwLTA3LTMwICBBbmRlcnMgQ2Fy bHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IE5QTl9JbnZva2VEZWZhdWx0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzI2NgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpK U05QT2JqZWN0OjpKU05QT2JqZWN0KToKKyAgICAgICAgUmVtb3ZlIEV4ZWNTdGF0ZSBwYXJhbWV0 ZXIuCisKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6Y2FsbE9iamVjdCk6CisgICAgICAg IENhbGwgdGhlIE5QQ2xhc3M6Omludm9rZURlZmF1bHQgZnVuY3Rpb24uCisKKyAgICAgICAgKFdl YktpdDo6Y2FsbE5QSlNPYmplY3QpOgorICAgICAgICBDYWxsIEpTTlBPYmplY3Q6OmNhbGxPYmpl Y3QuCisKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6Z2V0Q2FsbERhdGEpOgorICAgICAg ICBDaGVjayBpZiB0aGUgTlBDbGFzcyBoYXMgYW4gaW52b2tlRGVmYXVsdCBmdW5jdGlvbi4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0Lmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5jcHA6CisgICAgICAgIChXZWJLaXQ6 Ok5QUnVudGltZU9iamVjdE1hcDo6Z2V0T3JDcmVhdGVKU09iamVjdCk6CisgICAgICAgIFJlbW92 ZSBFeGVjU3RhdGUgcGFyYW1ldGVyLgorCisgICAgICAgIChXZWJLaXQ6Ok5QUnVudGltZU9iamVj dE1hcDo6Y29udmVydE5QVmFyaWFudFRvSlNWYWx1ZSk6CisgICAgICAgIFJlbW92ZSBFeGVjU3Rh dGUgcGFyYW1ldGVyLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpzY3JpcHRPYmplY3QpOgorICAgICAg ICBSZW1vdmUgRXhlY1N0YXRlIHBhcmFtZXRlci4KKwogMjAxMC0wNy0zMCAgQmFsYXpzIEtlbGVt ZW4gIDxrYkBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXgu CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmNwcCBi L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuY3BwCmluZGV4IDI4YzA4MjE2 YTdjYjQ5MjFiZjczMmJlZGM5MjhiMzMxZTBmOGZiNjEuLjE4ZDBmMjdjNWJkMmZhZWRlZjlhZjEy N2QyMjRmMGIwZDA4Y2Y2ZjggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L0pTTlBPYmplY3QuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmpl Y3QuY3BwCkBAIC00Nyw3ICs0Nyw3IEBAIHN0YXRpYyBOUElkZW50aWZpZXIgbnBJZGVudGlmaWVy RnJvbUlkZW50aWZpZXIoY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllcikKIAogY29uc3QgQ2xh c3NJbmZvIEpTTlBPYmplY3Q6OnNfaW5mbyA9IHsgIk5QT2JqZWN0IiwgMCwgMCwgMCB9OwogCi1K U05QT2JqZWN0OjpKU05QT2JqZWN0KEV4ZWNTdGF0ZSosIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QsIE5QUnVudGltZU9iamVjdE1hcCogb2JqZWN0TWFwLCBOUE9iamVjdCogbnBPYmplY3Qp CitKU05QT2JqZWN0OjpKU05QT2JqZWN0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QsIE5Q UnVudGltZU9iamVjdE1hcCogb2JqZWN0TWFwLCBOUE9iamVjdCogbnBPYmplY3QpCiAgICAgOiBK U09iamVjdFdpdGhHbG9iYWxPYmplY3QoZ2xvYmFsT2JqZWN0LCBjcmVhdGVTdHJ1Y3R1cmUoZ2xv YmFsT2JqZWN0LT5vYmplY3RQcm90b3R5cGUoKSkpCiAgICAgLCBtX29iamVjdE1hcChvYmplY3RN YXApCiAgICAgLCBtX25wT2JqZWN0KG5wT2JqZWN0KQpAQCAtOTYsNiArOTYsNDIgQEAgSlNWYWx1 ZSBKU05QT2JqZWN0OjpjYWxsTWV0aG9kKEV4ZWNTdGF0ZSogZXhlYywgTlBJZGVudGlmaWVyIG1l dGhvZE5hbWUpCiAgICAgcmV0dXJuIHByb3BlcnR5VmFsdWU7CiB9CiAKK0pTQzo6SlNWYWx1ZSBK U05QT2JqZWN0OjpjYWxsT2JqZWN0KEpTQzo6RXhlY1N0YXRlKiBleGVjKQoreworICAgIGlmICgh bV9ucE9iamVjdCkKKyAgICAgICAgcmV0dXJuIHRocm93SW52YWxpZEFjY2Vzc0Vycm9yKGV4ZWMp OworCisgICAgc2l6ZV90IGFyZ3VtZW50Q291bnQgPSBleGVjLT5hcmd1bWVudENvdW50KCk7Cisg ICAgVmVjdG9yPE5QVmFyaWFudCwgOD4gYXJndW1lbnRzKGFyZ3VtZW50Q291bnQpOworICAgIAor ICAgIC8vIENvbnZlcnQgYWxsIGFyZ3VtZW50cyB0byBOUFZhcmlhbnRzLgorICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgYXJndW1lbnRDb3VudDsgKytpKQorICAgICAgICBtX29iamVjdE1hcC0+ Y29udmVydEpTVmFsdWVUb05QVmFyaWFudChleGVjLCBleGVjLT5hcmd1bWVudChpKSwgYXJndW1l bnRzW2ldKTsKKyAgICAKKyAgICBib29sIHJldHVyblZhbHVlOworICAgIE5QVmFyaWFudCByZXN1 bHQ7CisgICAgVk9JRF9UT19OUFZBUklBTlQocmVzdWx0KTsKKworICAgIHsKKyAgICAgICAgSlNM b2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VBc3NlcnRpb25zT25seSk7Cisg ICAgICAgIHJldHVyblZhbHVlID0gbV9ucE9iamVjdC0+X2NsYXNzLT5pbnZva2VEZWZhdWx0KG1f bnBPYmplY3QsIGFyZ3VtZW50cy5kYXRhKCksIGFyZ3VtZW50Q291bnQsICZyZXN1bHQpOworICAg ICAgICAKKyAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBpbnZva2VEZWZhdWx0IHNldHRpbmcgYW4g ZXhjZXB0aW9uLgorICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQgd2hhdCBoYXBwZW5zIGlmIGNh bGxpbmcgaW52b2tlRGVmYXVsdCBjYXVzZXMgdGhlIHBsdWctaW4gdG8gZ28gYXdheS4KKyAgICB9 CisKKyAgICAvLyBSZWxlYXNlIGFsbCBhcmd1bWVudHM7CisgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBhcmd1bWVudENvdW50OyArK2kpCisgICAgICAgIHJlbGVhc2VOUFZhcmlhbnRWYWx1ZSgm YXJndW1lbnRzW2ldKTsKKworICAgIGlmICghcmV0dXJuVmFsdWUpCisgICAgICAgIHRocm93RXJy b3IoZXhlYywgY3JlYXRlRXJyb3IoZXhlYywgIkVycm9yIGNhbGxpbmcgbWV0aG9kIG9uIE5QT2Jq ZWN0LiIpKTsKKworICAgIEpTVmFsdWUgcHJvcGVydHlWYWx1ZSA9IG1fb2JqZWN0TWFwLT5jb252 ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlKGV4ZWMsIGdsb2JhbE9iamVjdCgpLCByZXN1bHQpOworICAg IHJlbGVhc2VOUFZhcmlhbnRWYWx1ZSgmcmVzdWx0KTsKKyAgICByZXR1cm4gcHJvcGVydHlWYWx1 ZTsKK30KKwogSlNWYWx1ZSBKU05QT2JqZWN0OjpjYWxsQ29uc3RydWN0b3IoRXhlY1N0YXRlKiBl eGVjKQogewogICAgIGlmICghbV9ucE9iamVjdCkKQEAgLTEyOCw2ICsxNjQsMjMgQEAgSlNWYWx1 ZSBKU05QT2JqZWN0OjpjYWxsQ29uc3RydWN0b3IoRXhlY1N0YXRlKiBleGVjKQogICAgIHJldHVy biB2YWx1ZTsKIH0KIAorc3RhdGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY2FsbE5Q SlNPYmplY3QoRXhlY1N0YXRlKiBleGVjKQoreworICAgIEpTT2JqZWN0KiBvYmplY3QgPSBleGVj LT5jYWxsZWUoKTsKKyAgICBBU1NFUlQob2JqZWN0LT5pbmhlcml0cygmSlNOUE9iamVjdDo6c19p bmZvKSk7CisKKyAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHN0YXRpY19jYXN0PEpTTlBPYmpl Y3QqPihvYmplY3QpLT5jYWxsT2JqZWN0KGV4ZWMpKTsKK30KKworSlNDOjpDYWxsVHlwZSBKU05Q T2JqZWN0OjpnZXRDYWxsRGF0YShKU0M6OkNhbGxEYXRhJiBjYWxsRGF0YSkKK3sKKyAgICBpZiAo IW1fbnBPYmplY3QgfHwgIW1fbnBPYmplY3QtPl9jbGFzcy0+aW52b2tlRGVmYXVsdCkKKyAgICAg ICAgcmV0dXJuIENhbGxUeXBlTm9uZTsKKworICAgIGNhbGxEYXRhLm5hdGl2ZS5mdW5jdGlvbiA9 IGNhbGxOUEpTT2JqZWN0OworICAgIHJldHVybiBDYWxsVHlwZUhvc3Q7Cit9CisKIHN0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnN0cnVjdFdpdGhDb25zdHJ1Y3RvcihFeGVj U3RhdGUqIGV4ZWMpCiB7CiAgICAgSlNPYmplY3QqIGNvbnN0cnVjdG9yID0gZXhlYy0+Y2FsbGVl KCk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0Lmgg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmgKaW5kZXggOTY4NWE1OWNh NDM5OWQ0NTRmYmM4NGZmOTVlNGE5MzYxZGEyZDgwZi4uMGZiOGU1YThmNmIyN2VhNjE0YmQxNzll Y2ZmYzdiYzI0ZmI2ZmQyOCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv SlNOUE9iamVjdC5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3Qu aApAQCAtMzksMTAgKzM5LDExIEBAIGNsYXNzIE5QUnVudGltZU9iamVjdE1hcDsKIAogY2xhc3Mg SlNOUE9iamVjdCA6IHB1YmxpYyBKU0M6OkpTT2JqZWN0V2l0aEdsb2JhbE9iamVjdCB7CiBwdWJs aWM6Ci0gICAgSlNOUE9iamVjdChKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNHbG9iYWxPYmplY3Qq LCBOUFJ1bnRpbWVPYmplY3RNYXAqIG9iamVjdE1hcCwgTlBPYmplY3QqIG5wT2JqZWN0KTsKKyAg ICBKU05QT2JqZWN0KEpTQzo6SlNHbG9iYWxPYmplY3QqLCBOUFJ1bnRpbWVPYmplY3RNYXAqIG9i amVjdE1hcCwgTlBPYmplY3QqIG5wT2JqZWN0KTsKICAgICB+SlNOUE9iamVjdCgpOwogCiAgICAg SlNDOjpKU1ZhbHVlIGNhbGxNZXRob2QoSlNDOjpFeGVjU3RhdGUqLCBOUElkZW50aWZpZXIgbWV0 aG9kTmFtZSk7CisgICAgSlNDOjpKU1ZhbHVlIGNhbGxPYmplY3QoSlNDOjpFeGVjU3RhdGUqKTsK ICAgICBKU0M6OkpTVmFsdWUgY2FsbENvbnN0cnVjdG9yKEpTQzo6RXhlY1N0YXRlKik7CiAKICAg ICBzdGF0aWMgY29uc3QgSlNDOjpDbGFzc0luZm8gc19pbmZvOwpAQCAtNTUsNiArNTYsNyBAQCBw cml2YXRlOgogICAgICAgICByZXR1cm4gSlNDOjpTdHJ1Y3R1cmU6OmNyZWF0ZShwcm90b3R5cGUs IEpTQzo6VHlwZUluZm8oSlNDOjpPYmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyksIEFub255bW91 c1Nsb3RDb3VudCk7CiAgICAgfQogCisgICAgdmlydHVhbCBKU0M6OkNhbGxUeXBlIGdldENhbGxE YXRhKEpTQzo6Q2FsbERhdGEmKTsKICAgICB2aXJ0dWFsIEpTQzo6Q29uc3RydWN0VHlwZSBnZXRD b25zdHJ1Y3REYXRhKEpTQzo6Q29uc3RydWN0RGF0YSYpOwogCiAgICAgdmlydHVhbCBib29sIGdl dE93blByb3BlcnR5U2xvdChKU0M6OkV4ZWNTdGF0ZSosIGNvbnN0IEpTQzo6SWRlbnRpZmllciYg cHJvcGVydHlOYW1lLCBKU0M6OlByb3BlcnR5U2xvdCYpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmNwcCBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5jcHAKaW5kZXggZDg4MTVhZjU5NGViZDg3 NTljN2ZkN2Y4NTYyMWNkNjkwOTYzYmRhOC4uNzZmMzZjODMzMDAyMmU1M2I1YzYxMjVkZThjNGY3 ODdlZWZmOTMzNyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50 aW1lT2JqZWN0TWFwLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRp bWVPYmplY3RNYXAuY3BwCkBAIC02NiwxMCArNjYsMTAgQEAgdm9pZCBOUFJ1bnRpbWVPYmplY3RN YXA6Om5wSlNPYmplY3REZXN0cm95ZWQoTlBKU09iamVjdCogbnBKU09iamVjdCkKICAgICBtX29i amVjdHMucmVtb3ZlKG5wSlNPYmplY3QtPmpzT2JqZWN0KCkpOwogfQogCi1KU09iamVjdCogTlBS dW50aW1lT2JqZWN0TWFwOjpnZXRPckNyZWF0ZUpTT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgTlBPYmplY3QqIG5wT2JqZWN0KQorSlNPYmplY3Qq IE5QUnVudGltZU9iamVjdE1hcDo6Z2V0T3JDcmVhdGVKU09iamVjdChKU0dsb2JhbE9iamVjdCog Z2xvYmFsT2JqZWN0LCBOUE9iamVjdCogbnBPYmplY3QpCiB7CiAgICAgLy8gRklYTUU6IENoZWNr IGlmIHdlIGFscmVhZHkgaGF2ZSBhIHdyYXBwZXIgZm9yIHRoaXMgTlBPYmplY3QhCi0gICAgcmV0 dXJuIG5ldyAoZXhlYykgSlNOUE9iamVjdChleGVjLCBnbG9iYWxPYmplY3QsIHRoaXMsIG5wT2Jq ZWN0KTsKKyAgICByZXR1cm4gbmV3IChnbG9iYWxPYmplY3QtPmdsb2JhbERhdGEoKSkgSlNOUE9i amVjdChnbG9iYWxPYmplY3QsIHRoaXMsIG5wT2JqZWN0KTsKIH0KIAogdm9pZCBOUFJ1bnRpbWVP YmplY3RNYXA6OmpzTlBPYmplY3REZXN0cm95ZWQoSlNOUE9iamVjdCoganNOUE9iamVjdCkKQEAg LTEwNyw3ICsxMDcsNyBAQCBKU1ZhbHVlIE5QUnVudGltZU9iamVjdE1hcDo6Y29udmVydE5QVmFy aWFudFRvSlNWYWx1ZShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOgogCiAgICAgICAgIEFTU0VS VChnbG9iYWxPYmplY3QpOwogCi0gICAgICAgIHJldHVybiBnZXRPckNyZWF0ZUpTT2JqZWN0KGV4 ZWMsIGdsb2JhbE9iamVjdCwgbnBPYmplY3QpOworICAgICAgICByZXR1cm4gZ2V0T3JDcmVhdGVK U09iamVjdChnbG9iYWxPYmplY3QsIG5wT2JqZWN0KTsKICAgICB9CiAgICAgfQogCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RNYXAuaCBiL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5oCmluZGV4IDZmMzI2 M2M1YjQxZjY0NjQ1ZjU4MWFhNzAwYmEwYzQ3ZDc5MTMzNzkuLjY3YTU4NjA5MWY0OTQyZDkxYmY3 MjBhMmMzZWEwNzRmOGUwZDBkODYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05QUnVudGltZU9iamVjdE1hcC5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05QUnVudGltZU9iamVjdE1hcC5oCkBAIC01Niw3ICs1Niw3IEBAIHB1YmxpYzoKICAgICB2b2lk IG5wSlNPYmplY3REZXN0cm95ZWQoTlBKU09iamVjdCopOwogCiAgICAgLy8gUmV0dXJucyBhIEpT T2JqZWN0IG9iamVjdCB0aGF0IHdyYXBzIHRoZSBnaXZlbiBOUE9iamVjdC4KLSAgICBKU0M6OkpT T2JqZWN0KiBnZXRPckNyZWF0ZUpTT2JqZWN0KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU0dsb2Jh bE9iamVjdCosIE5QT2JqZWN0Kik7CisgICAgSlNDOjpKU09iamVjdCogZ2V0T3JDcmVhdGVKU09i amVjdChKU0M6OkpTR2xvYmFsT2JqZWN0KiwgTlBPYmplY3QqKTsKIAogICAgIHZvaWQganNOUE9i amVjdERlc3Ryb3llZChKU05QT2JqZWN0Kik7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5jcHAKaW5kZXggOWY2YjljNzM1ZTUwNGY5MDQ3MmE2OWFhMmZhMzEyYWExN2Fm ODBiZS4uYTlmMjhlY2E3N2E1OTc5NDliMjBlODdhNGEwYjUzNTE4ZDc2MmI4ZCAxMDA2NDQKLS0t IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKQEAgLTI4MiwxMyArMjgyLDEzIEBA IHZvaWQgUGx1Z2luVmlldzo6aW5pdGlhbGl6ZVBsdWdpbigpCiAgICAgbV9pc0luaXRpYWxpemVk ID0gdHJ1ZTsKIH0KIAotSlNPYmplY3QqIFBsdWdpblZpZXc6OnNjcmlwdE9iamVjdChFeGVjU3Rh dGUqIGV4ZWMsIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCitKU09iamVjdCogUGx1Z2lu Vmlldzo6c2NyaXB0T2JqZWN0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpCiB7CiAgICAg TlBPYmplY3QqIHNjcmlwdGFibGVOUE9iamVjdCA9IG1fcGx1Z2luLT5wbHVnaW5TY3JpcHRhYmxl TlBPYmplY3QoKTsKICAgICBpZiAoIXNjcmlwdGFibGVOUE9iamVjdCkKICAgICAgICAgcmV0dXJu IDA7CiAKLSAgICBKU09iamVjdCoganNPYmplY3QgPSBtX25wUnVudGltZU9iamVjdE1hcC5nZXRP ckNyZWF0ZUpTT2JqZWN0KGV4ZWMsIGdsb2JhbE9iamVjdCwgc2NyaXB0YWJsZU5QT2JqZWN0KTsK KyAgICBKU09iamVjdCoganNPYmplY3QgPSBtX25wUnVudGltZU9iamVjdE1hcC5nZXRPckNyZWF0 ZUpTT2JqZWN0KGdsb2JhbE9iamVjdCwgc2NyaXB0YWJsZU5QT2JqZWN0KTsKICAgICByZWxlYXNl TlBPYmplY3Qoc2NyaXB0YWJsZU5QT2JqZWN0KTsKIAogICAgIHJldHVybiBqc09iamVjdDsKZGlm ZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaAppbmRleCBhNDQwMTE1MzUwMTEyZmE1 OTcxYTU0MDRkZDA2MWIzYWE4MGYxOTc5Li5iZWU4NTUzZGJjMDQ5MWYxMmQ0YTUzMDJlYzI5ZWI2 MGE2ZjllMWNmIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCkBAIC04 MSw3ICs4MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjYW5jZWxBbGxTdHJlYW1zKCk7CiAKICAg ICAvLyBXZWJDb3JlOjpQbHVnaW5WaWV3QmFzZQotICAgIHZpcnR1YWwgSlNDOjpKU09iamVjdCog c2NyaXB0T2JqZWN0KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU0dsb2JhbE9iamVjdCopOworICAg IHZpcnR1YWwgSlNDOjpKU09iamVjdCogc2NyaXB0T2JqZWN0KEpTQzo6SlNHbG9iYWxPYmplY3Qq KTsKICAgICAKICAgICAvLyBXZWJDb3JlOjpXaWRnZXQKICAgICB2aXJ0dWFsIHZvaWQgc2V0RnJh bWVSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsK