71520 2011-11-03 16:44:00 -0700 Use convertToRootView(IntPoint()) instead of m_frameRectInWindowCoordinates.location() where possible 2011-11-03 17:13:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 495882 0 andersca 2011-11-03 16:44:00 -0700 Use convertToRootView(IntPoint()) instead of m_frameRectInWindowCoordinates.location() where possible 495884 1 113579 andersca 2011-11-03 16:46:08 -0700 Created attachment 113579 Patch 495886 2 113580 andersca 2011-11-03 16:47:33 -0700 Created attachment 113580 Patch 495902 3 andersca 2011-11-03 17:13:59 -0700 Committed r99249: <http://trac.webkit.org/changeset/99249> 113579 2011-11-03 16:46:08 -0700 2011-11-03 17:08:46 -0700 Patch bug-71520-20111103164627.patch text/plain 4769 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwMDA1NmQxZWU3ZDdmNWY3 N2UxZWE2NzJhOTE0ZDNhZjdkNjA1ZWQwLi4wNTY3ZTY1MDhlMDYzMzlhYWQwZDExNGVhMjE1NTU3 NmQ3MWYyZGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTEtMTEtMDMgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBVc2UgY29udmVydFRv Um9vdFZpZXcoSW50UG9pbnQoKSkgaW5zdGVhZCBvZiBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRp bmF0ZXMubG9jYXRpb24oKSB3aGVyZSBwb3NzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS93aW4v TmV0c2NhcGVQbHVnaW5XaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6 c2NoZWR1bGVXaW5kb3dlZEdlb21ldHJ5VXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmV0c2Nh cGVQbHVnaW46OnBsYXRmb3JtUGFpbnQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6 TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJL aXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRW50ZXJFdmVudCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlTGVhdmVFdmVu dCk6CisKKzIwMTEtMTEtMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBZGQgTmV0c2NhcGVQbHVnaW46OmNvbnZlcnRUb1Jvb3RWaWV3CiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTUxOQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNj YXBlUGx1Z2luV2luLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS93aW4vTmV0c2NhcGVQbHVnaW5XaW4uY3BwCmluZGV4IDdmMDc3NmQwYjY0ZDM3YWIzZTZj MmM4YjdlMjNhZWI1ZWYyYmI4Y2YuLjFmMjYzYTI2ZGQxNGE3YzY2MTBjNDBkYTI4OGM2ZWZjOTkx YzBkZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS93aW4vTmV0c2NhcGVQbHVnaW5XaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS93aW4vTmV0c2NhcGVQbHVnaW5XaW4uY3BwCkBAIC0xNjUs NyArMTY1LDcgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6c2NoZWR1bGVXaW5kb3dlZEdlb21ldHJ5 VXBkYXRlKCkKICAgICBXaW5kb3dHZW9tZXRyeSBnZW9tZXRyeTsKICAgICBnZW9tZXRyeS53aW5k b3cgPSBtX3dpbmRvdzsKICAgICBnZW9tZXRyeS52aXNpYmxlID0gY29udHJvbGxlcigpLT5pc1Bs dWdpblZpc2libGUoKTsKLSAgICBnZW9tZXRyeS5mcmFtZSA9IG1fZnJhbWVSZWN0SW5XaW5kb3dD b29yZGluYXRlczsKKyAgICBnZW9tZXRyeS5mcmFtZSA9IEludFJlY3QoY29udmVydFRvUm9vdFZp ZXcoSW50UG9pbnQoKSksIG1fcGx1Z2luU2l6ZSk7CiAgICAgZ2VvbWV0cnkuY2xpcFJlY3QgPSBt X2NsaXBSZWN0OwogCiAgICAgY29udHJvbGxlcigpLT5zY2hlZHVsZVdpbmRvd2VkUGx1Z2luR2Vv bWV0cnlVcGRhdGUoZ2VvbWV0cnkpOwpAQCAtMTkxLDggKzE5MSwxMCBAQCB2b2lkIE5ldHNjYXBl UGx1Z2luOjpwbGF0Zm9ybVBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50 UmVjdCYgZGlydAogCiAgICAgV0lORE9XUE9TIHdpbmRvd3BvcyA9IHsgMCwgMCwgMCwgMCwgMCwg MCwgMCB9OwogCi0gICAgd2luZG93cG9zLnggPSBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0 ZXMueCgpOwotICAgIHdpbmRvd3Bvcy55ID0gbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVz LnkoKTsKKyAgICBJbnRQb2ludCBwbHVnaW5Mb2NhdGlvbkluUm9vdFZpZXdDb29yZGluYXRlcyA9 IGNvbnZlcnRUb1Jvb3RWaWV3KEludFBvaW50KCkpOworCisgICAgd2luZG93cG9zLnggPSBwbHVn aW5Mb2NhdGlvbkluUm9vdFZpZXdDb29yZGluYXRlcy54KCk7CisgICAgd2luZG93cG9zLnkgPSBw bHVnaW5Mb2NhdGlvbkluUm9vdFZpZXdDb29yZGluYXRlcy55KCk7CiAgICAgd2luZG93cG9zLmN4 ID0gbV9wbHVnaW5TaXplLndpZHRoKCk7CiAgICAgd2luZG93cG9zLmN5ID0gbV9wbHVnaW5TaXpl LmhlaWdodCgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwCmluZGV4 IDMyNWIzNTAyNjM5MTcwNDZjOTE2MTM4OTVjNmM0Yjc5MWI5ZDJjYTkuLmVlZThhNDExNzk0NzIx ZWEwMDA4YzU5NGViYzYyYmM0NjAwMDdkNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS94MTEvTmV0c2NhcGVQ bHVnaW5YMTEuY3BwCkBAIC00MDksMTAgKzQwOSwxMCBAQCBib29sIE5ldHNjYXBlUGx1Z2luOjpw bGF0Zm9ybUhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiAgICAg c3dpdGNoIChldmVudC50eXBlKCkpIHsKICAgICBjYXNlIFdlYkV2ZW50OjpNb3VzZURvd246CiAg ICAgY2FzZSBXZWJFdmVudDo6TW91c2VVcDoKLSAgICAgICAgc2V0WEJ1dHRvbkV2ZW50RmllbGRz KHhFdmVudCwgZXZlbnQsIG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5sb2NhdGlvbigp KTsKKyAgICAgICAgc2V0WEJ1dHRvbkV2ZW50RmllbGRzKHhFdmVudCwgZXZlbnQsIGNvbnZlcnRU b1Jvb3RWaWV3KEludFBvaW50KCkpKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJFdmVu dDo6TW91c2VNb3ZlOgotICAgICAgICBzZXRYTW90aW9uRXZlbnRGaWVsZHMoeEV2ZW50LCBldmVu dCwgbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmxvY2F0aW9uKCkpOworICAgICAgICBz ZXRYTW90aW9uRXZlbnRGaWVsZHMoeEV2ZW50LCBldmVudCwgY29udmVydFRvUm9vdFZpZXcoSW50 UG9pbnQoKSkpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFdlYkV2ZW50OjpOb1R5cGU6CiAg ICAgY2FzZSBXZWJFdmVudDo6V2hlZWw6CkBAIC00NTAsNyArNDUwLDcgQEAgYm9vbCBOZXRzY2Fw ZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIGV2 ZW50KQogCiAgICAgWEV2ZW50IHhFdmVudDsKICAgICBpbml0aWFsaXplWEV2ZW50KHhFdmVudCk7 Ci0gICAgc2V0WEJ1dHRvbkV2ZW50RmllbGRzQnlXZWJXaGVlbEV2ZW50KHhFdmVudCwgZXZlbnQs IG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5sb2NhdGlvbigpKTsKKyAgICBzZXRYQnV0 dG9uRXZlbnRGaWVsZHNCeVdlYldoZWVsRXZlbnQoeEV2ZW50LCBldmVudCwgY29udmVydFRvUm9v dFZpZXcoSW50UG9pbnQoKSkpOwogCiAgICAgcmV0dXJuICFOUFBfSGFuZGxlRXZlbnQoJnhFdmVu dCk7CiB9CkBAIC00ODIsNyArNDgyLDcgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1I YW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgZXZlbnQpCiAKICAgICBY RXZlbnQgeEV2ZW50OwogICAgIGluaXRpYWxpemVYRXZlbnQoeEV2ZW50KTsKLSAgICBzZXRYQ3Jv c3NpbmdFdmVudEZpZWxkcyh4RXZlbnQsIGV2ZW50LCBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRp bmF0ZXMubG9jYXRpb24oKSwgRW50ZXJOb3RpZnkpOworICAgIHNldFhDcm9zc2luZ0V2ZW50Rmll bGRzKHhFdmVudCwgZXZlbnQsIGNvbnZlcnRUb1Jvb3RWaWV3KEludFBvaW50KCkpLCBFbnRlck5v dGlmeSk7CiAKICAgICByZXR1cm4gIU5QUF9IYW5kbGVFdmVudCgmeEV2ZW50KTsKIH0KQEAgLTQ5 NCw3ICs0OTQsNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlTGVh dmVFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKIAogICAgIFhFdmVudCB4RXZlbnQ7 CiAgICAgaW5pdGlhbGl6ZVhFdmVudCh4RXZlbnQpOwotICAgIHNldFhDcm9zc2luZ0V2ZW50Rmll bGRzKHhFdmVudCwgZXZlbnQsIG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy5sb2NhdGlv bigpLCBMZWF2ZU5vdGlmeSk7CisgICAgc2V0WENyb3NzaW5nRXZlbnRGaWVsZHMoeEV2ZW50LCBl dmVudCwgY29udmVydFRvUm9vdFZpZXcoSW50UG9pbnQoKSksIExlYXZlTm90aWZ5KTsKIAogICAg IHJldHVybiAhTlBQX0hhbmRsZUV2ZW50KCZ4RXZlbnQpOwogfQo= 113580 2011-11-03 16:47:33 -0700 2011-11-03 16:57:04 -0700 Patch bug-71520-20111103164752.patch text/plain 6288 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyNDMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwMDA1NmQxZWU3ZDdmNWY3 N2UxZWE2NzJhOTE0ZDNhZjdkNjA1ZWQwLi4wNTY3ZTY1MDhlMDYzMzlhYWQwZDExNGVhMjE1NTU3 NmQ3MWYyZGE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTEtMTEtMDMgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBVc2UgY29udmVydFRv Um9vdFZpZXcoSW50UG9pbnQoKSkgaW5zdGVhZCBvZiBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRp bmF0ZXMubG9jYXRpb24oKSB3aGVyZSBwb3NzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS93aW4v TmV0c2NhcGVQbHVnaW5XaW4uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6 c2NoZWR1bGVXaW5kb3dlZEdlb21ldHJ5VXBkYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmV0c2Nh cGVQbHVnaW46OnBsYXRmb3JtUGFpbnQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS94MTEvTmV0c2NhcGVQbHVnaW5YMTEuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXRz Y2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6 TmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJL aXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlRW50ZXJFdmVudCk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpwbGF0Zm9ybUhhbmRsZU1vdXNlTGVhdmVFdmVu dCk6CisKKzIwMTEtMTEtMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBZGQgTmV0c2NhcGVQbHVnaW46OmNvbnZlcnRUb1Jvb3RWaWV3CiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTUxOQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luLmNwcAppbmRleCA3MWUxNmE3Njk2OTliNTQxNTg4MGU3MGQ5MWU0Njc1ZTc3 Yjk0MzA3Li41Y2MzNjMwMTY0ZDQ4OTk0MzJhOTZlOWQ5YzAzNjc0YzFhYjk5ZGI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTY5Niw5ICs2OTYsNiBAQCB2b2lkIE5ldHNjYXBlUGx1 Z2luOjpnZW9tZXRyeURpZENoYW5nZShjb25zdCBJbnRTaXplJiBwbHVnaW5TaXplLCBjb25zdCBJ bnRSZWN0JgogICAgIEludFBvaW50IGZyYW1lUmVjdExvY2F0aW9uSW5XaW5kb3dDb29yZGluYXRl cyA9IG1fcGx1Z2luVG9Sb290Vmlld1RyYW5zZm9ybS5tYXBQb2ludChJbnRQb2ludCgpKTsKICAg ICBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBJbnRSZWN0KGZyYW1lUmVjdExvY2F0 aW9uSW5XaW5kb3dDb29yZGluYXRlcywgbV9wbHVnaW5TaXplKTsKIAotICAgIEludFBvaW50IGNs aXBSZWN0TG9jYXRpb25JbldpbmRvd0Nvb3JkaW5hdGVzID0gbV9wbHVnaW5Ub1Jvb3RWaWV3VHJh bnNmb3JtLm1hcFBvaW50KGNsaXBSZWN0LmxvY2F0aW9uKCkpOwotICAgIG1fY2xpcFJlY3RJbldp bmRvd0Nvb3JkaW5hdGVzID0gSW50UmVjdChjbGlwUmVjdExvY2F0aW9uSW5XaW5kb3dDb29yZGlu YXRlcywgbV9jbGlwUmVjdC5zaXplKCkpOwotCiAgICAgcGxhdGZvcm1HZW9tZXRyeURpZENoYW5n ZSgpOwogCiAgICAgaWYgKCFzaG91bGRDYWxsV2luZG93KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApp bmRleCA0MzQyNjlmZTA4ZmNlNDdlNjVhZjAzMDI5MzA5N2FkZDkwMjMyZTFlLi5lOGE0ZTNjZGY3 NmQ3YzhkNWYyNDAzODQxNGFhMjlkOTkzZDA0YzZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaApA QCAtMjQ3LDcgKzI0Nyw2IEBAIHByaXZhdGU6CiAKICAgICAvLyBGSVhNRTogR2V0IHJpZCBvZiB0 aGVzZS4KICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRl czsKLSAgICBXZWJDb3JlOjpJbnRSZWN0IG1fY2xpcFJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzOwog CiAgICAgQ1N0cmluZyBtX3VzZXJBZ2VudDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3dpbi9OZXRzY2FwZVBsdWdpbldpbi5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNjYXBlUGx1 Z2luV2luLmNwcAppbmRleCA3ZjA3NzZkMGI2NGQzN2FiM2U2YzJjOGI3ZTIzYWViNWVmMmJiOGNm Li4xZjI2M2EyNmRkMTRhN2M2NjEwYzQwZGEyODhjNmVmYzk5MWMwZGU2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNjYXBlUGx1 Z2luV2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvd2luL05ldHNjYXBlUGx1Z2luV2luLmNwcApAQCAtMTY1LDcgKzE2NSw3IEBAIHZvaWQgTmV0 c2NhcGVQbHVnaW46OnNjaGVkdWxlV2luZG93ZWRHZW9tZXRyeVVwZGF0ZSgpCiAgICAgV2luZG93 R2VvbWV0cnkgZ2VvbWV0cnk7CiAgICAgZ2VvbWV0cnkud2luZG93ID0gbV93aW5kb3c7CiAgICAg Z2VvbWV0cnkudmlzaWJsZSA9IGNvbnRyb2xsZXIoKS0+aXNQbHVnaW5WaXNpYmxlKCk7Ci0gICAg Z2VvbWV0cnkuZnJhbWUgPSBtX2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXM7CisgICAgZ2Vv bWV0cnkuZnJhbWUgPSBJbnRSZWN0KGNvbnZlcnRUb1Jvb3RWaWV3KEludFBvaW50KCkpLCBtX3Bs dWdpblNpemUpOwogICAgIGdlb21ldHJ5LmNsaXBSZWN0ID0gbV9jbGlwUmVjdDsKIAogICAgIGNv bnRyb2xsZXIoKS0+c2NoZWR1bGVXaW5kb3dlZFBsdWdpbkdlb21ldHJ5VXBkYXRlKGdlb21ldHJ5 KTsKQEAgLTE5MSw4ICsxOTEsMTAgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1QYWlu dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnQKIAogICAgIFdJ TkRPV1BPUyB3aW5kb3dwb3MgPSB7IDAsIDAsIDAsIDAsIDAsIDAsIDAgfTsKIAotICAgIHdpbmRv d3Bvcy54ID0gbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLngoKTsKLSAgICB3aW5kb3dw b3MueSA9IG1fZnJhbWVSZWN0SW5XaW5kb3dDb29yZGluYXRlcy55KCk7CisgICAgSW50UG9pbnQg cGx1Z2luTG9jYXRpb25JblJvb3RWaWV3Q29vcmRpbmF0ZXMgPSBjb252ZXJ0VG9Sb290VmlldyhJ bnRQb2ludCgpKTsKKworICAgIHdpbmRvd3Bvcy54ID0gcGx1Z2luTG9jYXRpb25JblJvb3RWaWV3 Q29vcmRpbmF0ZXMueCgpOworICAgIHdpbmRvd3Bvcy55ID0gcGx1Z2luTG9jYXRpb25JblJvb3RW aWV3Q29vcmRpbmF0ZXMueSgpOwogICAgIHdpbmRvd3Bvcy5jeCA9IG1fcGx1Z2luU2l6ZS53aWR0 aCgpOwogICAgIHdpbmRvd3Bvcy5jeSA9IG1fcGx1Z2luU2l6ZS5oZWlnaHQoKTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL3gxMS9OZXRz Y2FwZVBsdWdpblgxMS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0 c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcAppbmRleCAzMjViMzUwMjYzOTE3MDQ2Yzkx NjEzODk1YzZjNGI3OTFiOWQyY2E5Li5lZWU4YTQxMTc5NDcyMWVhMDAwOGM1OTRlYmM2MmJjNDYw MDA3ZDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0 c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUveDExL05ldHNjYXBlUGx1Z2luWDExLmNwcApAQCAtNDA5 LDEwICs0MDksMTAgQEAgYm9vbCBOZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUV2 ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQogICAgIHN3aXRjaCAoZXZlbnQudHlwZSgp KSB7CiAgICAgY2FzZSBXZWJFdmVudDo6TW91c2VEb3duOgogICAgIGNhc2UgV2ViRXZlbnQ6Ok1v dXNlVXA6Ci0gICAgICAgIHNldFhCdXR0b25FdmVudEZpZWxkcyh4RXZlbnQsIGV2ZW50LCBtX2Zy YW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMubG9jYXRpb24oKSk7CisgICAgICAgIHNldFhCdXR0 b25FdmVudEZpZWxkcyh4RXZlbnQsIGV2ZW50LCBjb252ZXJ0VG9Sb290VmlldyhJbnRQb2ludCgp KSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViRXZlbnQ6Ok1vdXNlTW92ZToKLSAgICAg ICAgc2V0WE1vdGlvbkV2ZW50RmllbGRzKHhFdmVudCwgZXZlbnQsIG1fZnJhbWVSZWN0SW5XaW5k b3dDb29yZGluYXRlcy5sb2NhdGlvbigpKTsKKyAgICAgICAgc2V0WE1vdGlvbkV2ZW50RmllbGRz KHhFdmVudCwgZXZlbnQsIGNvbnZlcnRUb1Jvb3RWaWV3KEludFBvaW50KCkpKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBXZWJFdmVudDo6Tm9UeXBlOgogICAgIGNhc2UgV2ViRXZlbnQ6Oldo ZWVsOgpAQCAtNDUwLDcgKzQ1MCw3IEBAIGJvb2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFu ZGxlV2hlZWxFdmVudChjb25zdCBXZWJXaGVlbEV2ZW50JiBldmVudCkKIAogICAgIFhFdmVudCB4 RXZlbnQ7CiAgICAgaW5pdGlhbGl6ZVhFdmVudCh4RXZlbnQpOwotICAgIHNldFhCdXR0b25FdmVu dEZpZWxkc0J5V2ViV2hlZWxFdmVudCh4RXZlbnQsIGV2ZW50LCBtX2ZyYW1lUmVjdEluV2luZG93 Q29vcmRpbmF0ZXMubG9jYXRpb24oKSk7CisgICAgc2V0WEJ1dHRvbkV2ZW50RmllbGRzQnlXZWJX aGVlbEV2ZW50KHhFdmVudCwgZXZlbnQsIGNvbnZlcnRUb1Jvb3RWaWV3KEludFBvaW50KCkpKTsK IAogICAgIHJldHVybiAhTlBQX0hhbmRsZUV2ZW50KCZ4RXZlbnQpOwogfQpAQCAtNDgyLDcgKzQ4 Miw3IEBAIGJvb2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlTW91c2VFbnRlckV2ZW50 KGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2ZW50KQogCiAgICAgWEV2ZW50IHhFdmVudDsKICAgICBp bml0aWFsaXplWEV2ZW50KHhFdmVudCk7Ci0gICAgc2V0WENyb3NzaW5nRXZlbnRGaWVsZHMoeEV2 ZW50LCBldmVudCwgbV9mcmFtZVJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLmxvY2F0aW9uKCksIEVu dGVyTm90aWZ5KTsKKyAgICBzZXRYQ3Jvc3NpbmdFdmVudEZpZWxkcyh4RXZlbnQsIGV2ZW50LCBj b252ZXJ0VG9Sb290VmlldyhJbnRQb2ludCgpKSwgRW50ZXJOb3RpZnkpOwogCiAgICAgcmV0dXJu ICFOUFBfSGFuZGxlRXZlbnQoJnhFdmVudCk7CiB9CkBAIC00OTQsNyArNDk0LDcgQEAgYm9vbCBO ZXRzY2FwZVBsdWdpbjo6cGxhdGZvcm1IYW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91 c2VFdmVudCYgZXZlbnQpCiAKICAgICBYRXZlbnQgeEV2ZW50OwogICAgIGluaXRpYWxpemVYRXZl bnQoeEV2ZW50KTsKLSAgICBzZXRYQ3Jvc3NpbmdFdmVudEZpZWxkcyh4RXZlbnQsIGV2ZW50LCBt X2ZyYW1lUmVjdEluV2luZG93Q29vcmRpbmF0ZXMubG9jYXRpb24oKSwgTGVhdmVOb3RpZnkpOwor ICAgIHNldFhDcm9zc2luZ0V2ZW50RmllbGRzKHhFdmVudCwgZXZlbnQsIGNvbnZlcnRUb1Jvb3RW aWV3KEludFBvaW50KCkpLCBMZWF2ZU5vdGlmeSk7CiAKICAgICByZXR1cm4gIU5QUF9IYW5kbGVF dmVudCgmeEV2ZW50KTsKIH0K