96155 2012-09-07 16:37:25 -0700 [chromium] Remove transitional WebCompositorSupport fallback code 2012-09-07 18:32:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth andersca cc-bugs enne eric.carlson feature-media-reviews fishd tonikitoo webkit.review.bot oldest_to_newest 715113 0 jamesr 2012-09-07 16:37:25 -0700 [chromium] Remove transitional WebCompositorSupport fallback code 715114 1 162903 jamesr 2012-09-07 16:38:07 -0700 Created attachment 162903 Patch 715193 2 162903 enne 2012-09-07 18:21:30 -0700 Comment on attachment 162903 Patch R=me. 715207 3 jamesr 2012-09-07 18:32:23 -0700 Committed r127952: <http://trac.webkit.org/changeset/127952> 162903 2012-09-07 16:38:07 -0700 2012-09-07 18:21:30 -0700 Patch bug-96155-20120907163746.patch text/plain 18286 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3OTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGM3NmQwM2JjZmZhZjBi YzdiNTk4ZTQxZGY2N2IyZjc2MjFjYzYwZC4uY2M0MmUxMjY4Njc2MzJhOTNmOGY5YWVhMzM2ZTUw NTRiZjdlNTkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA5LTA3ICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBS ZW1vdmUgdHJhbnNpdGlvbmFsIFdlYkNvbXBvc2l0b3JTdXBwb3J0IGZhbGxiYWNrIGNvZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MTU1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGltcGxlbWVu dGF0aW9uIG9mIFdlYkNvbXBvc2l0b3JTdXBwb3J0IGhhcyByb2xsZWQgb3V0IGV2ZXJ5d2hlcmUg YW5kIHRoZSBzdGF0aWMgOjpjcmVhdGUoKSBmdW5jdGlvbnMgYXJlCisgICAgICAgIGdvaW5nIHdh eS4KKworICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL2Nocm9taXVtL1Njcm9sbGluZ0Nvb3JkaW5h dG9yQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlU2Nyb2xsYmFyTGF5ZXIp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRyYW5zbGF0 aW9uVXRpbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVXZWJBbmltYXRpb24pOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzMkRMYXllckJyaWRnZTo6Q2FudmFzMkRMYXllckJy aWRnZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZl ckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXJQcml2YXRlOjpE cmF3aW5nQnVmZmVyUHJpdmF0ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNz TGF5ZXJDaHJvbWl1bTo6R3JhcGhpY3NMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6c2V0Q29udGVudHNUb0ltYWdlKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJQcmVzZXJ2ZXMzRCk6CisK KzIwMTItMDktMDcgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBbY2hyb21pdW1dIEltcGxlbWVudCBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbCBv biB0b3Agb2YgZXhwb3NlZCBBUEkgaW5zdGVhZCBvZiBDQyBpbnRlcm5hbHMKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2MTUxCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggNzFjNmUwNDhmYTdjYjFkNTIzYTY3MTQzYmQ4YTQ0ZGI0NzgzYzY2 OC4uZTQwMjE4YWE1YWE2ZWMwYmVmZTYyYjUxYTU2MjkzMDdmOTI4OGZjMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMi0wOS0wNyAgSmFtZXMgUm9iaW5z b24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIHRy YW5zaXRpb25hbCBXZWJDb21wb3NpdG9yU3VwcG9ydCBmYWxsYmFjayBjb2RlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjE1NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL0xpbmtIaWdobGlnaHQu Y3BwOgorICAgICAgICAoV2ViS2l0OjpMaW5rSGlnaGxpZ2h0OjpMaW5rSGlnaGxpZ2h0KToKKyAg ICAgICAgKFdlYktpdDo6TGlua0hpZ2hsaWdodDo6c3RhcnRIaWdobGlnaHRBbmltYXRpb24pOgor ICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnJlYWR5U3RhdGVDaGFuZ2VkKToKKyAgICAg ICAgKiBzcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBsdWdpbkNvbnRhaW5lckltcGw6OnNldEJhY2tpbmdUZXh0dXJlSWQpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZXRCYWNraW5nSU9TdXJmYWNlSWQpOgorICAg ICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBs OjpzZXRJc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUpOgorICAgICAgICAoV2ViS2l0KToK KworMjAxMi0wOS0wNyAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFtjaHJvbWl1bV0gSW1wbGVtZW50IFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBs IG9uIHRvcCBvZiBleHBvc2VkIEFQSSBpbnN0ZWFkIG9mIENDIGludGVybmFscwogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTYxNTEKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY2hyb21pdW0vU2Nyb2xsaW5nQ29vcmRp bmF0b3JDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jaHJvbWl1 bS9TY3JvbGxpbmdDb29yZGluYXRvckNocm9taXVtLmNwcAppbmRleCA1ZGU4ZjQyOTQxNTljZmZj NzI4MzAxOTJiZWZiMjQ4MjgzMzU2MjNmLi44MDdkZWNiNWY4MmQxNzVhMTI5YWU4ZjAyOGMyZDdk MmY0NzE4NGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jaHJv bWl1bS9TY3JvbGxpbmdDb29yZGluYXRvckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9jaHJvbWl1bS9TY3JvbGxpbmdDb29yZGluYXRvckNocm9taXVtLmNw cApAQCAtMzcsNiArMzcsOCBAQAogI2luY2x1ZGUgIlNjcm9sbGJhclRoZW1lQ29tcG9zaXRlLmgi CiAjaW5jbHVkZSAiV2ViU2Nyb2xsYmFySW1wbC5oIgogI2luY2x1ZGUgIldlYlNjcm9sbGJhclRo ZW1lR2VvbWV0cnlOYXRpdmUuaCIKKyNpbmNsdWRlIDxwdWJsaWMvUGxhdGZvcm0uaD4KKyNpbmNs dWRlIDxwdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2Vi U2Nyb2xsYmFyLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYlNjcm9sbGJhckxheWVyLmg+CiAjaW5j bHVkZSA8cHVibGljL1dlYlNjcm9sbGJhclRoZW1lR2VvbWV0cnkuaD4KQEAgLTE2MSw3ICsxNjMs NyBAQCBzdGF0aWMgUGFzc093blB0cjxXZWJTY3JvbGxiYXJMYXllcj4gY3JlYXRlU2Nyb2xsYmFy TGF5ZXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIsCiAgICAgV2ViS2l0OjpXZWJTY3JvbGxiYXJUaGVt ZVBhaW50ZXIgcGFpbnRlcih0aGVtZUNvbXBvc2l0ZSwgc2Nyb2xsYmFyKTsKICAgICBPd25QdHI8 V2ViS2l0OjpXZWJTY3JvbGxiYXJUaGVtZUdlb21ldHJ5PiBnZW9tZXRyeShXZWJLaXQ6OldlYlNj cm9sbGJhclRoZW1lR2VvbWV0cnlOYXRpdmU6OmNyZWF0ZSh0aGVtZUNvbXBvc2l0ZSkpOwogCi0g ICAgT3duUHRyPFdlYlNjcm9sbGJhckxheWVyPiBzY3JvbGxiYXJMYXllciA9IGFkb3B0UHRyKFdl YlNjcm9sbGJhckxheWVyOjpjcmVhdGUobmV3IFdlYktpdDo6V2ViU2Nyb2xsYmFySW1wbChzY3Jv bGxiYXIpLCBwYWludGVyLCBnZW9tZXRyeS5sZWFrUHRyKCkpKTsKKyAgICBPd25QdHI8V2ViU2Ny b2xsYmFyTGF5ZXI+IHNjcm9sbGJhckxheWVyID0gYWRvcHRQdHIoV2ViS2l0OjpQbGF0Zm9ybTo6 Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVTY3JvbGxiYXJMYXllcihuZXcg V2ViS2l0OjpXZWJTY3JvbGxiYXJJbXBsKHNjcm9sbGJhciksIHBhaW50ZXIsIGdlb21ldHJ5Lmxl YWtQdHIoKSkpOwogICAgIHNjcm9sbGJhckxheWVyLT5zZXRTY3JvbGxMYXllcihzY3JvbGxMYXll cik7CiAKICAgICBHcmFwaGljc0xheWVyQ2hyb21pdW06OnJlZ2lzdGVyQ29udGVudHNMYXllcihz Y3JvbGxiYXJMYXllci0+bGF5ZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25UcmFuc2xhdGlvblV0aWwuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9uVHJhbnNsYXRp b25VdGlsLmNwcAppbmRleCBhMWM0NTc0N2FlNjQ1MzkwOGJjNzU3ZTBjZDg5YzQzZTE0Zjc5MWRi Li4xZWU4ZWEwNTMwNTZjNWFmMmZiNTU0Njc0ODQyMWZkZTFiMDk0YThjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25UcmFuc2xh dGlvblV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRpbC5jcHAKQEAgLTI1MSwxMSArMjUxLDcgQEAgUGFz c093blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtl eWZyYW1lVmFsdWVMaXN0JiB2YWwKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0K IAotICAgIE93blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gd2ViQW5pbWF0aW9uOwotICAgIGlm IChXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBXZWJLaXQ6OlBsYXRm b3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAgIHdlYkFuaW1hdGlv biA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVBbmltYXRpb24oKmN1cnZlLCB0 YXJnZXRQcm9wZXJ0eSwgYW5pbWF0aW9uSWQpKTsKLSAgICBlbHNlCi0gICAgICAgIHdlYkFuaW1h dGlvbiA9IGFkb3B0UHRyKFdlYktpdDo6V2ViQW5pbWF0aW9uOjpjcmVhdGUoKmN1cnZlLCB0YXJn ZXRQcm9wZXJ0eSwgYW5pbWF0aW9uSWQpKTsKKyAgICBPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRp b24+IHdlYkFuaW1hdGlvbiA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0 b3JTdXBwb3J0KCktPmNyZWF0ZUFuaW1hdGlvbigqY3VydmUsIHRhcmdldFByb3BlcnR5LCBhbmlt YXRpb25JZCkpOwogCiAgICAgaW50IGl0ZXJhdGlvbnMgPSAoYW5pbWF0aW9uICYmIGFuaW1hdGlv bi0+aXNJdGVyYXRpb25Db3VudFNldCgpKSA/IGFuaW1hdGlvbi0+aXRlcmF0aW9uQ291bnQoKSA6 IDE7CiAgICAgd2ViQW5pbWF0aW9uLT5zZXRJdGVyYXRpb25zKGl0ZXJhdGlvbnMpOwpAQCAtMjcy LDIwICsyNjgsMTIgQEAgUGFzc093blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2Vi QW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWwKIAogCiAgICAgaWYgKHZhbHVl cy5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm0pIHsKLSAgICAg ICAgT3duUHRyPFdlYlRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlPiBjdXJ2ZTsKLSAgICAgICAgaWYg KFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9IFdlYktpdDo6UGxhdGZv cm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKSkKLSAgICAgICAgICAgIGN1cnZlID0g YWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZVRyYW5zZm9ybUFuaW1hdGlvbkN1cnZl KCkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjdXJ2ZSA9IGFkb3B0UHRyKFdlYlRyYW5z Zm9ybUFuaW1hdGlvbkN1cnZlOjpjcmVhdGUoKSk7CisgICAgICAgIE93blB0cjxXZWJUcmFuc2Zv cm1BbmltYXRpb25DdXJ2ZT4gY3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5j b21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVUcmFuc2Zvcm1BbmltYXRpb25DdXJ2ZSgpKTsKICAg ICAgICAgcmV0dXJuIGNyZWF0ZVdlYkFuaW1hdGlvbjxUcmFuc2Zvcm1BbmltYXRpb25WYWx1ZSwg V2ViVHJhbnNmb3JtS2V5ZnJhbWUsIFdlYlRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlPih2YWx1ZXMs IGFuaW1hdGlvbiwgYW5pbWF0aW9uSWQsIHRpbWVPZmZzZXQsIGN1cnZlLmdldCgpLCBXZWJLaXQ6 OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlUcmFuc2Zvcm0sIEZsb2F0U2l6ZShib3hTaXpl KSk7CiAgICAgfQogCiAgICAgaWYgKHZhbHVlcy5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVy dHlPcGFjaXR5KSB7Ci0gICAgICAgIE93blB0cjxXZWJGbG9hdEFuaW1hdGlvbkN1cnZlPiBjdXJ2 ZTsKLSAgICAgICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9 IFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKSkKLSAgICAg ICAgICAgIGN1cnZlID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUZsb2F0QW5p bWF0aW9uQ3VydmUoKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGN1cnZlID0gYWRvcHRQ dHIoV2ViRmxvYXRBbmltYXRpb25DdXJ2ZTo6Y3JlYXRlKCkpOworICAgICAgICBPd25QdHI8V2Vi RmxvYXRBbmltYXRpb25DdXJ2ZT4gY3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgp LT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVGbG9hdEFuaW1hdGlvbkN1cnZlKCkpOwogICAg ICAgICByZXR1cm4gY3JlYXRlV2ViQW5pbWF0aW9uPEZsb2F0QW5pbWF0aW9uVmFsdWUsIFdlYkZs b2F0S2V5ZnJhbWUsIFdlYkZsb2F0QW5pbWF0aW9uQ3VydmU+KHZhbHVlcywgYW5pbWF0aW9uLCBh bmltYXRpb25JZCwgdGltZU9mZnNldCwgY3VydmUuZ2V0KCksIFdlYktpdDo6V2ViQW5pbWF0aW9u OjpUYXJnZXRQcm9wZXJ0eU9wYWNpdHksIEZsb2F0U2l6ZSgpKTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5 ZXJCcmlkZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q2FudmFzMkRMYXllckJyaWRnZS5jcHAKaW5kZXggMTI2ZDYyZDgyZWE0NTRlNGY5OGUyYWQzOTVl OGU5MzI1Y2Y4ZmFlNi4uYjgxNmMzM2JjZTg1NmRkYWQ0NjQzODc5MGYxYTJhNGU1ZmViMTI3NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2Fu dmFzMkRMYXllckJyaWRnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5jcHAKQEAgLTc3LDExICs3Nyw3IEBAIENh bnZhczJETGF5ZXJCcmlkZ2U6OkNhbnZhczJETGF5ZXJCcmlkZ2UoUGFzc1JlZlB0cjxHcmFwaGlj c0NvbnRleHQzRD4gY29udGV4dCwKICAgICAgICAgICAgIGdyQ29udGV4dC0+cmVzZXRDb250ZXh0 KCk7CiAgICAgfQogCi0gICAgaWYgKFdlYktpdDo6V2ViQ29tcG9zaXRvclN1cHBvcnQqIGNvbXBv c2l0b3JTdXBwb3J0ID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3Vw cG9ydCgpKQotICAgICAgICBtX2xheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNy ZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKHRoaXMpKTsKLSAgICBlbHNlCi0gICAgICAgIG1fbGF5 ZXIgPSBhZG9wdFB0cihXZWJLaXQ6OldlYkV4dGVybmFsVGV4dHVyZUxheWVyOjpjcmVhdGUodGhp cykpOwotCisgICAgbV9sYXllciA9IGFkb3B0UHRyKFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQo KS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlRXh0ZXJuYWxUZXh0dXJlTGF5ZXIodGhpcykp OwogICAgIG1fbGF5ZXItPnNldFRleHR1cmVJZCh0ZXh0dXJlSWQpOwogICAgIG1fbGF5ZXItPnNl dFJhdGVMaW1pdENvbnRleHQoIWNvbXBvc2l0b3JUaHJlYWRpbmdFbmFibGVkIHx8IG1fdXNlRG91 YmxlQnVmZmVyaW5nKTsKICAgICBHcmFwaGljc0xheWVyQ2hyb21pdW06OnJlZ2lzdGVyQ29udGVu dHNMYXllcihtX2xheWVyLT5sYXllcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21p dW0uY3BwCmluZGV4IGJhNDk1ZWRkZTIxZjc3MWMzZmE0NTM2YTYyY2Q5MzRmNzFhMzAzODguLmYx MmE1YmEyN2ZlZDQyNTQ4OTVkZWY2N2FiNTgwZmEwNTU1ZDcyMDQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1 bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJh d2luZ0J1ZmZlckNocm9taXVtLmNwcApAQCAtMTY2LDExICsxNjYsOCBAQCBjbGFzcyBEcmF3aW5n QnVmZmVyUHJpdmF0ZSA6IHB1YmxpYyBXZWJLaXQ6OldlYkV4dGVybmFsVGV4dHVyZUxheWVyQ2xp ZW50IHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBEcmF3aW5nQnVmZmVyUHJpdmF0ZShEcmF3aW5n QnVmZmVyKiBkcmF3aW5nQnVmZmVyKQogICAgICAgICA6IG1fZHJhd2luZ0J1ZmZlcihkcmF3aW5n QnVmZmVyKQorICAgICAgICAsIG1fbGF5ZXIoYWRvcHRQdHIoV2ViS2l0OjpQbGF0Zm9ybTo6Y3Vy cmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVFeHRlcm5hbFRleHR1cmVMYXllcih0 aGlzKSkpCiAgICAgewotICAgICAgICBpZiAoV2ViS2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydCog Y29tcG9zaXRvclN1cHBvcnQgPSBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0 b3JTdXBwb3J0KCkpCi0gICAgICAgICAgICBtX2xheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1 cHBvcnQtPmNyZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKHRoaXMpKTsKLSAgICAgICAgZWxzZQot ICAgICAgICAgICAgbV9sYXllciA9IGFkb3B0UHRyKFdlYktpdDo6V2ViRXh0ZXJuYWxUZXh0dXJl TGF5ZXI6OmNyZWF0ZSh0aGlzKSk7CiAKICAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJp YnV0ZXMgYXR0cmlidXRlcyA9IG1fZHJhd2luZ0J1ZmZlci0+Z3JhcGhpY3NDb250ZXh0M0QoKS0+ Z2V0Q29udGV4dEF0dHJpYnV0ZXMoKTsKICAgICAgICAgbV9sYXllci0+c2V0T3BhcXVlKCFhdHRy aWJ1dGVzLmFscGhhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCmluZGV4 IGMxZmZhZjJiZThjOTg1MGIxMWI5MWZjYjUwM2Q4NzU5NTE5ZmU4NzIuLjBhYTE0NWIwMTZmMzhk OWViMTc2YmNkODYwNzEzZjIyYzg4N2JlYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNo cm9taXVtLmNwcApAQCAtOTMsMTIgKzkzLDcgQEAgR3JhcGhpY3NMYXllckNocm9taXVtOjpHcmFw aGljc0xheWVyQ2hyb21pdW0oR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogICAgICwgbV9z Y3JvbGxhYmxlQXJlYSgwKQogewogICAgIG1fb3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGUgPSBhZG9wdFB0cihuZXcgT3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVs ZWdhdGUodGhpcykpOwotCi0gICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9y U3VwcG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAg ICAgIG1fbGF5ZXIgPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlQ29udGVudExh eWVyKG1fb3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUuZ2V0KCkpKTsKLSAg ICBlbHNlCi0gICAgICAgIG1fbGF5ZXIgPSBhZG9wdFB0cihXZWJDb250ZW50TGF5ZXI6OmNyZWF0 ZShtX29wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVnYXRlLmdldCgpKSk7Ci0KKyAg ICBtX2xheWVyID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBv cnQoKS0+Y3JlYXRlQ29udGVudExheWVyKG1fb3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVy RGVsZWdhdGUuZ2V0KCkpKTsKICAgICBtX2xheWVyLT5sYXllcigpLT5zZXREcmF3c0NvbnRlbnQo bV9kcmF3c0NvbnRlbnQgJiYgbV9jb250ZW50c1Zpc2libGUpOwogICAgIG1fbGF5ZXItPmxheWVy KCktPnNldFNjcm9sbENsaWVudCh0aGlzKTsKICAgICB1cGRhdGVEZWJ1Z0luZGljYXRvcnMoKTsK QEAgLTQ2NiwxMCArNDYxLDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnNldENvbnRl bnRzVG9JbWFnZShJbWFnZSogaW1hZ2UpCiAgICAgYm9vbCBjaGlsZHJlbkNoYW5nZWQgPSBmYWxz ZTsKICAgICBpZiAoaW1hZ2UpIHsKICAgICAgICAgaWYgKG1fY29udGVudHNMYXllclB1cnBvc2Ug IT0gQ29udGVudHNMYXllckZvckltYWdlKSB7Ci0gICAgICAgICAgICBpZiAoV2ViQ29tcG9zaXRv clN1cHBvcnQqIGNvbXBvc2l0b3JTdXBwb3J0ID0gUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9z aXRvclN1cHBvcnQoKSkKLSAgICAgICAgICAgICAgICBtX2ltYWdlTGF5ZXIgPSBhZG9wdFB0cihj b21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlSW1hZ2VMYXllcigpKTsKLSAgICAgICAgICAgIGVsc2UK LSAgICAgICAgICAgICAgICBtX2ltYWdlTGF5ZXIgPSBhZG9wdFB0cihXZWJJbWFnZUxheWVyOjpj cmVhdGUoKSk7CisgICAgICAgICAgICBtX2ltYWdlTGF5ZXIgPSBhZG9wdFB0cihQbGF0Zm9ybTo6 Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVJbWFnZUxheWVyKCkpOwogICAg ICAgICAgICAgcmVnaXN0ZXJDb250ZW50c0xheWVyKG1faW1hZ2VMYXllci0+bGF5ZXIoKSk7CiAK ICAgICAgICAgICAgIHNldHVwQ29udGVudHNMYXllcihtX2ltYWdlTGF5ZXItPmxheWVyKCkpOwpA QCAtNzIyLDExICs3MTQsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlTWFz a3NUb0JvdW5kcygpCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJQcmVz ZXJ2ZXMzRCgpCiB7CiAgICAgaWYgKG1fcHJlc2VydmVzM0QgJiYgIW1fdHJhbnNmb3JtTGF5ZXIp IHsKLSAgICAgICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9 IFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAgICAgICBt X3RyYW5zZm9ybUxheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUxheWVy KCkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3RyYW5zZm9ybUxheWVyID0gYWRvcHRQ dHIoV2ViTGF5ZXI6OmNyZWF0ZSgpKTsKLQorICAgICAgICBtX3RyYW5zZm9ybUxheWVyID0gYWRv cHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKS0+Y3JlYXRlTGF5 ZXIoKSk7CiAgICAgICAgIG1fdHJhbnNmb3JtTGF5ZXItPnNldFByZXNlcnZlczNEKHRydWUpOwog ICAgICAgICBtX3RyYW5zZm9ybUxheWVyLT5zZXRBbmltYXRpb25EZWxlZ2F0ZSh0aGlzKTsKICAg ICAgICAgbV9sYXllci0+bGF5ZXIoKS0+dHJhbnNmZXJBbmltYXRpb25zVG8obV90cmFuc2Zvcm1M YXllci5nZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5r SGlnaGxpZ2h0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQu Y3BwCmluZGV4IDFjZDZhZmI0NDkwNGM0ZTJmYjYwZmZlMzRlNjI4YjFjNjk0MTQ3ZGYuLjA0MDY2 MTAxNzZhNDc3ZWE2ZGNhMGVjMzI4YTZmODlmZTNkODEwY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0xpbmtIaWdobGlnaHQuY3BwCkBAIC02OCwxMyArNjgsOSBAQCBMaW5rSGln aGxpZ2h0OjpMaW5rSGlnaGxpZ2h0KE5vZGUqIG5vZGUsIFdlYlZpZXdJbXBsKiBvd25pbmdXZWJW aWV3SW1wbCkKIHsKICAgICBBU1NFUlQobV9ub2RlKTsKICAgICBBU1NFUlQob3duaW5nV2ViVmll d0ltcGwpOwotICAgIGlmIChXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQg PSBQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpKSB7Ci0gICAgICAgIG1f Y29udGVudExheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUNvbnRlbnRM YXllcih0aGlzKSk7Ci0gICAgICAgIG1fY2xpcExheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1 cHBvcnQtPmNyZWF0ZUxheWVyKCkpOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fY29udGVudExh eWVyID0gYWRvcHRQdHIoV2ViQ29udGVudExheWVyOjpjcmVhdGUodGhpcykpOwotICAgICAgICBt X2NsaXBMYXllciA9IGFkb3B0UHRyKFdlYkxheWVyOjpjcmVhdGUoKSk7Ci0gICAgfQorICAgIFdl YkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50 KCktPmNvbXBvc2l0b3JTdXBwb3J0KCk7CisgICAgbV9jb250ZW50TGF5ZXIgPSBhZG9wdFB0cihj b21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlQ29udGVudExheWVyKHRoaXMpKTsKKyAgICBtX2NsaXBM YXllciA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVMYXllcigpKTsKICAgICBt X2NsaXBMYXllci0+c2V0QW5jaG9yUG9pbnQoV2ViRmxvYXRQb2ludCgpKTsKICAgICBtX2NsaXBM YXllci0+YWRkQ2hpbGQobV9jb250ZW50TGF5ZXItPmxheWVyKCkpOwogICAgIG1fY29udGVudExh eWVyLT5sYXllcigpLT5zZXREcmF3c0NvbnRlbnQoZmFsc2UpOwpAQCAtMjA4LDIxICsyMDQsMTQg QEAgdm9pZCBMaW5rSGlnaGxpZ2h0OjpzdGFydEhpZ2hsaWdodEFuaW1hdGlvbigpCiAKICAgICBX ZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBQbGF0Zm9ybTo6Y3VycmVu dCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpOwogCi0gICAgT3duUHRyPFdlYkZsb2F0QW5pbWF0aW9u Q3VydmU+IGN1cnZlOwotICAgIGlmIChjb21wb3NpdG9yU3VwcG9ydCkKLSAgICAgICAgY3VydmUg PSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlRmxvYXRBbmltYXRpb25DdXJ2ZSgp KTsKLSAgICBlbHNlCi0gICAgICAgIGN1cnZlID0gYWRvcHRQdHIoV2ViRmxvYXRBbmltYXRpb25D dXJ2ZTo6Y3JlYXRlKCkpOworICAgIE93blB0cjxXZWJGbG9hdEFuaW1hdGlvbkN1cnZlPiBjdXJ2 ZSA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVGbG9hdEFuaW1hdGlvbkN1cnZl KCkpOwogCiAgICAgY3VydmUtPmFkZChXZWJGbG9hdEtleWZyYW1lKDAsIHN0YXJ0T3BhY2l0eSkp OwogICAgIGN1cnZlLT5hZGQoV2ViRmxvYXRLZXlmcmFtZShkdXJhdGlvbiAvIDIsIHN0YXJ0T3Bh Y2l0eSkpOwogICAgIC8vIEZvciBsYXlvdXQgdGVzdHMgd2UgZG9uJ3QgZmFkZSBvdXQuCiAgICAg Y3VydmUtPmFkZChXZWJGbG9hdEtleWZyYW1lKGR1cmF0aW9uLCBXZWJLaXQ6OmxheW91dFRlc3RN b2RlKCkgPyBzdGFydE9wYWNpdHkgOiAwKSk7CiAKLSAgICBpZiAoY29tcG9zaXRvclN1cHBvcnQp Ci0gICAgICAgIG1fYW5pbWF0aW9uID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0 ZUFuaW1hdGlvbigqY3VydmUsIFdlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlPcGFjaXR5KSk7 Ci0gICAgZWxzZQotICAgICAgICBtX2FuaW1hdGlvbiA9IGFkb3B0UHRyKFdlYkFuaW1hdGlvbjo6 Y3JlYXRlKCpjdXJ2ZSwgV2ViQW5pbWF0aW9uOjpUYXJnZXRQcm9wZXJ0eU9wYWNpdHkpKTsKKyAg ICBtX2FuaW1hdGlvbiA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVBbmltYXRp b24oKmN1cnZlLCBXZWJBbmltYXRpb246OlRhcmdldFByb3BlcnR5T3BhY2l0eSkpOwogCiAgICAg bV9jb250ZW50TGF5ZXItPmxheWVyKCktPnNldERyYXdzQ29udGVudCh0cnVlKTsKICAgICBtX2Nv bnRlbnRMYXllci0+bGF5ZXIoKS0+YWRkQW5pbWF0aW9uKG1fYW5pbWF0aW9uLmdldCgpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVu dEltcGwuY3BwCmluZGV4IDEzZDAwMzJhM2QyODBmMmI2NDNiNzA2YTMxYTg1YzIxNTM2NTA4OGUu LmU1NzBkY2E1YTgwOTAxOGY0NzA1MTk0YTdmNmZlZjlmOGI3Y2I4ZWMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNw cApAQCAtMTE4LDEwICsxMTgsNyBAQCB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cmVh ZHlTdGF0ZUNoYW5nZWQoKQogICAgIG1fbWVkaWFQbGF5ZXItPnJlYWR5U3RhdGVDaGFuZ2VkKCk7 CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlmIChoYXNWaWRlbygpICYm IHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSAmJiAhbV92aWRlb0xheWVyKSB7Ci0gICAg ICAgIGlmIChXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBQbGF0Zm9y bTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpKQotICAgICAgICAgICAgbV92aWRlb0xh eWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZVZpZGVvTGF5ZXIodGhpcykp OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3ZpZGVvTGF5ZXIgPSBhZG9wdFB0cihXZWJW aWRlb0xheWVyOjpjcmVhdGUodGhpcykpOworICAgICAgICBtX3ZpZGVvTGF5ZXIgPSBhZG9wdFB0 cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVWaWRlb0xh eWVyKHRoaXMpKTsKIAogICAgICAgICBtX3ZpZGVvTGF5ZXItPmxheWVyKCktPnNldE9wYXF1ZSht X29wYXF1ZSk7CiAgICAgICAgIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6cmVnaXN0ZXJDb250ZW50 c0xheWVyKG1fdmlkZW9MYXllci0+bGF5ZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCmluZGV4IDk3YmE2MWY3YThj ZjFjMjllMWYyMmU1NDM3YTVjOTM4YjI5Mjg3NTYuLjUyNGJhODBmOGQxZmVlM2U5M2RmZjhlZGRm NjRjMzMyNjc5M2JmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCkBAIC0zNzIsMTAgKzM3Miw3IEBAIHZvaWQgV2Vi UGx1Z2luQ29udGFpbmVySW1wbDo6c2V0QmFja2luZ1RleHR1cmVJZCh1bnNpZ25lZCB0ZXh0dXJl SWQpCiAgICAgQVNTRVJUKCFtX2lvU3VyZmFjZUxheWVyKTsKIAogICAgIGlmICghbV90ZXh0dXJl TGF5ZXIpIHsKLSAgICAgICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3Vw cG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAg ICAgICBtX3RleHR1cmVMYXllciA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVF eHRlcm5hbFRleHR1cmVMYXllcigpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV90ZXh0 dXJlTGF5ZXIgPSBhZG9wdFB0cihXZWJFeHRlcm5hbFRleHR1cmVMYXllcjo6Y3JlYXRlKCkpOwor ICAgICAgICBtX3RleHR1cmVMYXllciA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNv bXBvc2l0b3JTdXBwb3J0KCktPmNyZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKCkpOwogICAgICAg ICBHcmFwaGljc0xheWVyQ2hyb21pdW06OnJlZ2lzdGVyQ29udGVudHNMYXllcihtX3RleHR1cmVM YXllci0+bGF5ZXIoKSk7CiAgICAgfQogICAgIG1fdGV4dHVyZUxheWVyLT5zZXRUZXh0dXJlSWQo dGV4dHVyZUlkKTsKQEAgLTQwMSwxMCArMzk4LDcgQEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJ bXBsOjpzZXRCYWNraW5nSU9TdXJmYWNlSWQoaW50IHdpZHRoLAogICAgIEFTU0VSVCghbV90ZXh0 dXJlTGF5ZXIpOwogCiAgICAgaWYgKCFtX2lvU3VyZmFjZUxheWVyKSB7Ci0gICAgICAgIGlmIChX ZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBQbGF0Zm9ybTo6Y3VycmVu dCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpKQotICAgICAgICAgICAgbV9pb1N1cmZhY2VMYXllciA9 IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVJT1N1cmZhY2VMYXllcigpKTsKLSAg ICAgICAgZWxzZQotICAgICAgICAgICAgbV9pb1N1cmZhY2VMYXllciA9IGFkb3B0UHRyKFdlYklP U3VyZmFjZUxheWVyOjpjcmVhdGUoKSk7CisgICAgICAgIG1faW9TdXJmYWNlTGF5ZXIgPSBhZG9w dFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpLT5jcmVhdGVJT1N1 cmZhY2VMYXllcigpKTsKICAgICAgICAgR3JhcGhpY3NMYXllckNocm9taXVtOjpyZWdpc3RlckNv bnRlbnRzTGF5ZXIobV9pb1N1cmZhY2VMYXllci0+bGF5ZXIoKSk7CiAgICAgfQogICAgIG1faW9T dXJmYWNlTGF5ZXItPnNldElPU3VyZmFjZVByb3BlcnRpZXMoaW9TdXJmYWNlSWQsIFdlYlNpemUo d2lkdGgsIGhlaWdodCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCmluZGV4IGM5MzU3ODcyOGQyYTZlYjA2OTM2MmFiZjNkM2FlYTEzYTcxOGU4ODIuLjc0OTEy YzZlYTcyMDdlNzQ4ODQ5ODE1ZDk5MmMwNGVkNzMxZWIzYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTM3OTIsNyArMzc5Miw3IEBAIHZvaWQgV2Vi Vmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0FjdGl2ZShib29sIGFjdGl2ZSkK ICAgICAgICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3QtPnNldFNob3dEZWJ1Z0JvcmRlcnMo cGFnZSgpLT5zZXR0aW5ncygpLT5zaG93RGVidWdCb3JkZXJzKCkpOwogICAgICAgICBtX25vbkNv bXBvc2l0ZWRDb250ZW50SG9zdC0+c2V0T3BhcXVlKCFpc1RyYW5zcGFyZW50KCkpOwogCi0gICAg ICAgIG1fbGF5ZXJUcmVlVmlldyA9IGFkb3B0UHRyKFdlYkxheWVyVHJlZVZpZXc6OmNyZWF0ZSh0 aGlzLCAqbV9yb290TGF5ZXIsIGxheWVyVHJlZVZpZXdTZXR0aW5ncykpOworICAgICAgICBtX2xh eWVyVHJlZVZpZXcgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3Vw cG9ydCgpLT5jcmVhdGVMYXllclRyZWVWaWV3KHRoaXMsICptX3Jvb3RMYXllciwgbGF5ZXJUcmVl Vmlld1NldHRpbmdzKSk7CiAgICAgICAgIGlmIChtX2xheWVyVHJlZVZpZXcpIHsKICAgICAgICAg ICAgIGlmIChtX3dlYlNldHRpbmdzLT5hcHBseURlZmF1bHREZXZpY2VTY2FsZUZhY3RvckluQ29t cG9zaXRvcigpICYmIHBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSAhPSAxKSB7CiAgICAgICAg ICAgICAgICAgQVNTRVJUKHBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKSk7Cg==