175634 2017-08-16 11:57:48 -0700 Make RenderLayer and RenderLayerBacking TextStream-loggable, and clean up compositing logging 2017-08-16 13:31:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser webkit-bug-importer zalan oldest_to_newest 1339236 0 simon.fraser 2017-08-16 11:57:48 -0700 Make RenderLayer and RenderLayerBacking TextStream-loggable, and clean up compositing logging 1339239 1 318279 simon.fraser 2017-08-16 12:00:29 -0700 Created attachment 318279 Patch 1339270 2 318279 commit-queue 2017-08-16 13:30:50 -0700 Comment on attachment 318279 Patch Clearing flags on attachment: 318279 Committed r220806: <http://trac.webkit.org/changeset/220806> 1339271 3 commit-queue 2017-08-16 13:30:52 -0700 All reviewed patches have been landed. Closing bug. 1339272 4 webkit-bug-importer 2017-08-16 13:31:56 -0700 <rdar://problem/33925550> 318279 2017-08-16 12:00:29 -0700 2017-08-16 13:30:50 -0700 Patch bug-175634-20170816120027.patch text/plain 17974 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM5N2JkOWY1NDQ1YTE3 NmQ4ZDczOTliZTE1NjczMWU1NTU0ZWU2ZC4uOWIyMzE3ZmU1ZjYzMDU0M2E4YmY1NDdlZGY0ZjM4 ZWQ3NjdkOTJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE3LTA4LTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgUmVuZGVy TGF5ZXIgYW5kIFJlbmRlckxheWVyQmFja2luZyBUZXh0U3RyZWFtLWxvZ2dhYmxlLCBhbmQgY2xl YW4gdXAgY29tcG9zaXRpbmcgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc1NjM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIG9wZXJhdG9yPDwoVGV4dFN0cmVhbSYpIGZvciBSZW5kZXJM YXllciBhbmQgUmVuZGVyTGF5ZXIgYmFja2luZywgYW5kIHVzZSB0aGVtIGZvciBjb21wb3NpdGlu ZyBsb2dnaW5nLgorCisgICAgICAgIENvbnZlcnQgQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHRvIGFu IGVudW0gY2xhc3MuCisKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJMYXlvdXQpOgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVy U2Nyb2xsaW5nKToKKyAgICAgICAgKiBwYWdlL2lvcy9GcmFtZUlPUy5tbToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lOjp2aWV3cG9ydE9mZnNldENoYW5nZWQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6dXBkYXRl TGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNBZnRlclNjcm9sbCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6Y2FsY3VsYXRlQ2xpcFJlY3RzIGNvbnN0KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQWZ0 ZXJMYXlvdXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVH ZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcjw8KToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmRpZFJlY2FsY1N0eWxlV2l0aE5vUGVuZGluZ0xheW91dCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZ0xheWVyQ2hhbmdlcyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5 ZXJzVGltZXJGaXJlZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6 OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6bGF5ZXJUcmVlQXNUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJhdG9y PDwpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKwogMjAx Ny0wOC0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBBbGxvdyBXZWJDb3JlIGxvZ2dpbmcgY2hhbm5lbHMgdG8gYmUgc2V0IGZyb20gdGhlIFVJIHBy b2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAppbmRleCBhMmQxODQwZjQ3NzAzNzM0MDI5 NzI2MDVhYjlhMTkwOGM4YTRhZTdmLi44YWJkN2RkMjZjYzFmNTNiM2NlNjQzOGM0ZmEyZjRkYzBk OTZhY2I2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC04ODksNyArODg5LDcgQEAg dm9pZCBGcmFtZVZpZXc6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzQWZ0ZXJMYXlvdXQoKQogCiAg ICAgLy8gVGhpcyBjYWxsIHdpbGwgbWFrZSBzdXJlIHRoZSBjYWNoZWQgaGFzQWNjZWxlcmF0ZWRD b21wb3NpdGluZyBpcyB1cGRhdGVkIGZyb20gdGhlIHByZWYKICAgICByZW5kZXJWaWV3LT5jb21w b3NpdG9yKCkuY2FjaGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nRmxhZ3MoKTsKLSAgICByZW5kZXJW aWV3LT5jb21wb3NpdG9yKCkudXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRh dGVBZnRlckxheW91dCk7CisgICAgcmVuZGVyVmlldy0+Y29tcG9zaXRvcigpLnVwZGF0ZUNvbXBv c2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6QWZ0ZXJMYXlvdXQpOwogfQogCiB2 b2lkIEZyYW1lVmlldzo6Y2xlYXJCYWNraW5nU3RvcmVzKCkKQEAgLTI2OTAsNyArMjY5MCw3IEBA IHZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsaW5nKCkK IAogICAgIGlmIChtX25lc3RlZExheW91dENvdW50IDw9IDEgJiYgaGFzVmlld3BvcnRDb25zdHJh aW5lZE9iamVjdHMoKSkgewogICAgICAgICBpZiAoUmVuZGVyVmlldyogcmVuZGVyVmlldyA9IHRo aXMtPnJlbmRlclZpZXcoKSkKLSAgICAgICAgICAgIHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS51 cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZU9uU2Nyb2xsKTsKKyAgICAg ICAgICAgIHJlbmRlclZpZXctPmNvbXBvc2l0b3IoKS51cGRhdGVDb21wb3NpdGluZ0xheWVycyhD b21wb3NpdGluZ1VwZGF0ZVR5cGU6Ok9uU2Nyb2xsKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvaW9zL0ZyYW1lSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9pb3MvRnJhbWVJT1MubW0KaW5kZXggYjY2Mzg3YmRmYjg5OWE2Yjc1MzM4MjkzNTE2MjNjMDAz MmJhNjA1ZC4uNDJjOGIzMWVmNmJmZmE2ODI4NTc1ODQ0ZDg5MTA0NGZjNjk5ZThiMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0KQEAgLTcxOCw3ICs3MTgsNyBAQCB2b2lkIEZyYW1l Ojp2aWV3cG9ydE9mZnNldENoYW5nZWQoVmlld3BvcnRPZmZzZXRDaGFuZ2VUeXBlIGNoYW5nZVR5 cGUpCiAKICAgICBpZiAoY2hhbmdlVHlwZSA9PSBDb21wbGV0ZWRTY3JvbGxPZmZzZXQpIHsKICAg ICAgICAgaWYgKFJlbmRlclZpZXcqIHJvb3QgPSBjb250ZW50UmVuZGVyZXIoKSkKLSAgICAgICAg ICAgIHJvb3QtPmNvbXBvc2l0b3IoKS51cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGlu Z1VwZGF0ZU9uU2Nyb2xsKTsKKyAgICAgICAgICAgIHJvb3QtPmNvbXBvc2l0b3IoKS51cGRhdGVD b21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGU6Ok9uU2Nyb2xsKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IGFhOGQw YWY4NTUxOTRkOThiY2MyZWFkYTcwMzRjNmNkMjNhOGQ4YjAuLjRlYWFiYmQ3ZTlkNzM4MWI5YjUy Nzc3Mjk1NWFlZGFkZWU0YjFlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcApAQCAtNDcyLDYgKzQ3Miw3IEBAIEZpbHRlckVmZmVjdFJlbmRlcmVyKiBSZW5kZXJM YXllcjo6ZmlsdGVyUmVuZGVyZXIoKSBjb25zdAogCiB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVM YXllclBvc2l0aW9uc0FmdGVyTGF5b3V0KGNvbnN0IFJlbmRlckxheWVyKiByb290TGF5ZXIsIFVw ZGF0ZUxheWVyUG9zaXRpb25zRmxhZ3MgZmxhZ3MpCiB7CisgICAgTE9HKENvbXBvc2l0aW5nLCAi UmVuZGVyTGF5ZXIgJXAgdXBkYXRlTGF5ZXJQb3NpdGlvbnNBZnRlckxheW91dCIsIHRoaXMpOwog ICAgIFJlbmRlckdlb21ldHJ5TWFwIGdlb21ldHJ5TWFwKFVzZVRyYW5zZm9ybXMpOwogICAgIGlm ICh0aGlzICE9IHJvb3RMYXllcikKICAgICAgICAgZ2VvbWV0cnlNYXAucHVzaE1hcHBpbmdzVG9B bmNlc3RvcihwYXJlbnQoKSwgbnVsbHB0cik7CkBAIC0yNTk0LDkgKzI1OTUsOSBAQCB2b2lkIFJl bmRlckxheWVyOjp1cGRhdGVDb21wb3NpdGluZ0xheWVyc0FmdGVyU2Nyb2xsKCkKICAgICAgICAg Ly8gcmVwb3NpdGlvbmluZywgc28gdXBkYXRlIGNvbXBvc2l0aW5nIGxheWVycyBmcm9tIHRoZXJl LgogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIqIGNvbXBvc2l0aW5nQW5jZXN0b3IgPSBzdGFja2lu Z0NvbnRhaW5lcigpLT5lbmNsb3NpbmdDb21wb3NpdGluZ0xheWVyKCkpIHsKICAgICAgICAgICAg IGlmICh1c2VzQ29tcG9zaXRlZFNjcm9sbGluZygpICYmICFoYXNPdXRPZkZsb3dQb3NpdGlvbmVk RGVzY2VuZGFudCgpKQotICAgICAgICAgICAgICAgIGNvbXBvc2l0b3IoKS51cGRhdGVDb21wb3Np dGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZU9uQ29tcG9zaXRlZFNjcm9sbCwgY29tcG9zaXRp bmdBbmNlc3Rvcik7CisgICAgICAgICAgICAgICAgY29tcG9zaXRvcigpLnVwZGF0ZUNvbXBvc2l0 aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6T25Db21wb3NpdGVkU2Nyb2xsLCBjb21w b3NpdGluZ0FuY2VzdG9yKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBjb21w b3NpdG9yKCkudXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVPblNjcm9s bCwgY29tcG9zaXRpbmdBbmNlc3Rvcik7CisgICAgICAgICAgICAgICAgY29tcG9zaXRvcigpLnVw ZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6T25TY3JvbGwsIGNv bXBvc2l0aW5nQW5jZXN0b3IpOwogICAgICAgICB9CiAgICAgfQogfQpAQCAtNjQ5MSw3ICs2NDky LDcgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlQ29tcG9zaXRpbmdBbmRMYXllckxpc3RzSWZO ZWVkZWQoKQogewogICAgIGlmIChjb21wb3NpdG9yKCkuaW5Db21wb3NpdGluZ01vZGUoKSkgewog ICAgICAgICBpZiAoaXNEaXJ0eVN0YWNraW5nQ29udGFpbmVyKCkgfHwgbV9ub3JtYWxGbG93TGlz dERpcnR5KQotICAgICAgICAgICAgY29tcG9zaXRvcigpLnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJz KENvbXBvc2l0aW5nVXBkYXRlT25IaXRUZXN0LCB0aGlzKTsKKyAgICAgICAgICAgIGNvbXBvc2l0 b3IoKS51cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGU6Ok9uSGl0 VGVzdCwgdGhpcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTcyMzUsNiArNzIzNiwy NCBAQCBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogUmVuZGVyTGF5ZXI6OmN1cnJlbnRSZW5kZXJO YW1lZEZsb3dGcmFnbWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHJlbmRlcmVyKCkuY3VycmVudFJl bmRlck5hbWVkRmxvd0ZyYWdtZW50KCk7CiB9CiAKK1RleHRTdHJlYW0mIG9wZXJhdG9yPDwoVGV4 dFN0cmVhbSYgdHMsIGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikKK3sKKyAgICB0cyA8PCAiUmVu ZGVyTGF5ZXIgIiA8PCAmbGF5ZXIgPDwgIiAiIDw8IGxheWVyLnNpemUoKTsKKyAgICBpZiAobGF5 ZXIudHJhbnNmb3JtKCkpCisgICAgICAgIHRzIDw8ICIgaGFzIHRyYW5zZm9ybSI7CisgICAgaWYg KGxheWVyLmhhc0ZpbHRlcigpKQorICAgICAgICB0cyA8PCAiIGhhcyBmaWx0ZXIiOworICAgIGlm IChsYXllci5oYXNCYWNrZHJvcEZpbHRlcigpKQorICAgICAgICB0cyA8PCAiIGhhcyBiYWNrZHJv cCBmaWx0ZXIiOworICAgIGlmIChsYXllci5oYXNCbGVuZE1vZGUoKSkKKyAgICAgICAgdHMgPDwg IiBoYXMgYmxlbmQgbW9kZSI7CisgICAgaWYgKGxheWVyLmlzb2xhdGVzQmxlbmRpbmcoKSkKKyAg ICAgICAgdHMgPDwgIiBpc29sYXRlcyBibGVuZGluZyI7CisgICAgaWYgKGxheWVyLmlzQ29tcG9z aXRlZCgpKQorICAgICAgICB0cyA8PCAiICIgPDwgKmxheWVyLmJhY2tpbmcoKTsKKyAgICByZXR1 cm4gdHM7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2lmIEVOQUJMRShUUkVFX0RF QlVHR0lORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggMTg0MTk5 ZTMwNmIxYWZmYzk1Y2RlOTVlNDdkMDYxNGJjNzJiZWRiNC4uNGExZDJhYWQwYmFmYWYwZTRhZTQ4 Y2Y2MGE4YjQ3Y2JkMWMzMWZmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmgKQEAgLTUyLDYgKzUyLDEwIEBACiAjaW5jbHVkZSAiU2Nyb2xsYWJsZUFyZWEuaCIKICNpbmNs dWRlIDxtZW1vcnk+CiAKK25hbWVzcGFjZSBXVEYgeworY2xhc3MgVGV4dFN0cmVhbTsKK30KKwog bmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBDbGlwUmVjdHM7CkBAIC0xMjM0LDYgKzEyMzgs OCBAQCB2b2lkIG1ha2VNYXRyaXhSZW5kZXJhYmxlKFRyYW5zZm9ybWF0aW9uTWF0cml4JiwgYm9v bCBoYXMzRFJlbmRlcmluZyk7CiAKIGJvb2wgY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUo Y29uc3QgUmVuZGVyTGF5ZXImKTsKIAorV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdURjo6 VGV4dFN0cmVhbSYsIGNvbnN0IFJlbmRlckxheWVyJik7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIAogI2lmIEVOQUJMRShUUkVFX0RFQlVHR0lORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggYTY2NzA0Y2JiNmVkY2FlNjA0Yzg1 NTQ0YTY2YTQwM2NmZThkNzBjMC4uMDE2MWNhNTE2Y2NkYzM0OTE1OWM2ZjcwZTgzYmE0ZTFlYzE4 MjE5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKQEAgLTY1LDYgKzY1LDcgQEAKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUg IlN0eWxlUmVzb2x2ZXIuaCIKICNpbmNsdWRlICJUaWxlZEJhY2tpbmcuaCIKKyNpbmNsdWRlIDx3 dGYvdGV4dC9UZXh0U3RyZWFtLmg+CiAKICNpZiBQTEFURk9STShJT1MpCiAjaW5jbHVkZSAiUnVu dGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgiCkBAIC02MzQsNiArNjM1LDggQEAgdm9pZCBSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyV2lkZ2V0UmVzaXplKCkKIAogdm9pZCBSZW5kZXJMYXll ckJhY2tpbmc6OnVwZGF0ZUFmdGVyTGF5b3V0KFVwZGF0ZUFmdGVyTGF5b3V0RmxhZ3MgZmxhZ3Mp CiB7CisgICAgTE9HKENvbXBvc2l0aW5nLCAiUmVuZGVyTGF5ZXJCYWNraW5nICVwIHVwZGF0ZUFm dGVyTGF5b3V0IChsYXllciAlcCkiLCB0aGlzLCAmbV9vd25pbmdMYXllcik7CisKICAgICBpZiAo IWNvbXBvc2l0b3IoKS5jb21wb3NpdGluZ0xheWVyc05lZWRSZWJ1aWxkKCkpIHsKICAgICAgICAg Ly8gQ2FsbGluZyB1cGRhdGVHZW9tZXRyeSgpIGhlcmUgZ2l2ZXMgaW5jb3JyZWN0IHJlc3VsdHMs IGJlY2F1c2UgdGhlCiAgICAgICAgIC8vIHBvc2l0aW9uIG9mIHRoaXMgbGF5ZXIncyBHcmFwaGlj c0xheWVyIGRlcGVuZHMgb24gdGhlIHBvc2l0aW9uIG9mIG91ciBjb21wb3NpdGluZwpAQCAtOTQw LDYgKzk0Myw4IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXJCYWNraW5nOjpjb21wdXRlUGFyZW50 R3JhcGhpY3NMYXllclJlY3QoUmVuZGVyTGF5ZXIqIGNvbXBvCiAKIHZvaWQgUmVuZGVyTGF5ZXJC YWNraW5nOjp1cGRhdGVHZW9tZXRyeSgpCiB7CisgICAgTE9HX1dJVEhfU1RSRUFNKENvbXBvc2l0 aW5nLCBzdHJlYW0gPDwgInVwZGF0ZUdlb21ldHJ5ICIgPDwgbV9vd25pbmdMYXllcik7CisKICAg ICAvLyBJZiB3ZSBoYXZlbid0IGJ1aWx0IHotb3JkZXIgbGlzdHMgeWV0LCB3YWl0IHVudGlsIGxh dGVyLgogICAgIGlmIChtX293bmluZ0xheWVyLmlzU3RhY2tpbmdDb250YWluZXIoKSAmJiBtX293 bmluZ0xheWVyLm1fek9yZGVyTGlzdHNEaXJ0eSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzA0MSw0 ICszMDQ2LDIzIEBAIGRvdWJsZSBSZW5kZXJMYXllckJhY2tpbmc6OmJhY2tpbmdTdG9yZU1lbW9y eUVzdGltYXRlKCkgY29uc3QKICAgICByZXR1cm4gYmFja2luZ01lbW9yeTsKIH0KIAorVGV4dFN0 cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgUmVuZGVyTGF5ZXJCYWNraW5n JiBiYWNraW5nKQoreworICAgIHRzIDw8ICJSZW5kZXJMYXllckJhY2tpbmcgIiA8PCAmYmFja2lu ZyA8PCAiIGJvdW5kcyAiIDw8IGJhY2tpbmcuY29tcG9zaXRlZEJvdW5kcygpOworCisgICAgaWYg KGJhY2tpbmcuaXNNYWluRnJhbWVMYXllcldpdGhUaWxlZEJhY2tpbmcoKSkKKyAgICAgICAgdHMg PDwgIiBtYWluIHRpbGVkIGJhY2tpbmciOworICAgIGlmIChiYWNraW5nLnBhaW50c0ludG9XaW5k b3coKSkKKyAgICAgICAgdHMgPDwgIiBwYWludHNJbnRvV2luZG93IjsKKyAgICBpZiAoYmFja2lu Zy5wYWludHNJbnRvQ29tcG9zaXRlZEFuY2VzdG9yKCkpCisgICAgICAgIHRzIDw8ICIgcGFpbnRz SW50b0NvbXBvc2l0ZWRBbmNlc3RvciI7CisKKyAgICB0cyA8PCAiIHByaW1hcnkgbGF5ZXIgSUQg IiA8PCBiYWNraW5nLmdyYXBoaWNzTGF5ZXIoKS0+cHJpbWFyeUxheWVySUQoKTsKKyAgICBpZiAo YXV0byBub2RlSUQgPSBiYWNraW5nLnNjcm9sbGluZ05vZGVJREZvclJvbGUoVmlld3BvcnRDb25z dHJhaW5lZCkpCisgICAgICAgIHRzIDw8ICIgdmlld3BvcnQgY29uc3RyYWluZWQgc2Nyb2xsaW5n IG5vZGUgIiA8PCBub2RlSUQ7CisgICAgaWYgKGF1dG8gbm9kZUlEID0gYmFja2luZy5zY3JvbGxp bmdOb2RlSURGb3JSb2xlKFNjcm9sbGluZykpCisgICAgICAgIHRzIDw8ICIgc2Nyb2xsaW5nIG5v ZGUgIiA8PCBub2RlSUQ7CisgICAgcmV0dXJuIHRzOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKaW5k ZXggYjNhOGJhMTZjZTAyN2Y4MGU1ZTQ3MDM1YzRmYTlhY2IzMDg2ZTZiNi4uNDY3NjgxMjlmZGI3 ODJkNTQzYjdhY2Q3NmU0ZTlkZDBkYzc4NDUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaApAQCAtMzk4LDQgKzM5OCw2IEBAIGVudW0gQ2FudmFz Q29tcG9zaXRpbmdTdHJhdGVneSB7CiB9OwogQ2FudmFzQ29tcG9zaXRpbmdTdHJhdGVneSBjYW52 YXNDb21wb3NpdGluZ1N0cmF0ZWd5KGNvbnN0IFJlbmRlck9iamVjdCYpOwogCitXVEY6OlRleHRT dHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3RyZWFtJiwgY29uc3QgUmVuZGVyTGF5ZXJCYWNr aW5nJik7CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMTJiYjBiNDRkMDVlM2I1 ZTk0ZTNhN2JlZGU1NDcyNGVlNDI1YWZjOC4uOTRhYjdhZjU5MWJkNTk2ZTNhZmQ5MWRiMjBlMTky MTkxYjAyNGM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyQ29tcG9zaXRvci5jcHAKQEAgLTM3Myw3ICszNzMsNyBAQCBib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6ZGlkUmVjYWxjU3R5bGVXaXRoTm9QZW5kaW5nTGF5b3V0KCkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIAogICAgIGNhY2hlQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZsYWdzKCk7 Ci0gICAgcmV0dXJuIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlQWZ0 ZXJTdHlsZUNoYW5nZSk7CisgICAgcmV0dXJuIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBv c2l0aW5nVXBkYXRlVHlwZTo6QWZ0ZXJTdHlsZUNoYW5nZSk7CiB9CiAKIHZvaWQgUmVuZGVyTGF5 ZXJDb21wb3NpdG9yOjpjdXN0b21Qb3NpdGlvbkZvclZpc2libGVSZWN0Q29tcHV0YXRpb24oY29u c3QgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciwgRmxvYXRQb2ludCYgcG9zaXRpb24pIGNv bnN0CkBAIC00NDAsNyArNDQwLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZsdXNo UGVuZGluZ0xheWVyQ2hhbmdlcyhib29sIGlzRmx1c2hSb290KQogICAgIGlmIChHcmFwaGljc0xh eWVyKiByb290TGF5ZXIgPSByb290R3JhcGhpY3NMYXllcigpKSB7CiAjaWYgUExBVEZPUk0oSU9T KQogICAgICAgICBGbG9hdFJlY3QgZXhwb3NlZFJlY3QgPSBmcmFtZVZpZXcuZXhwb3NlZENvbnRl bnRSZWN0KCk7Ci0gICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3NpdGluZywgc3RyZWFtIDw8 ICJcblJlbmRlckxheWVyQ29tcG9zaXRvciAiIDw8IHRoaXMgPDwgIiBmbHVzaFBlbmRpbmdMYXll ckNoYW5nZXMgKHJvb3QgIiA8PCBpc0ZsdXNoUm9vdCA8PCAiKSBleHBvc2VkUmVjdCAiIDw8IGV4 cG9zZWRSZWN0KTsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nLCBzdHJlYW0g PDwgIlxuUmVuZGVyTGF5ZXJDb21wb3NpdG9yICIgPDwgdGhpcyA8PCAiIGZsdXNoUGVuZGluZ0xh eWVyQ2hhbmdlcyAoaXMgcm9vdCAiIDw8IGlzRmx1c2hSb290IDw8ICIpIGV4cG9zZWRSZWN0ICIg PDwgZXhwb3NlZFJlY3QpOwogCiAgICAgICAgIC8vIEZJWE1FOiBVc2Ugb3B0aW1pemVkIGZsdXNo ZXMuCiAgICAgICAgIHJvb3RMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlKGV4cG9zZWRSZWN0 KTsKQEAgLTQ1MSw3ICs0NTEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zmx1c2hQ ZW5kaW5nTGF5ZXJDaGFuZ2VzKGJvb2wgaXNGbHVzaFJvb3QpCiAgICAgICAgIGlmIChmcmFtZVZp ZXcudmlld0V4cG9zZWRSZWN0KCkpCiAgICAgICAgICAgICB2aXNpYmxlUmVjdC5pbnRlcnNlY3Qo ZnJhbWVWaWV3LnZpZXdFeHBvc2VkUmVjdCgpLnZhbHVlKCkpOwogCi0gICAgICAgIExPR19XSVRI X1NUUkVBTShDb21wb3NpdGluZywgIHN0cmVhbSA8PCAiXG5SZW5kZXJMYXllckNvbXBvc2l0b3Ig IiA8PCB0aGlzIDw8ICIgZmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzKCIgPDwgaXNGbHVzaFJvb3Qg PDwgIikgIiA8PCB2aXNpYmxlUmVjdCk7CisgICAgICAgIExPR19XSVRIX1NUUkVBTShDb21wb3Np dGluZywgIHN0cmVhbSA8PCAiXG5SZW5kZXJMYXllckNvbXBvc2l0b3IgIiA8PCB0aGlzIDw8ICIg Zmx1c2hQZW5kaW5nTGF5ZXJDaGFuZ2VzIChpcyByb290ICIgPDwgaXNGbHVzaFJvb3QgPDwgIikg dmlzaWJsZSByZWN0ICIgPDwgdmlzaWJsZVJlY3QpOwogICAgICAgICByb290TGF5ZXItPmZsdXNo Q29tcG9zaXRpbmdTdGF0ZSh2aXNpYmxlUmVjdCk7CiAgICAgICAgIExPR19XSVRIX1NUUkVBTShD b21wb3NpdGluZywgIHN0cmVhbSA8PCAiUmVuZGVyTGF5ZXJDb21wb3NpdG9yICIgPDwgdGhpcyA8 PCAiIGZsdXNoIGNvbXBsZXRlXG4iKTsKICNlbmRpZgpAQCAtNjE4LDcgKzYxOCw3IEBAIHZvaWQg UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpzY2hlZHVsZUNvbXBvc2l0aW5nTGF5ZXJVcGRhdGUoKQog CiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnNUaW1l ckZpcmVkKCkKIHsKLSAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0 ZUFmdGVyTGF5b3V0KTsKKyAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1Vw ZGF0ZVR5cGU6OkFmdGVyTGF5b3V0KTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 Omhhc0FueUFkZGl0aW9uYWxDb21wb3NpdGVkTGF5ZXJzKGNvbnN0IFJlbmRlckxheWVyJiByb290 TGF5ZXIpIGNvbnN0CkBAIC02MzQsNyArNjM0LDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0 b3I6OmNhbmNlbENvbXBvc2l0aW5nTGF5ZXJVcGRhdGUoKQogCiBib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVw ZGF0ZVR5cGUsIFJlbmRlckxheWVyKiB1cGRhdGVSb290KQogewotICAgIExPRyhDb21wb3NpdGlu ZywgIlJlbmRlckxheWVyQ29tcG9zaXRvciAlcCB1cGRhdGVDb21wb3NpdGluZ0xheWVycyAlZCAl cCIsIHRoaXMsIHVwZGF0ZVR5cGUsIHVwZGF0ZVJvb3QpOworICAgIExPR19XSVRIX1NUUkVBTShD b21wb3NpdGluZywgc3RyZWFtIDw8ICJSZW5kZXJMYXllckNvbXBvc2l0b3IgIiA8PCB0aGlzIDw8 ICIgdXBkYXRlQ29tcG9zaXRpbmdMYXllcnMgIiA8PCB1cGRhdGVUeXBlIDw8ICIgcm9vdCAiIDw8 IHVwZGF0ZVJvb3QpOwogCiAgICAgbV91cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyLnN0b3Ao KTsKIApAQCAtNjY0LDE3ICs2NjQsMTcgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVw ZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKICAgICBi b29sIG5lZWRHZW9tZXRyeVVwZGF0ZSA9IGZhbHNlOwogCiAgICAgc3dpdGNoICh1cGRhdGVUeXBl KSB7Ci0gICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0ZUFmdGVyU3R5bGVDaGFuZ2U6Ci0gICAgY2Fz ZSBDb21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0OgotICAgIGNhc2UgQ29tcG9zaXRpbmdVcGRh dGVPbkhpdFRlc3Q6CisgICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0ZVR5cGU6OkFmdGVyU3R5bGVD aGFuZ2U6CisgICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0ZVR5cGU6OkFmdGVyTGF5b3V0OgorICAg IGNhc2UgQ29tcG9zaXRpbmdVcGRhdGVUeXBlOjpPbkhpdFRlc3Q6CiAgICAgICAgIGNoZWNrRm9y SGllcmFyY2h5VXBkYXRlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDb21wb3Np dGluZ1VwZGF0ZU9uU2Nyb2xsOgorICAgIGNhc2UgQ29tcG9zaXRpbmdVcGRhdGVUeXBlOjpPblNj cm9sbDoKICAgICAgICAgY2hlY2tGb3JIaWVyYXJjaHlVcGRhdGUgPSB0cnVlOyAvLyBPdmVybGFw IGNhbiBjaGFuZ2Ugd2l0aCBzY3JvbGxpbmcsIHNvIG5lZWQgdG8gY2hlY2sgZm9yIGhpZXJhcmNo eSB1cGRhdGVzLgogCiAgICAgICAgIG5lZWRHZW9tZXRyeVVwZGF0ZSA9IHRydWU7CiAgICAgICAg IGJyZWFrOwotICAgIGNhc2UgQ29tcG9zaXRpbmdVcGRhdGVPbkNvbXBvc2l0ZWRTY3JvbGw6Cisg ICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0ZVR5cGU6Ok9uQ29tcG9zaXRlZFNjcm9sbDoKICAgICAg ICAgbmVlZEdlb21ldHJ5VXBkYXRlID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpAQCAt Njg5LDE2ICs2ODksMTYgQEAgYm9vbCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBv c2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBkYXRlVHlwZSB1cGRhdGUKICAgICBtX2NvbXBvc2l0 aW5nTGF5ZXJzTmVlZFJlYnVpbGQgPSBmYWxzZTsKICAgICB1cGRhdGVSb290ID0gJnJvb3RSZW5k ZXJMYXllcigpOwogCi0gICAgaWYgKGlzRnVsbFVwZGF0ZSAmJiB1cGRhdGVUeXBlID09IENvbXBv c2l0aW5nVXBkYXRlQWZ0ZXJMYXlvdXQpCisgICAgaWYgKGlzRnVsbFVwZGF0ZSAmJiB1cGRhdGVU eXBlID09IENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6QWZ0ZXJMYXlvdXQpCiAgICAgICAgIG1fcmVl dmFsdWF0ZUNvbXBvc2l0aW5nQWZ0ZXJMYXlvdXQgPSBmYWxzZTsKIAogICAgIExPRyhDb21wb3Np dGluZywgIiBjaGVja0ZvckhpZXJhcmNoeVVwZGF0ZSAlZCwgbmVlZEdlb21ldHJ5VXBkYXRlICVk IiwgY2hlY2tGb3JIaWVyYXJjaHlVcGRhdGUsIG5lZWRIaWVyYXJjaHlVcGRhdGUpOwogCiAjaWYg IUxPR19ESVNBQkxFRAotICAgIGRvdWJsZSBzdGFydFRpbWUgPSAwOworICAgIE1vbm90b25pY1Rp bWUgc3RhcnRUaW1lOwogICAgIGlmIChjb21wb3NpdGluZ0xvZ0VuYWJsZWQoKSkgewogICAgICAg ICArK21fcm9vdExheWVyVXBkYXRlQ291bnQ7Ci0gICAgICAgIHN0YXJ0VGltZSA9IG1vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZSgpOworICAgICAgICBzdGFydFRpbWUgPSBNb25vdG9uaWNUaW1l Ojpub3coKTsKICAgICB9CiAjZW5kaWYKIApAQCAtNzU0LDEyICs3NTQsMTIgQEAgYm9vbCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBvc2l0aW5nVXBk YXRlVHlwZSB1cGRhdGUKICAgICAKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgaWYgKGNvbXBvc2l0 aW5nTG9nRW5hYmxlZCgpICYmIGlzRnVsbFVwZGF0ZSAmJiAobmVlZEhpZXJhcmNoeVVwZGF0ZSB8 fCBuZWVkR2VvbWV0cnlVcGRhdGUpKSB7Ci0gICAgICAgIGRvdWJsZSBlbmRUaW1lID0gbW9ub3Rv bmljYWxseUluY3JlYXNpbmdUaW1lKCk7CisgICAgICAgIE1vbm90b25pY1RpbWUgZW5kVGltZSA9 IE1vbm90b25pY1RpbWU6Om5vdygpOwogICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJUb3RhbCBs YXllcnMgICBwcmltYXJ5ICAgc2Vjb25kYXJ5ICAgb2JsaWdhdG9yeSBiYWNraW5nIChLQikgICBz ZWNvbmRhcnkgYmFja2luZyhLQikgICB0b3RhbCBiYWNraW5nIChLQikgIHVwZGF0ZSB0aW1lICht cylcbiIpOwogCiAgICAgICAgIExPRyhDb21wb3NpdGluZywgIiU4ZCAlMTFkICU5ZCAlMjAuMmYg JTIyLjJmICUyMi4yZiAlMTguMmZcbiIsCiAgICAgICAgICAgICBtX29ibGlnYXRlQ29tcG9zaXRl ZExheWVyQ291bnQgKyBtX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXllckNvdW50LCBtX29ibGlnYXRl Q29tcG9zaXRlZExheWVyQ291bnQsCi0gICAgICAgICAgICBtX3NlY29uZGFyeUNvbXBvc2l0ZWRM YXllckNvdW50LCBtX29ibGlnYXRvcnlCYWNraW5nU3RvcmVCeXRlcyAvIDEwMjQsIG1fc2Vjb25k YXJ5QmFja2luZ1N0b3JlQnl0ZXMgLyAxMDI0LCAobV9vYmxpZ2F0b3J5QmFja2luZ1N0b3JlQnl0 ZXMgKyBtX3NlY29uZGFyeUJhY2tpbmdTdG9yZUJ5dGVzKSAvIDEwMjQsIDEwMDAuMCAqIChlbmRU aW1lIC0gc3RhcnRUaW1lKSk7CisgICAgICAgICAgICBtX3NlY29uZGFyeUNvbXBvc2l0ZWRMYXll ckNvdW50LCBtX29ibGlnYXRvcnlCYWNraW5nU3RvcmVCeXRlcyAvIDEwMjQsIG1fc2Vjb25kYXJ5 QmFja2luZ1N0b3JlQnl0ZXMgLyAxMDI0LCAobV9vYmxpZ2F0b3J5QmFja2luZ1N0b3JlQnl0ZXMg KyBtX3NlY29uZGFyeUJhY2tpbmdTdG9yZUJ5dGVzKSAvIDEwMjQsIChlbmRUaW1lIC0gc3RhcnRU aW1lKS5taWxsaXNlY29uZHMoKSk7CiAgICAgfQogI2VuZGlmCiAgICAgQVNTRVJUKHVwZGF0ZVJv b3QgfHwgIW1fY29tcG9zaXRpbmdMYXllcnNOZWVkUmVidWlsZCk7CkBAIC0xODI1LDcgKzE4MjUs NyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Zml4ZWRSb290QmFja2dyb3VuZExheWVy Q2hhbmdlZCgpCiAKIFN0cmluZyBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmxheWVyVHJlZUFzVGV4 dChMYXllclRyZWVGbGFncyBmbGFncykKIHsKLSAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVycyhD b21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0KTsKKyAgICB1cGRhdGVDb21wb3NpdGluZ0xheWVy cyhDb21wb3NpdGluZ1VwZGF0ZVR5cGU6OkFmdGVyTGF5b3V0KTsKIAogICAgIGlmICghbV9yb290 Q29udGVudExheWVyKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CkBAIC00MjIwLDQgKzQyMjAs MTYgQEAgUGFnZSYgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpwYWdlKCkgY29uc3QKICAgICByZXR1 cm4gbV9yZW5kZXJWaWV3LnBhZ2UoKTsKIH0KIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0 U3RyZWFtJiB0cywgQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZVR5cGUpCit7CisgICAgc3dp dGNoICh1cGRhdGVUeXBlKSB7CisgICAgY2FzZSBDb21wb3NpdGluZ1VwZGF0ZVR5cGU6OkFmdGVy U3R5bGVDaGFuZ2U6IHRzIDw8ICJhZnRlciBzdHlsZSBjaGFuZ2UiOyBicmVhazsKKyAgICBjYXNl IENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6QWZ0ZXJMYXlvdXQ6IHRzIDw8ICJhZnRlciBsYXlvdXQi OyBicmVhazsKKyAgICBjYXNlIENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6T25IaXRUZXN0OiB0cyA8 PCAib24gaGl0IHRlc3QiOyBicmVhazsKKyAgICBjYXNlIENvbXBvc2l0aW5nVXBkYXRlVHlwZTo6 T25TY3JvbGw6IHRzIDw8ICJvbiBzY3JvbGwiOyBicmVhazsKKyAgICBjYXNlIENvbXBvc2l0aW5n VXBkYXRlVHlwZTo6T25Db21wb3NpdGVkU2Nyb2xsOiB0cyA8PCAib24gY29tcG9zaXRlZCBzY3Jv bGwiOyBicmVhazsKKyAgICB9CisgICAgcmV0dXJuIHRzOworfQorCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJD b21wb3NpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmgKaW5kZXggZGNlMDQzNGE1NGU2NGM4ZDhmMTYyOTYzZmUwOGMxODNmMGYzNzkyNS4uZTRh ZWJhNzIwMDY2NGI3NmRjNzM5ODNkNTNiMjA2OGI1MTRiNzRlMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaApAQCAtNDcsMTIgKzQ3LDEy IEBAIGNsYXNzIFRpbGVkQmFja2luZzsKIAogdHlwZWRlZiB1bnNpZ25lZCBMYXllclRyZWVGbGFn czsKIAotZW51bSBDb21wb3NpdGluZ1VwZGF0ZVR5cGUgewotICAgIENvbXBvc2l0aW5nVXBkYXRl QWZ0ZXJTdHlsZUNoYW5nZSwKLSAgICBDb21wb3NpdGluZ1VwZGF0ZUFmdGVyTGF5b3V0LAotICAg IENvbXBvc2l0aW5nVXBkYXRlT25IaXRUZXN0LAotICAgIENvbXBvc2l0aW5nVXBkYXRlT25TY3Jv bGwsCi0gICAgQ29tcG9zaXRpbmdVcGRhdGVPbkNvbXBvc2l0ZWRTY3JvbGwKK2VudW0gY2xhc3Mg Q29tcG9zaXRpbmdVcGRhdGVUeXBlIHsKKyAgICBBZnRlclN0eWxlQ2hhbmdlLAorICAgIEFmdGVy TGF5b3V0LAorICAgIE9uSGl0VGVzdCwKKyAgICBPblNjcm9sbCwKKyAgICBPbkNvbXBvc2l0ZWRT Y3JvbGwKIH07CiAKIGVudW0gY2xhc3MgQ29tcG9zaXRpbmdSZWFzb24gewpAQCAtNTczLDQgKzU3 Myw2IEBAIHByaXZhdGU6CiAKIHZvaWQgcGFpbnRTY3JvbGxiYXIoU2Nyb2xsYmFyKiwgR3JhcGhp Y3NDb250ZXh0JiwgY29uc3QgSW50UmVjdCYgY2xpcCk7CiAKK1dURjo6VGV4dFN0cmVhbSYgb3Bl cmF0b3I8PChXVEY6OlRleHRTdHJlYW0mLCBDb21wb3NpdGluZ1VwZGF0ZVR5cGUpOworCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg==