71699 2011-11-07 09:16:16 -0800 Simplify NetscapePlugin::convertPoint and make it work (in theory) with transformed plug-ins 2011-11-07 10:00:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 497229 0 andersca 2011-11-07 09:16:16 -0800 Simplify NetscapePlugin::convertPoint and make it work (in theory) with transformed plug-ins 497247 1 113883 andersca 2011-11-07 09:37:41 -0800 Created attachment 113883 Patch 497261 2 andersca 2011-11-07 10:00:32 -0800 Committed r99437: <http://trac.webkit.org/changeset/99437> 113883 2011-11-07 09:37:41 -0800 2011-11-07 09:56:52 -0800 Patch bug-71699-20111107093753.patch text/plain 11041 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzODYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3N2QyNWE5MDBmMjVkZjQ4 MzMyZTQ0YTEyODk3NGQwNmI0OTBlODNiLi40MjUwOGIxOTkxZDRiYmY1NDNkNmQyY2I3ZjZmZmNk MTkxNzYzYzQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMDcgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBOZXRz Y2FwZVBsdWdpbjo6Y29udmVydFBvaW50IGFuZCBtYWtlIGl0IHdvcmsgKGluIHRoZW9yeSkgd2l0 aCB0cmFuc2Zvcm1lZCBwbHVnLWlucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzE2OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBFeHBvcnQgQWZmaW5lVHJhbnNmb3JtIHN5bWJvbHMgdXNlZCBieSBXZWJL aXQyLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisKIDIwMTEtMTEtMDYgIEFkYW0gQmFy dGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBEb24ndCBjcmFzaCB3aGVuIGEgY29u dGV4dCBoYXNuJ3QgYmVlbiBjcmVhdGVkLiAgVGhpcyBmaXhlZCBhCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmQ5 N2QxZWYyOTdkZDAxMmJlMWM4YzU4YzRlNzEyMzcxNWRmZTM2Ny4uZjZmOWM4NjVmNzg0OGI0M2E4 ZDkwZWU4NTY5ZTdhYjkzODliMGRiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEx LTExLTA3ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg U2ltcGxpZnkgTmV0c2NhcGVQbHVnaW46OmNvbnZlcnRQb2ludCBhbmQgbWFrZSBpdCB3b3JrIChp biB0aGVvcnkpIHdpdGggdHJhbnNmb3JtZWQgcGx1Zy1pbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgZ2V0U2NyZWVuVHJhbnNmb3JtIGZ1bmN0 aW9uIHdoaWNoIGdpdmVuIGEgY29vcmRpbmF0ZSBzcGFjZSByZXR1cm5zIGEgdHJhbnNmb3JtIHRo YXQgY29udmVydHMgYQorICAgICAgICBwb2ludCBmcm9tIHRoYXQgY29vcmRpbmF0ZSBzcGFjZSB0 byB0aGUgc2NyZWVuIGNvb3JkaW5hdGUgc3BhY2UuIFdlIHRoZW4gZ2V0IHRoZSBzb3VyY2UgLT4g c2NyZWVuIHRyYW5zZm9ybQorICAgICAgICBhbmQgdGhlIGRlc3RpbmF0aW9uIC0+IHNjcmVlbiB0 cmFuc2Zvcm0uIFdlIGludmVydCB0aGUgZGVzdGluYXRpb24gLT4gc2NyZWVuIHRyYW5zZm9ybSwg bXVsdGlwbHkgaXQgd2l0aCB0aGUKKyAgICAgICAgc291cmNlIC0+IHNjcmVlbiB0cmFuc2Zvcm0g YW5kIHVzZSBtYXBQb2ludCB0byBnZXQgYSBjb21wbGV0ZSBhZmZpbmUgdHJhbnNmb3JtIGZyb20g dGhlIHNvdXJjZSB0byB0aGUgZGVzdGluYXRpb24gc3BhY2UKKyAgICAgICAgYW5kIHVzZSBtYXBQ b2ludCB0byBtYXAgdGhlIHNvdXJjZSBwb2ludCBhbmQgcmV0dXJuIHRoZSBkZXN0aW5hdGlvbiBw b2ludC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBs dWdpbi5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2Nh cGVQbHVnaW5NYWMubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpnZXRTY3Jl ZW5UcmFuc2Zvcm0pOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6Y29udmVydFBv aW50KToKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6aW5pdGlhbGl6ZVBsdWdpbik6CisgICAgICAgIENh bGwgd2luZG93QW5kVmlld0ZyYW1lc0NoYW5nZWQgYmVmb3JlIHZpZXdHZW9tZXRyeURpZENoYW5n ZSBzbyB0aGF0IHRoZSB3aW5kb3cgYW5kIHZpZXcgZnJhbWVzIHdpbGwgYmUgdXAgdG8gZGF0ZSBi eQorICAgICAgICB0aGUgdGltZSBOUFBfU2V0V2luZG93IGlzIGNhbGxlZCBpbiB0aGUgcGx1Zy1p bi4KKwogMjAxMS0xMS0wMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCBOZXRzY2FwZVBsdWdpbjo6Y29udmVydEZyb21Sb290VmlldwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgppbmRleCAxYmJiYmRiM2ZlMTQ4YmQwY2ExZGJkZjVmM2FlODhkNDFiMmM4ZWE2 Li5iOTUxNTkxMTE2MTdkNzhiNDkxODk2NmE4MTdjNjZjYmQ5N2NjYTFiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgpAQCAtNDAxLDYgKzQwMSw5IEBAIF9fWk43V2ViQ29yZTE0U3RvcmFnZVRyYWNrZXIx N2luaXRpYWxpemVUcmFja2VyRVJLTjNXVEY2U3RyaW5nRVBOU18yMFN0b3JhZ2VUcmFjCiBfX1pO N1dlYkNvcmUxNFN0b3JhZ2VUcmFja2VyMThkaXNrVXNhZ2VGb3JPcmlnaW5FUE5TXzE0U2VjdXJp dHlPcmlnaW5FCiBfX1pON1dlYkNvcmUxNFN0b3JhZ2VUcmFja2VyMzJzeW5jRmlsZVN5c3RlbUFu ZFRyYWNrZXJEYXRhYmFzZUV2CiBfX1pON1dlYkNvcmUxNGVuZE9mUGFyYWdyYXBoRVJLTlNfMTVW aXNpYmxlUG9zaXRpb25FTlNfMjdFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGVFCitfX1pON1dl YkNvcmUxNUFmZmluZVRyYW5zZm9ybTVmbGlwWUV2CitfX1pON1dlYkNvcmUxNUFmZmluZVRyYW5z Zm9ybThtdWx0aXBseUVSS1MwXworX19aTjdXZWJDb3JlMTVBZmZpbmVUcmFuc2Zvcm05dHJhbnNs YXRlRWRkCiBfX1pON1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybUMxRWRkZGRkZAogX19aTjdXZWJD b3JlMTVBZmZpbmVUcmFuc2Zvcm1DMUV2CiBfX1pON1dlYkNvcmUxNUFyY2hpdmVSZXNvdXJjZTZj cmVhdGVFTjNXVEYxMFBhc3NSZWZQdHJJTlNfMTJTaGFyZWRCdWZmZXJFRUVSS05TXzRLVVJMRVJL TlMxXzZTdHJpbmdFU0FfU0FfUktOU18xNlJlc291cmNlUmVzcG9uc2VFCkBAIC0xMjIzLDggKzEy MjYsMTAgQEAgX19aTks3V2ViQ29yZTE0U2Nyb2xsYWJsZUFyZWExNHNjcm9sbEFuaW1hdG9yRXYK IF9fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luMTBjYW5EaXNwbGF5RVJLTlNfNEtVUkxFCiBf X1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjE4ZGF0YWJhc2VJZGVudGlmaWVyRXYKIF9fWk5L N1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luNWVxdWFsRVBLUzBfCitfX1pOSzdXZWJDb3JlMTVBZmZp bmVUcmFuc2Zvcm0xMGlzSWRlbnRpdHlFdgogX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3Jt MTJpc0ludmVydGlibGVFdgogX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtN2ludmVyc2VF dgorX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtOG1hcFBvaW50RVJLTlNfMTBGbG9hdFBv aW50RQogX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3JtOG1hcFBvaW50RVJLTlNfOEludFBv aW50RQogX19aTks3V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMThmb2N1c2VkT3JNYWluRnJhbWVF dgogX19aTks3V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0MTVwbGF0Zm9ybUNvbnRleHRFdgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uaAppbmRleCBlYzA1YzE1MTFhMjA0NjdkNWU3MzdhN2MxNWNlNzk3MDM5 MjhlZTQ4Li4xYjdjNjQzMjVmMjI5NDljMGE0YmQ5ZWIwNmIwYzdkYTViNmJkNTRhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv TmV0c2NhcGVQbHVnaW4uaApAQCAtNjUsNiArNjUsOSBAQCBwdWJsaWM6CiAKICAgICBtYWNoX3Bv cnRfdCBjb21wb3NpdGluZ1JlbmRlclNlcnZlclBvcnQoKTsKIAorICAgIC8vIENvbXB1dGVzIGFu IGFmZmluZSB0cmFuc2Zvcm0gZnJvbSB0aGUgZ2l2ZW4gY29vcmRpbmF0ZSBzcGFjZSB0byB0aGUg c2NyZWVuIGNvb3JkaW5hdGUgc3BhY2UuCisgICAgYm9vbCBnZXRTY3JlZW5UcmFuc2Zvcm0oTlBD b29yZGluYXRlU3BhY2Ugc291cmNlU3BhY2UsIFdlYkNvcmU6OkFmZmluZVRyYW5zZm9ybSYpOwor CiAjaWZuZGVmIE5QX05PX0NBUkJPTgogICAgIFdpbmRvd1JlZiB3aW5kb3dSZWYoKSBjb25zdDsK ICAgICBib29sIGlzV2luZG93QWN0aXZlKCkgY29uc3QgeyByZXR1cm4gbV93aW5kb3dIYXNGb2N1 czsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0KaW5kZXggOTJiMWViMjcz MDcyMmFlNzExOGVhZTFiM2Y2ODhhYzQ2MWNmZmQ2OS4uNTU0ZjE2NjVhZWNjZTA2OWNhMWQwNDNi MmEyNWEzZGEyZTA5MzMzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTWFjLm1t CkBAIC04OCw3NSArODgsNjYgQEAgTlBFcnJvciBOZXRzY2FwZVBsdWdpbjo6c2V0RXZlbnRNb2Rl bChOUEV2ZW50TW9kZWwgZXZlbnRNb2RlbCkKICAgICByZXR1cm4gTlBFUlJfTk9fRVJST1I7CiB9 CiAKLXN0YXRpYyBkb3VibGUgZmxpcFNjcmVlbllDb29yZGluYXRlKGRvdWJsZSB5KQorYm9vbCBO ZXRzY2FwZVBsdWdpbjo6Z2V0U2NyZWVuVHJhbnNmb3JtKE5QQ29vcmRpbmF0ZVNwYWNlIHNvdXJj ZVNwYWNlLCBBZmZpbmVUcmFuc2Zvcm0mIHRyYW5zZm9ybSkKIHsKLSAgICByZXR1cm4gWyhOU1Nj cmVlbiAqKVtbTlNTY3JlZW4gc2NyZWVuc10gb2JqZWN0QXRJbmRleDowXSBmcmFtZV0uc2l6ZS5o ZWlnaHQgLSB5OworICAgIEFTU0VSVCh0cmFuc2Zvcm0uaXNJZGVudGl0eSgpKTsKKworICAgIHN3 aXRjaCAoc291cmNlU3BhY2UpIHsKKyAgICAgICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZVBsdWdp bjogeworICAgICAgICAgICAgdHJhbnNmb3JtLnRyYW5zbGF0ZShtX3dpbmRvd0ZyYW1lSW5TY3Jl ZW5Db29yZGluYXRlcy54KCksIG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLnkoKSk7 CisgICAgICAgICAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKG1fdmlld0ZyYW1lSW5XaW5kb3dDb29y ZGluYXRlcy54KCksIG1fdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcy5oZWlnaHQoKSArIG1f dmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcy55KCkpOworICAgICAgICAgICAgdHJhbnNmb3Jt LmZsaXBZKCk7CisgICAgICAgICAgICB0cmFuc2Zvcm0gKj0gbV9wbHVnaW5Ub1Jvb3RWaWV3VHJh bnNmb3JtOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKworICAgICAgICBj YXNlIE5QQ29vcmRpbmF0ZVNwYWNlV2luZG93OiB7CisgICAgICAgICAgICB0cmFuc2Zvcm0udHJh bnNsYXRlKG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLngoKSwgbV93aW5kb3dGcmFt ZUluU2NyZWVuQ29vcmRpbmF0ZXMueSgpKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICB9CisKKyAgICAgICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZUZsaXBwZWRXaW5kb3c6IHsK KyAgICAgICAgICAgIHRyYW5zZm9ybS50cmFuc2xhdGUobV93aW5kb3dGcmFtZUluU2NyZWVuQ29v cmRpbmF0ZXMueCgpLCBtX3dpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcy5oZWlnaHQoKSAr IG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLnkoKSk7CisgICAgICAgICAgICB0cmFu c2Zvcm0uZmxpcFkoKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAg ICAgICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZVNjcmVlbjogeworICAgICAgICAgICAgLy8gTm90 aGluZyB0byBkby4KKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisKKyAgICAg ICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZUZsaXBwZWRTY3JlZW46IHsKKyAgICAgICAgICAgIGRv dWJsZSBzY3JlZW5IZWlnaHQgPSBbKE5TU2NyZWVuICopW1tOU1NjcmVlbiBzY3JlZW5zXSBvYmpl Y3RBdEluZGV4OjBdIGZyYW1lXS5zaXplLmhlaWdodDsKKyAgICAgICAgICAgIHRyYW5zZm9ybS50 cmFuc2xhdGUoMCwgc2NyZWVuSGVpZ2h0KTsKKyAgICAgICAgICAgIHRyYW5zZm9ybS5mbGlwWSgp OworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKworICAgICAgICBkZWZhdWx0 OgorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIH0KIAogTlBCb29sIE5ldHNjYXBl UGx1Z2luOjpjb252ZXJ0UG9pbnQoZG91YmxlIHNvdXJjZVgsIGRvdWJsZSBzb3VyY2VZLCBOUENv b3JkaW5hdGVTcGFjZSBzb3VyY2VTcGFjZSwgZG91YmxlJiBkZXN0WCwgZG91YmxlJiBkZXN0WSwg TlBDb29yZGluYXRlU3BhY2UgZGVzdFNwYWNlKQogewotICAgIGlmIChzb3VyY2VTcGFjZSA9PSBk ZXN0U3BhY2UpIHsKLSAgICAgICAgZGVzdFggPSBzb3VyY2VYOwotICAgICAgICBkZXN0WSA9IHNv dXJjZVk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIGRvdWJsZSBzb3VyY2VY SW5TY3JlZW5TcGFjZTsKLSAgICBkb3VibGUgc291cmNlWUluU2NyZWVuU3BhY2U7CisgICAgQWZm aW5lVHJhbnNmb3JtIHNvdXJjZVRyYW5zZm9ybTsKKyAgICBpZiAoIWdldFNjcmVlblRyYW5zZm9y bShzb3VyY2VTcGFjZSwgc291cmNlVHJhbnNmb3JtKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwog Ci0gICAgRmxvYXRQb2ludCBzb3VyY2VJblNjcmVlblNwYWNlOwotICAgIHN3aXRjaCAoc291cmNl U3BhY2UpIHsKLSAgICBjYXNlIE5QQ29vcmRpbmF0ZVNwYWNlUGx1Z2luOgotICAgICAgICBzb3Vy Y2VYSW5TY3JlZW5TcGFjZSA9IHNvdXJjZVggKyBtX3dpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGlu YXRlcy54KCkgKyBtX3ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMueCgpICsgbV9ucFdpbmRv dy54OwotICAgICAgICBzb3VyY2VZSW5TY3JlZW5TcGFjZSA9IG1fd2luZG93RnJhbWVJblNjcmVl bkNvb3JkaW5hdGVzLnkoKSArIG1fdmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcy55KCkgKyBt X3ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMuaGVpZ2h0KCkgLSAoc291cmNlWSArIG1fbnBX aW5kb3cueSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgTlBDb29yZGluYXRlU3BhY2VXaW5k b3c6Ci0gICAgICAgIHNvdXJjZVhJblNjcmVlblNwYWNlID0gc291cmNlWCArIG1fd2luZG93RnJh bWVJblNjcmVlbkNvb3JkaW5hdGVzLngoKTsKLSAgICAgICAgc291cmNlWUluU2NyZWVuU3BhY2Ug PSBzb3VyY2VZICsgbV93aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMueSgpOwotICAgICAg ICBicmVhazsKLSAgICBjYXNlIE5QQ29vcmRpbmF0ZVNwYWNlRmxpcHBlZFdpbmRvdzoKLSAgICAg ICAgc291cmNlWEluU2NyZWVuU3BhY2UgPSBzb3VyY2VYICsgbV93aW5kb3dGcmFtZUluU2NyZWVu Q29vcmRpbmF0ZXMueCgpOwotICAgICAgICBzb3VyY2VZSW5TY3JlZW5TcGFjZSA9IG1fd2luZG93 RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLnkoKSArIG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3Jk aW5hdGVzLmhlaWdodCgpIC0gc291cmNlWTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBOUENv b3JkaW5hdGVTcGFjZVNjcmVlbjoKLSAgICAgICAgc291cmNlWEluU2NyZWVuU3BhY2UgPSBzb3Vy Y2VYOwotICAgICAgICBzb3VyY2VZSW5TY3JlZW5TcGFjZSA9IHNvdXJjZVk7Ci0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgTlBDb29yZGluYXRlU3BhY2VGbGlwcGVkU2NyZWVuOgotICAgICAgICBz b3VyY2VYSW5TY3JlZW5TcGFjZSA9IHNvdXJjZVg7Ci0gICAgICAgIHNvdXJjZVlJblNjcmVlblNw YWNlID0gZmxpcFNjcmVlbllDb29yZGluYXRlKHNvdXJjZVkpOwotICAgICAgICBicmVhazsKLSAg ICBkZWZhdWx0OgorICAgIEFmZmluZVRyYW5zZm9ybSBkZXN0VHJhbnNmb3JtOworICAgIGlmICgh Z2V0U2NyZWVuVHJhbnNmb3JtKGRlc3RTcGFjZSwgZGVzdFRyYW5zZm9ybSkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICB9CiAKLSAgICAvLyBOb3cgY29udmVydCBiYWNrLgotICAgIHN3aXRj aCAoZGVzdFNwYWNlKSB7Ci0gICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZVBsdWdpbjoKLSAgICAg ICAgZGVzdFggPSBzb3VyY2VYSW5TY3JlZW5TcGFjZSAtIChtX3dpbmRvd0ZyYW1lSW5TY3JlZW5D b29yZGluYXRlcy54KCkgKyBtX3ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMueCgpICsgbV9u cFdpbmRvdy54KTsKLSAgICAgICAgZGVzdFkgPSBtX3dpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGlu YXRlcy55KCkgKyBtX3ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMueSgpICsgbV92aWV3RnJh bWVJbldpbmRvd0Nvb3JkaW5hdGVzLmhlaWdodCgpIC0gKHNvdXJjZVlJblNjcmVlblNwYWNlICsg bV9ucFdpbmRvdy55KTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBOUENvb3JkaW5hdGVTcGFj ZVdpbmRvdzoKLSAgICAgICAgZGVzdFggPSBzb3VyY2VYSW5TY3JlZW5TcGFjZSAtIG1fd2luZG93 RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLngoKTsKLSAgICAgICAgZGVzdFkgPSBzb3VyY2VZSW5T Y3JlZW5TcGFjZSAtIG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzLnkoKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZUZsaXBwZWRXaW5kb3c6Ci0gICAg ICAgIGRlc3RYID0gc291cmNlWEluU2NyZWVuU3BhY2UgLSBtX3dpbmRvd0ZyYW1lSW5TY3JlZW5D b29yZGluYXRlcy54KCk7Ci0gICAgICAgIGRlc3RZID0gc291cmNlWUluU2NyZWVuU3BhY2UgLSBt X3dpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGluYXRlcy55KCk7Ci0gICAgICAgIGRlc3RZID0gbV93 aW5kb3dGcmFtZUluU2NyZWVuQ29vcmRpbmF0ZXMuaGVpZ2h0KCkgLSBkZXN0WTsKLSAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZVNjcmVlbjoKLSAgICAgICAgZGVzdFgg PSBzb3VyY2VYSW5TY3JlZW5TcGFjZTsKLSAgICAgICAgZGVzdFkgPSBzb3VyY2VZSW5TY3JlZW5T cGFjZTsKLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBOUENvb3JkaW5hdGVTcGFjZUZsaXBwZWRT Y3JlZW46Ci0gICAgICAgIGRlc3RYID0gc291cmNlWEluU2NyZWVuU3BhY2U7Ci0gICAgICAgIGRl c3RZID0gZmxpcFNjcmVlbllDb29yZGluYXRlKHNvdXJjZVlJblNjcmVlblNwYWNlKTsKLSAgICAg ICAgYnJlYWs7Ci0gICAgZGVmYXVsdDoKKyAgICBpZiAoIWRlc3RUcmFuc2Zvcm0uaXNJbnZlcnRp YmxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9CiAKKyAgICBBZmZpbmVUcmFuc2Zv cm0gdHJhbnNmb3JtID0gZGVzdFRyYW5zZm9ybS5pbnZlcnNlKCkgKiBzb3VyY2VUcmFuc2Zvcm07 CisKKyAgICBGbG9hdFBvaW50IGRlc3RpbmF0aW9uUG9pbnQgPSB0cmFuc2Zvcm0ubWFwUG9pbnQo RmxvYXRQb2ludChzb3VyY2VYLCBzb3VyY2VZKSk7CisKKyAgICBkZXN0WCA9IGRlc3RpbmF0aW9u UG9pbnQueCgpOworICAgIGRlc3RZID0gZGVzdGluYXRpb25Qb2ludC55KCk7CiAgICAgcmV0dXJu IHRydWU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVn aW5WaWV3LmNwcAppbmRleCA1NzE4Yzk1MjY5OTE1ZWVmZWYzOTNhZmEzM2E5NTIxY2YyODViNjEx Li5lZGRjYTExYjZjYzYxZWZlY2VjZmZkZjdlY2YxODliN2Y0M2JhNTUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC00NjksNiAr NDY5LDEwIEBAIHZvaWQgUGx1Z2luVmlldzo6aW5pdGlhbGl6ZVBsdWdpbigpCiAgICAgCiAgICAg bV9pc0luaXRpYWxpemVkID0gdHJ1ZTsKIAorI2lmIFBMQVRGT1JNKE1BQykKKyAgICB3aW5kb3dB bmRWaWV3RnJhbWVzQ2hhbmdlZChtX3dlYlBhZ2UtPndpbmRvd0ZyYW1lSW5TY3JlZW5Db29yZGlu YXRlcygpLCBtX3dlYlBhZ2UtPnZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMoKSk7CisjZW5k aWYKKwogICAgIHZpZXdHZW9tZXRyeURpZENoYW5nZSgpOwogCiAgICAgcmVkZWxpdmVyTWFudWFs U3RyZWFtKCk7CkBAIC00ODEsNyArNDg1LDYgQEAgdm9pZCBQbHVnaW5WaWV3Ojppbml0aWFsaXpl UGx1Z2luKCkKICAgICAgICAgfQogICAgIH0KIAotICAgIHdpbmRvd0FuZFZpZXdGcmFtZXNDaGFu Z2VkKG1fd2ViUGFnZS0+d2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVzKCksIG1fd2ViUGFn ZS0+dmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcygpKTsKICAgICBzZXRXaW5kb3dJc1Zpc2li bGUobV93ZWJQYWdlLT53aW5kb3dJc1Zpc2libGUoKSk7CiAgICAgc2V0V2luZG93SXNGb2N1c2Vk KG1fd2ViUGFnZS0+d2luZG93SXNGb2N1c2VkKCkpOwogI2VuZGlmCg==