151054 2015-11-09 14:30:06 -0800 Add drawsBackground SPI to WKWebView, and get rid of drawsTransparentBackground from WebKit2 2015-11-09 18:15:31 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca clopez rmondello sam simon.fraser timothy oldest_to_newest 1140537 0 thorton 2015-11-09 14:30:06 -0800 Add drawsBackground SPI to WKWebView, and get rid of drawsTransparentBackground from WebKit2 1140538 1 265097 thorton 2015-11-09 14:30:28 -0800 Created attachment 265097 Patch 1140554 2 265102 thorton 2015-11-09 15:00:50 -0800 Created attachment 265102 Patch 1140577 3 thorton 2015-11-09 16:03:59 -0800 http://trac.webkit.org/changeset/192184 1140660 4 clopez 2015-11-09 18:15:31 -0800 (In reply to comment #3) > http://trac.webkit.org/changeset/192184 Seems this broke the GTK build: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/63958/steps/compile-webkit/logs/stdio/text 265097 2015-11-09 14:30:28 -0800 2015-11-09 15:00:48 -0800 Patch bug-151054-20151109143025.patch text/plain 19639 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTNkNDZmM2I4MzI3OWZk ZTdlZDYxMjJmYmRjM2I0MTQ0ZWI0MTJhNS4uY2QzNWE2MWRhYjNlYzBjMmY4M2Q5NTdhNTk1OWE1 Y2NlMDE4OGIxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDE1LTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBkcmF3c0Jh Y2tncm91bmQgU1BJIHRvIFdLV2ViVmlldywgYW5kIGdldCByaWQgb2YgZHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQgZnJvbSBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTEwNTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwMTk4OTEz PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgc2V0RHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQ6XSk6CisgICAgICAgICgtW1dLVmlldyBkcmF3c1RyYW5zcGFyZW50QmFja2dy b3VuZF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OnVwZGF0ZUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNl dERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpXZWJQYWdlUHJveHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMpOiBEZWxldGVkLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOiBEZWxldGVkLgorICAgICAgICAo V2ViS2l0OjptX3Nob3VsZERpc3BhdGNoRmFrZU1vdXNlTW92ZUV2ZW50cyk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTog RGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk6IERlbGV0ZWQu CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAg ICAgIEdldCByaWQgb2YgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQuIEl0IGRvZXNuJ3Qgc2Vl bSBsaWtlIHRoZXJlJ3MgYW55IG9ic2VydmFibGUKKyAgICAgICAgZGlmZmVyZW5jZSBpbiBhIGxh eWVyLWJhY2tlZCB3b3JsZC4gV0tWaWV3J3MgKHNldClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3Vu ZAorICAgICAgICB3aWxsIGp1c3QgZm9yd2FyZCB0byBkcmF3c0JhY2tncm91bmQgKGludmVydGVk KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3dlYlByb2Nlc3NJc1Jlc3BvbnNpdmVdKToKKyAgICAgICAgTW92ZSBf d2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSB1cCB3aXRoIHRoZSBvdGhlciBjcm9zcy1wbGF0Zm9ybSBT UEkgbWV0aG9kcywgaW5zdGVhZAorICAgICAgICBvZiBiZWxvdyBhbGwgb2YgdGhlIHBsYXRmb3Jt LXNwZWNpZmljIFNQSSBtZXRob2RzLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZHJhd3NCYWNr Z3JvdW5kXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0RHJhd3NCYWNrZ3JvdW5kOl0pOgor ICAgICAgICBBZGRlZC4KKworICAgICAgICAoLVtXS1dlYlZpZXcgX2RyYXdzVHJhbnNwYXJlbnRC YWNrZ3JvdW5kXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0RHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQ6XSk6CisgICAgICAgIERlbGV0ZWQuCisgICAgICAgIAorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICBSZXBsYWNlIGRyYXdz VHJhbnNwYXJlbnRCYWNrZ3JvdW5kIHdpdGggZHJhd3NCYWNrZ3JvdW5kLgorCiAyMDE1LTExLTA2 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV3b3Jr IHRoZSB3YXkgYWxsb3dlZCBhcmd1bWVudCBjbGFzc2VzIGFyZSBzdG9yZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCA5 ZjhlMzQ4MzJjZjJmNzVmZmMyNmY5MTI3OWY3MTFhNDM5MjU3OTZlLi5jODVlZjczMmNhOTY3NDZj MGY5YzIyODUxYTQwMWQzNDY1YTU0NWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC00MCw3ICs0MCw2IEBAIHZvaWQg V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgcGFnZUdyb3VwRGF0YTsKICAgICBlbmNvZGVy IDw8IGRyYXdzQmFja2dyb3VuZDsKICAgICBlbmNvZGVyIDw8IGlzRWRpdGFibGU7Ci0gICAgZW5j b2RlciA8PCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKICAgICBlbmNvZGVyIDw8IHVuZGVy bGF5Q29sb3I7CiAgICAgZW5jb2RlciA8PCB1c2VGaXhlZExheW91dDsKICAgICBlbmNvZGVyIDw8 IGZpeGVkTGF5b3V0U2l6ZTsKQEAgLTEwMiw4ICsxMDEsNiBAQCBib29sIFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUGFn ZUNyZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJh bWV0ZXJzLmlzRWRpdGFibGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShwYXJhbWV0ZXJzLmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy51bmRl cmxheUNvbG9yKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNv ZGUocGFyYW1ldGVycy51c2VGaXhlZExheW91dCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCBmMGVhMTkwZTBlYTQxNWY2MWE0 MzQ4MzM5MGQwMjgwYWY3MmYzYmUzLi5iMmMzYjM5Y2QxMzZkZGFlOTY4ZTBhZTBmODkyZWY0ZmQ3 ZjQ0NTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmgKQEAgLTY1LDcgKzY1LDYgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMgewogICAgIFdlYlBhZ2VHcm91cERhdGEgcGFnZUdyb3VwRGF0YTsKIAogICAgIGJvb2wg ZHJhd3NCYWNrZ3JvdW5kOwotICAgIGJvb2wgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7CiAg ICAgYm9vbCBpc0VkaXRhYmxlOwogCiAgICAgV2ViQ29yZTo6Q29sb3IgdW5kZXJsYXlDb2xvcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggNmNkYWU0NTljZDQ2ODdjYWYwOTdkMzQzOTdkYTk0N2QyNTI0YjFiNC4uMzc1NWVlZGRjMzA0 MjdiNDg4ZDVkY2M3YzM3ODE3NGU2OGIzNzFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTM1MjIsNiArMzUyMiwxMSBAQCBzdGF0 aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9u cyB3a0ZpbmRPcHRpb25zKQogI2VuZGlmCiB9CiAKKy0gKEJPT0wpX3dlYlByb2Nlc3NJc1Jlc3Bv bnNpdmUKK3sKKyAgICByZXR1cm4gX3BhZ2UtPnByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVy KCkuaXNSZXNwb25zaXZlKCk7Cit9CisKICNwcmFnbWEgbWFyayBpT1Mtc3BlY2lmaWMgbWV0aG9k cwogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtMzk0MCwxNCArMzk0NSwxNCBAQCBzdGF0aWMgaW5s aW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3a0Zp bmRPcHRpb25zKQogCiAjcHJhZ21hIG1hcmsgLSBPUyBYLXNwZWNpZmljIG1ldGhvZHMKIAotLSAo Qk9PTClfZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQKKy0gKEJPT0wpX2RyYXdzQmFja2dyb3Vu ZAogewotICAgIHJldHVybiBfaW1wbC0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKTsKKyAg ICByZXR1cm4gX2ltcGwtPmRyYXdzQmFja2dyb3VuZCgpOwogfQogCi0tICh2b2lkKV9zZXREcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZDooQk9PTClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZAor LSAodm9pZClfc2V0RHJhd3NCYWNrZ3JvdW5kOihCT09MKWRyYXdzQmFja2dyb3VuZAogewotICAg IF9pbXBsLT5zZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChkcmF3c1RyYW5zcGFyZW50QmFj a2dyb3VuZCk7CisgICAgX2ltcGwtPnNldERyYXdzQmFja2dyb3VuZChkcmF3c0JhY2tncm91bmQp OwogfQogCiAjaWYgV0tfQVBJX0VOQUJMRUQKQEAgLTQwMzEsMTEgKzQwMzYsNiBAQCBzdGF0aWMg aW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3 a0ZpbmRPcHRpb25zKQogCiAjZW5kaWYKIAotLSAoQk9PTClfd2ViUHJvY2Vzc0lzUmVzcG9uc2l2 ZQotewotICAgIHJldHVybiBfcGFnZS0+cHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS5p c1Jlc3BvbnNpdmUoKTsKLX0KLQogQGVuZAogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggNmY2NWRhYjk5NGJi ZjQ3ZjEwMzM3OTdlYmM1OTk1YWQ5YjA3Mjg4OS4uYzIxZTcwY2NjNzdiODliYjRiMGYwMDdiNzkz NWRmMmYwNGJlZjNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTE2OSw3ICsxNjksNyBAQCB0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBfV0tJbW1lZGlhdGVBY3Rpb25UeXBlKSB7CiAKICNlbHNlCiBAcHJv cGVydHkgKHJlYWRvbmx5KSBOU0NvbG9yICpfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOwot QHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91 bmQ6KSBCT09MIF9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKK0Bwcm9wZXJ0eSAobm9uYXRv bWljLCBzZXR0ZXI9X3NldERyYXdzQmFja2dyb3VuZDopIEJPT0wgX2RyYXdzQmFja2dyb3VuZDsK IEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFRvcENvbnRlbnRJbnNldDopIENHRmxv YXQgX3RvcENvbnRlbnRJbnNldDsKIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0K aW5kZXggYjEwODNhMDhhZTA2NTJhNTBmMTZkZGRjNjMzYTgzMDhkZGJiMDM5NS4uNWVhZjNkYjE1 OTQ3MDg2NTZlMjk5YmQ5MjgwZWRmMDYzMWY0Nzg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtOTksMTIgKzk5LDEyIEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiAtICh2b2lkKXNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOihCT09M KWRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kCiB7Ci0gICAgX2RhdGEtPl9pbXBsLT5zZXREcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZChkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk7CisgICAg X2RhdGEtPl9pbXBsLT5zZXREcmF3c0JhY2tncm91bmQoIWRyYXdzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKTsKIH0KIAogLSAoQk9PTClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZAogewotICAgIHJl dHVybiBfZGF0YS0+X2ltcGwtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCk7CisgICAgcmV0 dXJuICFfZGF0YS0+X2ltcGwtPmRyYXdzQmFja2dyb3VuZCgpOwogfQogCiAtIChCT09MKWFjY2Vw dHNGaXJzdFJlc3BvbmRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nv Y29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwuaAppbmRleCBkYjJlODk4OTM1MjJhMmZhZTg1MTg1NzgwZjdmMjBiNzg0ZTMwZjIzLi4w YzE4ZDdiYjBjMzZhMGQwNzdmNjFlNmU1ZDk5OTE4NzVkNjkxNjQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaApAQCAtMTIyLDggKzEyMiw2IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgc2V0RHJhd3NCYWNrZ3JvdW5kKGJvb2wpOwogICAgIGJvb2wgZHJh d3NCYWNrZ3JvdW5kKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXREcmF3c1RyYW5zcGFyZW50QmFja2dy b3VuZChib29sKTsKLSAgICBib29sIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkgY29uc3Q7 CiAgICAgYm9vbCBpc09wYXF1ZSgpIGNvbnN0OwogCiAgICAgYm9vbCBhY2NlcHRzRmlyc3RNb3Vz ZShOU0V2ZW50ICopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tCmluZGV4IDhlMTBmM2M2NjhlNjVhZjQ5OWJhZmI2ZWZiMjY2MzZlZjg4Nzk1YmMuLmI4 N2JkOTg1OTI4NjFhYzZmYzYyY2IwZDk4YjRiMzVkOWNkMDZkYTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTU0OSwxNiArNTQ5LDYgQEAg Ym9vbCBXZWJWaWV3SW1wbDo6ZHJhd3NCYWNrZ3JvdW5kKCkgY29uc3QKICAgICByZXR1cm4gbV9w YWdlLT5kcmF3c0JhY2tncm91bmQoKTsKIH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6c2V0RHJhd3NU cmFuc3BhcmVudEJhY2tncm91bmQoYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCkKLXsK LSAgICBtX3BhZ2UtPnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGRyYXdzVHJhbnNwYXJl bnRCYWNrZ3JvdW5kKTsKLX0KLQotYm9vbCBXZWJWaWV3SW1wbDo6ZHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQoKSBjb25zdAotewotICAgIHJldHVybiBtX3BhZ2UtPmRyYXdzVHJhbnNwYXJlbnRC YWNrZ3JvdW5kKCk7Ci19Ci0KIGJvb2wgV2ViVmlld0ltcGw6OmlzT3BhcXVlKCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV9wYWdlLT5kcmF3c0JhY2tncm91bmQoKTsKQEAgLTgyNSwxMCArODE1LDcg QEAgdm9pZCBXZWJWaWV3SW1wbDo6d2FpdEZvckFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlKCkK IAogdm9pZCBXZWJWaWV3SW1wbDo6dXBkYXRlTGF5ZXIoKQogewotICAgIGlmIChkcmF3c0JhY2tn cm91bmQoKSAmJiAhZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSkKLSAgICAgICAgbV92aWV3 LmxheWVyLmJhY2tncm91bmRDb2xvciA9IENHQ29sb3JHZXRDb25zdGFudENvbG9yKGtDR0NvbG9y V2hpdGUpOwotICAgIGVsc2UKLSAgICAgICAgbV92aWV3LmxheWVyLmJhY2tncm91bmRDb2xvciA9 IENHQ29sb3JHZXRDb25zdGFudENvbG9yKGtDR0NvbG9yQ2xlYXIpOworICAgIG1fdmlldy5sYXll ci5iYWNrZ3JvdW5kQ29sb3IgPSBDR0NvbG9yR2V0Q29uc3RhbnRDb2xvcihkcmF3c0JhY2tncm91 bmQoKSA/IGtDR0NvbG9yV2hpdGUgOiBrQ0dDb2xvckNsZWFyKTsKIAogICAgIC8vIElmIGFzeW5j aHJvbm91cyBnZW9tZXRyeSB1cGRhdGVzIGhhdmUgYmVlbiBzZW50IGJ5IGZvcmNlQXN5bmNEcmF3 aW5nQXJlYVNpemVVcGRhdGUsCiAgICAgLy8gdGhlbiBzdWJzZXF1ZW50IGNhbGxzIHRvIHNldEZy YW1lU2l6ZSBzaG91bGQgbm90IHJlc3VsdCBpbiB1cyB3YWl0aW5nIGZvciB0aGUgZGlkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDYxOWYzNzVlNDkzZDRi NmNhY2Y1NjkxMGI3ZmY5NDBiYWUyYmFlOTUuLmQ1YTg3MDE3NDEwNTM3OTM3MzBmN2IzNDA0ZWI2 MjQzNmZiM2M1OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw CkBAIC0zNjEsNyArMzYxLDYgQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVu dCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW4KICAgICAsIG1fdG9w Q29udGVudEluc2V0KDApCiAgICAgLCBtX2xheWVySG9zdGluZ01vZGUoTGF5ZXJIb3N0aW5nTW9k ZTo6SW5Qcm9jZXNzKQogICAgICwgbV9kcmF3c0JhY2tncm91bmQodHJ1ZSkKLSAgICAsIG1fZHJh d3NUcmFuc3BhcmVudEJhY2tncm91bmQoZmFsc2UpCiAgICAgLCBtX3VzZUZpeGVkTGF5b3V0KGZh bHNlKQogICAgICwgbV9zdXBwcmVzc1Njcm9sbGJhckFuaW1hdGlvbnMoZmFsc2UpCiAgICAgLCBt X3BhZ2luYXRpb25Nb2RlKFBhZ2luYXRpb246OlVucGFnaW5hdGVkKQpAQCAtMTI0NSwxNyArMTI0 NCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXREcmF3c0JhY2tncm91bmQoYm9vbCBkcmF3c0Jh Y2tncm91bmQpCiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6U2V0 RHJhd3NCYWNrZ3JvdW5kKGRyYXdzQmFja2dyb3VuZCksIG1fcGFnZUlEKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGJvb2wgZHJhd3NUcmFu c3BhcmVudEJhY2tncm91bmQpCi17Ci0gICAgaWYgKG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91 bmQgPT0gZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQpCi0gICAgICAgIHJldHVybjsKLQotICAg IG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQgPSBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3Vu ZDsKLQotICAgIGlmIChpc1ZhbGlkKCkpCi0gICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdl czo6V2ViUGFnZTo6U2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoZHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQpLCBtX3BhZ2VJRCk7Ci19Ci0KIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRUb3BD b250ZW50SW5zZXQoZmxvYXQgY29udGVudEluc2V0KQogewogICAgIGlmIChtX3RvcENvbnRlbnRJ bnNldCA9PSBjb250ZW50SW5zZXQpCkBAIC01MDk0LDcgKzUwODIsNiBAQCBXZWJQYWdlQ3JlYXRp b25QYXJhbWV0ZXJzIFdlYlBhZ2VQcm94eTo6Y3JlYXRpb25QYXJhbWV0ZXJzKCkKICAgICBwYXJh bWV0ZXJzLnBhZ2VHcm91cERhdGEgPSBtX3BhZ2VHcm91cC0+ZGF0YSgpOwogICAgIHBhcmFtZXRl cnMuZHJhd3NCYWNrZ3JvdW5kID0gbV9kcmF3c0JhY2tncm91bmQ7CiAgICAgcGFyYW1ldGVycy5p c0VkaXRhYmxlID0gbV9pc0VkaXRhYmxlOwotICAgIHBhcmFtZXRlcnMuZHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQgPSBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOwogICAgIHBhcmFtZXRl cnMudW5kZXJsYXlDb2xvciA9IG1fdW5kZXJsYXlDb2xvcjsKICAgICBwYXJhbWV0ZXJzLnVzZUZp eGVkTGF5b3V0ID0gbV91c2VGaXhlZExheW91dDsKICAgICBwYXJhbWV0ZXJzLmZpeGVkTGF5b3V0 U2l6ZSA9IG1fZml4ZWRMYXlvdXRTaXplOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCmluZGV4IGQyZWM0ZjMyYzNmMzgyNWJlYTMxYmMwOTAxNGRlNjY5YjhjMDU4MjMuLjMx NGFlNzNmODVjZGE3ZWEzODNhMjE3OTEyMzRkOTA5OWE5YmJhOGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTM4NSw5ICszODUsNiBAQCBwdWJsaWM6CiAgICAg Ym9vbCBkcmF3c0JhY2tncm91bmQoKSBjb25zdCB7IHJldHVybiBtX2RyYXdzQmFja2dyb3VuZDsg fQogICAgIHZvaWQgc2V0RHJhd3NCYWNrZ3JvdW5kKGJvb2wpOwogCi0gICAgYm9vbCBkcmF3c1Ry YW5zcGFyZW50QmFja2dyb3VuZCgpIGNvbnN0IHsgcmV0dXJuIG1fZHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQ7IH0KLSAgICB2b2lkIHNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGJvb2wp OwotCiAgICAgZmxvYXQgdG9wQ29udGVudEluc2V0KCkgY29uc3QgeyByZXR1cm4gbV90b3BDb250 ZW50SW5zZXQ7IH0KICAgICB2b2lkIHNldFRvcENvbnRlbnRJbnNldChmbG9hdCk7CiAKQEAgLTE1 OTksNyArMTU5Niw2IEBAIHByaXZhdGU6CiAgICAgTGF5ZXJIb3N0aW5nTW9kZSBtX2xheWVySG9z dGluZ01vZGU7CiAKICAgICBib29sIG1fZHJhd3NCYWNrZ3JvdW5kOwotICAgIGJvb2wgbV9kcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKIAogICAgIFdlYkNvcmU6OkNvbG9yIG1fdW5kZXJsYXlD b2xvcjsKICAgICBXZWJDb3JlOjpDb2xvciBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggOWY4NzVmZDE4Mjk2NGU2ZDhl MzE5NDliZjQxNTQ4YThkZGU1ZDM0Mi4uYmM1OTQyNmQyNGI4MDNjNGNiMmNlOWQxNjE0NWQzNDM3 MzY3YjUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTEyOTAsNyAr MTI5MCw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnRyYW5zaXRpb25Ub0NvbW1pdHRl ZEZvck5ld1BhZ2UoKQogewogICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7 CiAKLSAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3IgPSB3ZWJQYWdlLT5kcmF3c1RyYW5zcGFyZW50 QmFja2dyb3VuZCgpID8gQ29sb3I6OnRyYW5zcGFyZW50IDogQ29sb3I6OndoaXRlOworICAgIENv bG9yIGJhY2tncm91bmRDb2xvciA9IHdlYlBhZ2UtPmRyYXdzQmFja2dyb3VuZCgpID8gQ29sb3I6 OndoaXRlIDogQ29sb3I6OnRyYW5zcGFyZW50OwogICAgIGJvb2wgaXNNYWluRnJhbWUgPSBtX2Zy YW1lLT5pc01haW5GcmFtZSgpOwogICAgIGJvb2wgaXNUcmFuc3BhcmVudCA9ICF3ZWJQYWdlLT5k cmF3c0JhY2tncm91bmQoKTsKICAgICBib29sIHNob3VsZFVzZUZpeGVkTGF5b3V0ID0gaXNNYWlu RnJhbWUgJiYgd2ViUGFnZS0+dXNlRml4ZWRMYXlvdXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAwZDc0OTE5ZWM2NzUxNjU3ZDg3YjY5 YzliNTkwY2JjNmJiMWYzNGY1Li5kNGIwOWZkZTcxMGVhYjJkZTliYzkyZWRkMThiOTAyZGYzMTdk MDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CkBAIC0yNjEsNyArMjYxLDYgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNv bnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgLCBtX2hhc1Nl ZW5QbHVnaW4oZmFsc2UpCiAgICAgLCBtX3VzZUZpeGVkTGF5b3V0KGZhbHNlKQogICAgICwgbV9k cmF3c0JhY2tncm91bmQodHJ1ZSkKLSAgICAsIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQo ZmFsc2UpCiAgICAgLCBtX2lzSW5SZWRvKGZhbHNlKQogICAgICwgbV9pc0Nsb3NlZChmYWxzZSkK ICAgICAsIG1fdGFiVG9MaW5rcyhmYWxzZSkKQEAgLTQzNiw3ICs0MzUsNiBAQCBXZWJQYWdlOjpX ZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYg cGFyYW1ldGVycykKICAgICBzZXRVc2VGaXhlZExheW91dChwYXJhbWV0ZXJzLnVzZUZpeGVkTGF5 b3V0KTsKIAogICAgIHNldERyYXdzQmFja2dyb3VuZChwYXJhbWV0ZXJzLmRyYXdzQmFja2dyb3Vu ZCk7Ci0gICAgc2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQocGFyYW1ldGVycy5kcmF3c1Ry YW5zcGFyZW50QmFja2dyb3VuZCk7CiAKICAgICBzZXRVbmRlcmxheUNvbG9yKHBhcmFtZXRlcnMu dW5kZXJsYXlDb2xvcik7CiAKQEAgLTIyNjQsMjMgKzIyNjIsNiBAQCB2b2lkIFdlYlBhZ2U6OnNl dERyYXdzQmFja2dyb3VuZChib29sIGRyYXdzQmFja2dyb3VuZCkKICAgICBtX2RyYXdpbmdBcmVh LT5zZXROZWVkc0Rpc3BsYXkoKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpzZXREcmF3c1RyYW5zcGFy ZW50QmFja2dyb3VuZChib29sIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKQotewotICAgIGlm IChtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kID09IGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5k ID0gZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7Ci0KLSAgICBDb2xvciBiYWNrZ3JvdW5kQ29s b3IgPSBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCA/IENvbG9yOjp0cmFuc3BhcmVudCA6IENv bG9yOjp3aGl0ZTsKLSAgICBmb3IgKEZyYW1lKiBjb3JlRnJhbWUgPSBtX21haW5GcmFtZS0+Y29y ZUZyYW1lKCk7IGNvcmVGcmFtZTsgY29yZUZyYW1lID0gY29yZUZyYW1lLT50cmVlKCkudHJhdmVy c2VOZXh0KCkpIHsKLSAgICAgICAgaWYgKEZyYW1lVmlldyogdmlldyA9IGNvcmVGcmFtZS0+dmll dygpKQotICAgICAgICAgICAgdmlldy0+c2V0QmFzZUJhY2tncm91bmRDb2xvcihiYWNrZ3JvdW5k Q29sb3IpOwotICAgIH0KLQotICAgIG1fZHJhd2luZ0FyZWEtPnBhZ2VCYWNrZ3JvdW5kVHJhbnNw YXJlbmN5Q2hhbmdlZCgpOwotICAgIG1fZHJhd2luZ0FyZWEtPnNldE5lZWRzRGlzcGxheSgpOwot fQotCiB2b2lkIFdlYlBhZ2U6OnNldFRvcENvbnRlbnRJbnNldChmbG9hdCBjb250ZW50SW5zZXQp CiB7CiAgICAgaWYgKGNvbnRlbnRJbnNldCA9PSBtX3BhZ2UtPnRvcENvbnRlbnRJbnNldCgpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMTllOGE2 NTFiNjQ2NGM4ODU5NDRjYWNmNzYzNWJkNGRlNjc1NTgxYy4uZDk4NTQyODBmNTE5YTU5ZmJiNGRh MjAyZmMxNzNjNTY3ZTc2MzZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCkBAIC00MDAsNyArNDAwLDYgQEAgcHVibGljOgogICAgIHZvaWQgcG9zdElu amVjdGVkQnVuZGxlTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBVc2Vy RGF0YSYpOwogCiAgICAgYm9vbCBkcmF3c0JhY2tncm91bmQoKSBjb25zdCB7IHJldHVybiBtX2Ry YXdzQmFja2dyb3VuZDsgfQotICAgIGJvb2wgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSBj b25zdCB7IHJldHVybiBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOyB9CiAKICAgICB2b2lk IHNldFVuZGVybGF5Q29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKSB7IG1fdW5kZXJs YXlDb2xvciA9IGNvbG9yOyB9CiAgICAgV2ViQ29yZTo6Q29sb3IgdW5kZXJsYXlDb2xvcigpIGNv bnN0IHsgcmV0dXJuIG1fdW5kZXJsYXlDb2xvcjsgfQpAQCAtMTAyOSw3ICsxMDI4LDYgQEAgcHJp dmF0ZToKICNlbmRpZgogCiAgICAgdm9pZCBzZXREcmF3c0JhY2tncm91bmQoYm9vbCk7Ci0gICAg dm9pZCBzZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChib29sKTsKIAogICAgIHZvaWQgc2V0 VG9wQ29udGVudEluc2V0KGZsb2F0KTsKIApAQCAtMTE5Nyw3ICsxMTk1LDYgQEAgcHJpdmF0ZToK ICAgICBib29sIG1fdXNlRml4ZWRMYXlvdXQ7CiAKICAgICBib29sIG1fZHJhd3NCYWNrZ3JvdW5k OwotICAgIGJvb2wgbV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKIAogICAgIFdlYkNvcmU6 OkNvbG9yIG1fdW5kZXJsYXlDb2xvcjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgppbmRleCA3OTI3ZGE5MGU1YTBmNTEw ZTA3NDZkNGNjZDEwYWIyYjJmYjRlZDY3Li5kZThlMTMyNDI5Yjg3MzBmMDVjMjhlMWRkM2VhMTg0 ZWYyZTYyNmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMjgsNyArMjgsNiBAQCBtZXNzYWdlcyAtPiBXZWJQ YWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRTZXNzaW9uSUQoV2ViQ29yZTo6U2Vzc2lvbklE IHNlc3Npb25JRCkKIAogICAgIFNldERyYXdzQmFja2dyb3VuZChib29sIGRyYXdzQmFja2dyb3Vu ZCkKLSAgICBTZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChib29sIGRyYXdzVHJhbnNwYXJl bnRCYWNrZ3JvdW5kKQogCiAgICAgU2V0VG9wQ29udGVudEluc2V0KGZsb2F0IGNvbnRlbnRJbnNl dCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4 IGI5NTQyOTkyNDQzNjhmMzk1ZTllNTQ0M2FmZjJjMGNkMDQ1MTA2MzQuLjAzMGNiZTBhNWZiYzll NDQxZjk1N2Y1NDkyMzE0MTJmOWQ2OTcwZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZwor KysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNS0xMS0wOSAgVGltIEhv cnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgZHJhd3NCYWNr Z3JvdW5kIFNQSSB0byBXS1dlYlZpZXcsIGFuZCBnZXQgcmlkIG9mIGRyYXdzVHJhbnNwYXJlbnRC YWNrZ3JvdW5kIGZyb20gV2ViS2l0MgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUxMDU0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMDE5ODkxMz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pbmlC cm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtXSzFC cm93c2VyV2luZG93Q29udHJvbGxlciBkaWRDaGFuZ2VTZXR0aW5nc10pOgorICAgICAgICAqIE1p bmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtX SzJCcm93c2VyV2luZG93Q29udHJvbGxlciBkaWRDaGFuZ2VTZXR0aW5nc10pOgorICAgICAgICBV c2UgZHJhd3NCYWNrZ3JvdW5kIGluc3RlYWQsIGFuZCBtYWtlIHN1cmUgdG8gc2V0IHRoZSB3aW5k b3cgYmFja2dyb3VuZCBjb2xvciwKKyAgICAgICAgb3RoZXJ3aXNlIGl0IG1pZ2h0IGVuZCB1cCBi ZWluZyBncmF5IGFueXdheSEKKworICAgICAgICBXZWJLaXQxIHN0aWxsIGRvZXNuJ3Qgd29yayB1 bmxlc3MgeW91IHR1cm4gb2ZmIHRvb2xiYXIgYmx1cnJpbmcsIGJ1dCBhdCBsZWFzdAorICAgICAg ICBXZWJLaXQyIGlzIHdvcmtpbmcgbm93IQorCiAyMDE1LTExLTA5ICBDc2FiYSBPc3p0cm9nb27D oWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0VGTF0gRml4IHRoZSBnc3QtcGx1Z2lu cy1iYWQgamhidWlsZCBtb2R1bGUgYnVpbGQgb24gVWJ1bnR1IDE1LjEwCmRpZmYgLS1naXQgYS9U b29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubSBiL1Rvb2xz L01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCmluZGV4IGIwYzg4 MzcwZTVjODhkNDQwNTE0NGE0YzY3YjUxZDY4YTFkNzczNjYuLjlkMzIzNjEwY2UzYTRiZDI0ZDlk YmZjMTcwZmZlMTY5NGM0ZjNiODEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9X SzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9X SzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC0yNjQsNiArMjY0LDcgQEAgLSAodm9pZClk aWRDaGFuZ2VTZXR0aW5ncwogICAgIEJPT0wgdXNlVHJhbnNwYXJlbnRXaW5kb3dzID0gc2V0dGlu Z3MudXNlVHJhbnNwYXJlbnRXaW5kb3dzOwogICAgIGlmICh1c2VUcmFuc3BhcmVudFdpbmRvd3Mg IT0gIXNlbGYud2luZG93LmlzT3BhcXVlKSB7CiAgICAgICAgIFtzZWxmLndpbmRvdyBzZXRPcGFx dWU6IXVzZVRyYW5zcGFyZW50V2luZG93c107CisgICAgICAgIFtzZWxmLndpbmRvdyBzZXRCYWNr Z3JvdW5kQ29sb3I6W05TQ29sb3IgY2xlYXJDb2xvcl1dOwogICAgICAgICBbc2VsZi53aW5kb3cg c2V0SGFzU2hhZG93OiF1c2VUcmFuc3BhcmVudFdpbmRvd3NdOwogCiAgICAgICAgIFtfd2ViVmll dyBzZXRCYWNrZ3JvdW5kQ29sb3I6dXNlVHJhbnNwYXJlbnRXaW5kb3dzID8gW05TQ29sb3IgY2xl YXJDb2xvcl0gOiBbTlNDb2xvciB3aGl0ZUNvbG9yXV07CmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubSBiL1Rvb2xzL01pbmlCcm93 c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCmluZGV4IDA0ZTMwZDE1NDU2OWIz MmNlNDEyZGI5YmI0MzNjNjg5ZmQ5YjEyNjQuLmZhOWFiOWI3ZWMxYzc5NGQ3MGYxOGIwMzkxYzU5 YmJhYjRmYjEwMWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93c2Vy V2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJCcm93c2Vy V2luZG93Q29udHJvbGxlci5tCkBAIC0zNDUsMTEgKzM0NSwxMiBAQCAtICh2b2lkKWRpZENoYW5n ZVNldHRpbmdzCiAgICAgcHJlZmVyZW5jZXMuX3Jlc291cmNlVXNhZ2VPdmVybGF5VmlzaWJsZSA9 IHNldHRpbmdzLnJlc291cmNlVXNhZ2VPdmVybGF5VmlzaWJsZTsKIAogICAgIEJPT0wgdXNlVHJh bnNwYXJlbnRXaW5kb3dzID0gc2V0dGluZ3MudXNlVHJhbnNwYXJlbnRXaW5kb3dzOwotICAgIGlm ICh1c2VUcmFuc3BhcmVudFdpbmRvd3MgIT0gX3dlYlZpZXcuX2RyYXdzVHJhbnNwYXJlbnRCYWNr Z3JvdW5kKSB7CisgICAgaWYgKHVzZVRyYW5zcGFyZW50V2luZG93cyAhPSAhX3dlYlZpZXcuX2Ry YXdzQmFja2dyb3VuZCkgewogICAgICAgICBbc2VsZi53aW5kb3cgc2V0T3BhcXVlOiF1c2VUcmFu c3BhcmVudFdpbmRvd3NdOworICAgICAgICBbc2VsZi53aW5kb3cgc2V0QmFja2dyb3VuZENvbG9y OltOU0NvbG9yIGNsZWFyQ29sb3JdXTsKICAgICAgICAgW3NlbGYud2luZG93IHNldEhhc1NoYWRv dzohdXNlVHJhbnNwYXJlbnRXaW5kb3dzXTsKIAotICAgICAgICBfd2ViVmlldy5fZHJhd3NUcmFu c3BhcmVudEJhY2tncm91bmQgPSB1c2VUcmFuc3BhcmVudFdpbmRvd3M7CisgICAgICAgIF93ZWJW aWV3Ll9kcmF3c0JhY2tncm91bmQgPSAhdXNlVHJhbnNwYXJlbnRXaW5kb3dzOwogCiAgICAgICAg IFtzZWxmLndpbmRvdyBkaXNwbGF5XTsKICAgICB9Cg== 265102 2015-11-09 15:00:50 -0800 2015-11-09 15:33:38 -0800 Patch bug-151054-20151109150047.patch text/plain 20459 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTNkNDZmM2I4MzI3OWZk ZTdlZDYxMjJmYmRjM2I0MTQ0ZWI0MTJhNS4uZDQ2OTViZGEyMTcwMzYxMWQwNDllNzQ0OGY5OWQ3 NWMxODkwYzViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDE1LTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBkcmF3c0Jh Y2tncm91bmQgU1BJIHRvIFdLV2ViVmlldywgYW5kIGdldCByaWQgb2YgZHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQgZnJvbSBXZWJLaXQyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTEwNTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyOTA3OTk0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOiBEZWxldGVkLgorICAgICAgICAq IFNoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgc2V0RHJhd3NUcmFuc3BhcmVu dEJhY2tncm91bmQ6XSk6CisgICAgICAgICgtW1dLVmlldyBkcmF3c1RyYW5zcGFyZW50QmFja2dy b3VuZF0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OnVwZGF0ZUxheWVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNl dERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6 V2ViVmlld0ltcGw6OmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpXZWJQYWdlUHJveHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGlvblBhcmFtZXRlcnMpOiBEZWxldGVkLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6 V2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3JtQ3JlYXRlSW5zcGVjdG9yUGFnZSk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50Ojp0cmFuc2l0aW9uVG9Db21taXR0 ZWRGb3JOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OldlYlBhZ2UpOiBEZWxldGVkLgorICAgICAgICAo V2ViS2l0OjptX3Nob3VsZERpc3BhdGNoRmFrZU1vdXNlTW92ZUV2ZW50cyk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKTog RGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjpkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk6IERlbGV0ZWQu CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAg ICAgIEdldCByaWQgb2YgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQuIEl0IGRvZXNuJ3Qgc2Vl bSBsaWtlIHRoZXJlJ3MgYW55IG9ic2VydmFibGUKKyAgICAgICAgZGlmZmVyZW5jZSBpbiBhIGxh eWVyLWJhY2tlZCB3b3JsZC4gV0tWaWV3J3MgKHNldClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3Vu ZAorICAgICAgICB3aWxsIGp1c3QgZm9yd2FyZCB0byBkcmF3c0JhY2tncm91bmQgKGludmVydGVk KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3dlYlByb2Nlc3NJc1Jlc3BvbnNpdmVdKToKKyAgICAgICAgTW92ZSBf d2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSB1cCB3aXRoIHRoZSBvdGhlciBjcm9zcy1wbGF0Zm9ybSBT UEkgbWV0aG9kcywgaW5zdGVhZAorICAgICAgICBvZiBiZWxvdyBhbGwgb2YgdGhlIHBsYXRmb3Jt LXNwZWNpZmljIFNQSSBtZXRob2RzLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfZHJhd3NCYWNr Z3JvdW5kXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0RHJhd3NCYWNrZ3JvdW5kOl0pOgor ICAgICAgICBBZGRlZC4KKworICAgICAgICAoLVtXS1dlYlZpZXcgX2RyYXdzVHJhbnNwYXJlbnRC YWNrZ3JvdW5kXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2V0RHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQ6XSk6CisgICAgICAgIERlbGV0ZWQuCisgICAgICAgIAorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICBSZXBsYWNlIGRyYXdz VHJhbnNwYXJlbnRCYWNrZ3JvdW5kIHdpdGggZHJhd3NCYWNrZ3JvdW5kLgorCiAyMDE1LTExLTA2 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV3b3Jr IHRoZSB3YXkgYWxsb3dlZCBhcmd1bWVudCBjbGFzc2VzIGFyZSBzdG9yZWQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCA5 ZjhlMzQ4MzJjZjJmNzVmZmMyNmY5MTI3OWY3MTFhNDM5MjU3OTZlLi5jODVlZjczMmNhOTY3NDZj MGY5YzIyODUxYTQwMWQzNDY1YTU0NWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC00MCw3ICs0MCw2IEBAIHZvaWQg V2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNvZGVyJiBl bmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgcGFnZUdyb3VwRGF0YTsKICAgICBlbmNvZGVy IDw8IGRyYXdzQmFja2dyb3VuZDsKICAgICBlbmNvZGVyIDw8IGlzRWRpdGFibGU7Ci0gICAgZW5j b2RlciA8PCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKICAgICBlbmNvZGVyIDw8IHVuZGVy bGF5Q29sb3I7CiAgICAgZW5jb2RlciA8PCB1c2VGaXhlZExheW91dDsKICAgICBlbmNvZGVyIDw8 IGZpeGVkTGF5b3V0U2l6ZTsKQEAgLTEwMiw4ICsxMDEsNiBAQCBib29sIFdlYlBhZ2VDcmVhdGlv blBhcmFtZXRlcnM6OmRlY29kZShJUEM6OkFyZ3VtZW50RGVjb2RlciYgZGVjb2RlciwgV2ViUGFn ZUNyZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShwYXJh bWV0ZXJzLmlzRWRpdGFibGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgaWYgKCFkZWNv ZGVyLmRlY29kZShwYXJhbWV0ZXJzLmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKSkKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy51bmRl cmxheUNvbG9yKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNv ZGUocGFyYW1ldGVycy51c2VGaXhlZExheW91dCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRleCBmMGVhMTkwZTBlYTQxNWY2MWE0 MzQ4MzM5MGQwMjgwYWY3MmYzYmUzLi5iMmMzYjM5Y2QxMzZkZGFlOTY4ZTBhZTBmODkyZWY0ZmQ3 ZjQ0NTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUGFnZUNyZWF0aW9u UGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQYWdlQ3JlYXRpb25Q YXJhbWV0ZXJzLmgKQEAgLTY1LDcgKzY1LDYgQEAgc3RydWN0IFdlYlBhZ2VDcmVhdGlvblBhcmFt ZXRlcnMgewogICAgIFdlYlBhZ2VHcm91cERhdGEgcGFnZUdyb3VwRGF0YTsKIAogICAgIGJvb2wg ZHJhd3NCYWNrZ3JvdW5kOwotICAgIGJvb2wgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7CiAg ICAgYm9vbCBpc0VkaXRhYmxlOwogCiAgICAgV2ViQ29yZTo6Q29sb3IgdW5kZXJsYXlDb2xvcjsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5k ZXggNmNkYWU0NTljZDQ2ODdjYWYwOTdkMzQzOTdkYTk0N2QyNTI0YjFiNC4uMzc1NWVlZGRjMzA0 MjdiNDg4ZDVkY2M3YzM3ODE3NGU2OGIzNzFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTM1MjIsNiArMzUyMiwxMSBAQCBzdGF0 aWMgaW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9u cyB3a0ZpbmRPcHRpb25zKQogI2VuZGlmCiB9CiAKKy0gKEJPT0wpX3dlYlByb2Nlc3NJc1Jlc3Bv bnNpdmUKK3sKKyAgICByZXR1cm4gX3BhZ2UtPnByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVy KCkuaXNSZXNwb25zaXZlKCk7Cit9CisKICNwcmFnbWEgbWFyayBpT1Mtc3BlY2lmaWMgbWV0aG9k cwogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtMzk0MCwxNCArMzk0NSwxNCBAQCBzdGF0aWMgaW5s aW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3a0Zp bmRPcHRpb25zKQogCiAjcHJhZ21hIG1hcmsgLSBPUyBYLXNwZWNpZmljIG1ldGhvZHMKIAotLSAo Qk9PTClfZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQKKy0gKEJPT0wpX2RyYXdzQmFja2dyb3Vu ZAogewotICAgIHJldHVybiBfaW1wbC0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKTsKKyAg ICByZXR1cm4gX2ltcGwtPmRyYXdzQmFja2dyb3VuZCgpOwogfQogCi0tICh2b2lkKV9zZXREcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZDooQk9PTClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZAor LSAodm9pZClfc2V0RHJhd3NCYWNrZ3JvdW5kOihCT09MKWRyYXdzQmFja2dyb3VuZAogewotICAg IF9pbXBsLT5zZXREcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZChkcmF3c1RyYW5zcGFyZW50QmFj a2dyb3VuZCk7CisgICAgX2ltcGwtPnNldERyYXdzQmFja2dyb3VuZChkcmF3c0JhY2tncm91bmQp OwogfQogCiAjaWYgV0tfQVBJX0VOQUJMRUQKQEAgLTQwMzEsMTEgKzQwMzYsNiBAQCBzdGF0aWMg aW5saW5lIFdlYktpdDo6RmluZE9wdGlvbnMgdG9GaW5kT3B0aW9ucyhfV0tGaW5kT3B0aW9ucyB3 a0ZpbmRPcHRpb25zKQogCiAjZW5kaWYKIAotLSAoQk9PTClfd2ViUHJvY2Vzc0lzUmVzcG9uc2l2 ZQotewotICAgIHJldHVybiBfcGFnZS0+cHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS5p c1Jlc3BvbnNpdmUoKTsKLX0KLQogQGVuZAogCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggNmY2NWRhYjk5NGJi ZjQ3ZjEwMzM3OTdlYmM1OTk1YWQ5YjA3Mjg4OS4uYzIxZTcwY2NjNzdiODliYjRiMGYwMDdiNzkz NWRmMmYwNGJlZjNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgKQEAgLTE2OSw3ICsxNjksNyBAQCB0eXBlZGVmIE5T X0VOVU0oTlNJbnRlZ2VyLCBfV0tJbW1lZGlhdGVBY3Rpb25UeXBlKSB7CiAKICNlbHNlCiBAcHJv cGVydHkgKHJlYWRvbmx5KSBOU0NvbG9yICpfcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yOwot QHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91 bmQ6KSBCT09MIF9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsKK0Bwcm9wZXJ0eSAobm9uYXRv bWljLCBzZXR0ZXI9X3NldERyYXdzQmFja2dyb3VuZDopIEJPT0wgX2RyYXdzQmFja2dyb3VuZDsK IEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3NldFRvcENvbnRlbnRJbnNldDopIENHRmxv YXQgX3RvcENvbnRlbnRJbnNldDsKIAogI2lmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTAxMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21h Yy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0K aW5kZXggYjEwODNhMDhhZTA2NTJhNTBmMTZkZGRjNjMzYTgzMDhkZGJiMDM5NS4uNWVhZjNkYjE1 OTQ3MDg2NTZlMjk5YmQ5MjgwZWRmMDYzMWY0Nzg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtOTksMTIgKzk5LDEyIEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwogCiAtICh2b2lkKXNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOihCT09M KWRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kCiB7Ci0gICAgX2RhdGEtPl9pbXBsLT5zZXREcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZChkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCk7CisgICAg X2RhdGEtPl9pbXBsLT5zZXREcmF3c0JhY2tncm91bmQoIWRyYXdzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKTsKIH0KIAogLSAoQk9PTClkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZAogewotICAgIHJl dHVybiBfZGF0YS0+X2ltcGwtPmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCk7CisgICAgcmV0 dXJuICFfZGF0YS0+X2ltcGwtPmRyYXdzQmFja2dyb3VuZCgpOwogfQogCiAtIChCT09MKWFjY2Vw dHNGaXJzdFJlc3BvbmRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nv Y29hL1dlYlZpZXdJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwuaAppbmRleCBkYjJlODk4OTM1MjJhMmZhZTg1MTg1NzgwZjdmMjBiNzg0ZTMwZjIzLi4w YzE4ZDdiYjBjMzZhMGQwNzdmNjFlNmU1ZDk5OTE4NzVkNjkxNjQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwuaApAQCAtMTIyLDggKzEyMiw2IEBAIHB1 YmxpYzoKIAogICAgIHZvaWQgc2V0RHJhd3NCYWNrZ3JvdW5kKGJvb2wpOwogICAgIGJvb2wgZHJh d3NCYWNrZ3JvdW5kKCkgY29uc3Q7Ci0gICAgdm9pZCBzZXREcmF3c1RyYW5zcGFyZW50QmFja2dy b3VuZChib29sKTsKLSAgICBib29sIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkgY29uc3Q7 CiAgICAgYm9vbCBpc09wYXF1ZSgpIGNvbnN0OwogCiAgICAgYm9vbCBhY2NlcHRzRmlyc3RNb3Vz ZShOU0V2ZW50ICopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29h L1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tCmluZGV4IDhlMTBmM2M2NjhlNjVhZjQ5OWJhZmI2ZWZiMjY2MzZlZjg4Nzk1YmMuLmI4 N2JkOTg1OTI4NjFhYzZmYzYyY2IwZDk4YjRiMzVkOWNkMDZkYTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJWaWV3SW1wbC5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTU0OSwxNiArNTQ5LDYgQEAg Ym9vbCBXZWJWaWV3SW1wbDo6ZHJhd3NCYWNrZ3JvdW5kKCkgY29uc3QKICAgICByZXR1cm4gbV9w YWdlLT5kcmF3c0JhY2tncm91bmQoKTsKIH0KIAotdm9pZCBXZWJWaWV3SW1wbDo6c2V0RHJhd3NU cmFuc3BhcmVudEJhY2tncm91bmQoYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCkKLXsK LSAgICBtX3BhZ2UtPnNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGRyYXdzVHJhbnNwYXJl bnRCYWNrZ3JvdW5kKTsKLX0KLQotYm9vbCBXZWJWaWV3SW1wbDo6ZHJhd3NUcmFuc3BhcmVudEJh Y2tncm91bmQoKSBjb25zdAotewotICAgIHJldHVybiBtX3BhZ2UtPmRyYXdzVHJhbnNwYXJlbnRC YWNrZ3JvdW5kKCk7Ci19Ci0KIGJvb2wgV2ViVmlld0ltcGw6OmlzT3BhcXVlKCkgY29uc3QKIHsK ICAgICByZXR1cm4gbV9wYWdlLT5kcmF3c0JhY2tncm91bmQoKTsKQEAgLTgyNSwxMCArODE1LDcg QEAgdm9pZCBXZWJWaWV3SW1wbDo6d2FpdEZvckFzeW5jRHJhd2luZ0FyZWFTaXplVXBkYXRlKCkK IAogdm9pZCBXZWJWaWV3SW1wbDo6dXBkYXRlTGF5ZXIoKQogewotICAgIGlmIChkcmF3c0JhY2tn cm91bmQoKSAmJiAhZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSkKLSAgICAgICAgbV92aWV3 LmxheWVyLmJhY2tncm91bmRDb2xvciA9IENHQ29sb3JHZXRDb25zdGFudENvbG9yKGtDR0NvbG9y V2hpdGUpOwotICAgIGVsc2UKLSAgICAgICAgbV92aWV3LmxheWVyLmJhY2tncm91bmRDb2xvciA9 IENHQ29sb3JHZXRDb25zdGFudENvbG9yKGtDR0NvbG9yQ2xlYXIpOworICAgIG1fdmlldy5sYXll ci5iYWNrZ3JvdW5kQ29sb3IgPSBDR0NvbG9yR2V0Q29uc3RhbnRDb2xvcihkcmF3c0JhY2tncm91 bmQoKSA/IGtDR0NvbG9yV2hpdGUgOiBrQ0dDb2xvckNsZWFyKTsKIAogICAgIC8vIElmIGFzeW5j aHJvbm91cyBnZW9tZXRyeSB1cGRhdGVzIGhhdmUgYmVlbiBzZW50IGJ5IGZvcmNlQXN5bmNEcmF3 aW5nQXJlYVNpemVVcGRhdGUsCiAgICAgLy8gdGhlbiBzdWJzZXF1ZW50IGNhbGxzIHRvIHNldEZy YW1lU2l6ZSBzaG91bGQgbm90IHJlc3VsdCBpbiB1cyB3YWl0aW5nIGZvciB0aGUgZGlkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJW aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dl YlZpZXcuY3BwCmluZGV4IDhmZmZlZWM0MTlkZDVjNWYxYjIwNzk2MDYzNTliYWFlZmJkZTk0OWIu LjAyMjQxN2YyZmIzNDY0ZGYyZjllYTFmZmUwODA1NThhOTEzN2FiYTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcu Y3BwCkBAIC0xNzMsMTIgKzE3MywxMiBAQCBib29sIFdlYlZpZXc6OmRyYXdzQmFja2dyb3VuZCgp IGNvbnN0CiAKIHZvaWQgV2ViVmlldzo6c2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoYm9v bCB0cmFuc3BhcmVudEJhY2tncm91bmQpCiB7Ci0gICAgbV9wYWdlLT5zZXREcmF3c1RyYW5zcGFy ZW50QmFja2dyb3VuZCh0cmFuc3BhcmVudEJhY2tncm91bmQpOworICAgIG1fcGFnZS0+c2V0RHJh d3NCYWNrZ3JvdW5kKCF0cmFuc3BhcmVudEJhY2tncm91bmQpOwogfQogCiBib29sIFdlYlZpZXc6 OmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9wYWdl LT5kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCgpOworICAgIHJldHVybiAhbV9wYWdlLT5kcmF3 c0JhY2tncm91bmQoKTsKIH0KIAogdm9pZCBXZWJWaWV3OjpzdXNwZW5kQWN0aXZlRE9NT2JqZWN0 c0FuZEFuaW1hdGlvbnMoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAppbmRleCA2MTlmMzc1ZTQ5M2Q0YjZjYWNmNTY5MTBiN2ZmOTQwYmFlMmJhZTk1Li5kNWE4NzAx NzQxMDUzNzkzNzMwZjdiMzQwNGViNjI0MzZmYjNjNTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzYxLDcgKzM2MSw2IEBAIFdlYlBhZ2VQcm94eTo6 V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlByb2Nlc3NQcm94eSYgcHJv Y2VzcywgdWluCiAgICAgLCBtX3RvcENvbnRlbnRJbnNldCgwKQogICAgICwgbV9sYXllckhvc3Rp bmdNb2RlKExheWVySG9zdGluZ01vZGU6OkluUHJvY2VzcykKICAgICAsIG1fZHJhd3NCYWNrZ3Jv dW5kKHRydWUpCi0gICAgLCBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGZhbHNlKQogICAg ICwgbV91c2VGaXhlZExheW91dChmYWxzZSkKICAgICAsIG1fc3VwcHJlc3NTY3JvbGxiYXJBbmlt YXRpb25zKGZhbHNlKQogICAgICwgbV9wYWdpbmF0aW9uTW9kZShQYWdpbmF0aW9uOjpVbnBhZ2lu YXRlZCkKQEAgLTEyNDUsMTcgKzEyNDQsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0RHJhd3NC YWNrZ3JvdW5kKGJvb2wgZHJhd3NCYWNrZ3JvdW5kKQogICAgICAgICBtX3Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OlNldERyYXdzQmFja2dyb3VuZChkcmF3c0JhY2tncm91bmQpLCBt X3BhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXREcmF3c1RyYW5zcGFyZW50QmFj a2dyb3VuZChib29sIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKQotewotICAgIGlmIChtX2Ry YXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kID09IGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kID0gZHJh d3NUcmFuc3BhcmVudEJhY2tncm91bmQ7Ci0KLSAgICBpZiAoaXNWYWxpZCgpKQotICAgICAgICBt X3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNldERyYXdzVHJhbnNwYXJlbnRCYWNr Z3JvdW5kKGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKSwgbV9wYWdlSUQpOwotfQotCiB2b2lk IFdlYlBhZ2VQcm94eTo6c2V0VG9wQ29udGVudEluc2V0KGZsb2F0IGNvbnRlbnRJbnNldCkKIHsK ICAgICBpZiAobV90b3BDb250ZW50SW5zZXQgPT0gY29udGVudEluc2V0KQpAQCAtNTA5NCw3ICs1 MDgyLDYgQEAgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyBXZWJQYWdlUHJveHk6OmNyZWF0aW9u UGFyYW1ldGVycygpCiAgICAgcGFyYW1ldGVycy5wYWdlR3JvdXBEYXRhID0gbV9wYWdlR3JvdXAt PmRhdGEoKTsKICAgICBwYXJhbWV0ZXJzLmRyYXdzQmFja2dyb3VuZCA9IG1fZHJhd3NCYWNrZ3Jv dW5kOwogICAgIHBhcmFtZXRlcnMuaXNFZGl0YWJsZSA9IG1faXNFZGl0YWJsZTsKLSAgICBwYXJh bWV0ZXJzLmRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kID0gbV9kcmF3c1RyYW5zcGFyZW50QmFj a2dyb3VuZDsKICAgICBwYXJhbWV0ZXJzLnVuZGVybGF5Q29sb3IgPSBtX3VuZGVybGF5Q29sb3I7 CiAgICAgcGFyYW1ldGVycy51c2VGaXhlZExheW91dCA9IG1fdXNlRml4ZWRMYXlvdXQ7CiAgICAg cGFyYW1ldGVycy5maXhlZExheW91dFNpemUgPSBtX2ZpeGVkTGF5b3V0U2l6ZTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCBkMmVjNGYzMmMzZjM4MjViZWEzMWJj MDkwMTRkZTY2OWI4YzA1ODIzLi4zMTRhZTczZjg1Y2RhN2VhMzgzYTIxNzkxMjM0ZDkwOTlhOWJi YThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0zODUsOSAr Mzg1LDYgQEAgcHVibGljOgogICAgIGJvb2wgZHJhd3NCYWNrZ3JvdW5kKCkgY29uc3QgeyByZXR1 cm4gbV9kcmF3c0JhY2tncm91bmQ7IH0KICAgICB2b2lkIHNldERyYXdzQmFja2dyb3VuZChib29s KTsKIAotICAgIGJvb2wgZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSBjb25zdCB7IHJldHVy biBtX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOyB9Ci0gICAgdm9pZCBzZXREcmF3c1RyYW5z cGFyZW50QmFja2dyb3VuZChib29sKTsKLQogICAgIGZsb2F0IHRvcENvbnRlbnRJbnNldCgpIGNv bnN0IHsgcmV0dXJuIG1fdG9wQ29udGVudEluc2V0OyB9CiAgICAgdm9pZCBzZXRUb3BDb250ZW50 SW5zZXQoZmxvYXQpOwogCkBAIC0xNTk5LDcgKzE1OTYsNiBAQCBwcml2YXRlOgogICAgIExheWVy SG9zdGluZ01vZGUgbV9sYXllckhvc3RpbmdNb2RlOwogCiAgICAgYm9vbCBtX2RyYXdzQmFja2dy b3VuZDsKLSAgICBib29sIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQ7CiAKICAgICBXZWJD b3JlOjpDb2xvciBtX3VuZGVybGF5Q29sb3I7CiAgICAgV2ViQ29yZTo6Q29sb3IgbV9wYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmlu ZGV4IDlmODc1ZmQxODI5NjRlNmQ4ZTMxOTQ5YmY0MTU0OGE4ZGRlNWQzNDIuLmJjNTk0MjZkMjRi ODAzYzRjYjJjZTlkMTYxNDVkMzQzNzM2N2I1MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQuY3BwCkBAIC0xMjkwLDcgKzEyOTAsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50 Ojp0cmFuc2l0aW9uVG9Db21taXR0ZWRGb3JOZXdQYWdlKCkKIHsKICAgICBXZWJQYWdlKiB3ZWJQ YWdlID0gbV9mcmFtZS0+cGFnZSgpOwogCi0gICAgQ29sb3IgYmFja2dyb3VuZENvbG9yID0gd2Vi UGFnZS0+ZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoKSA/IENvbG9yOjp0cmFuc3BhcmVudCA6 IENvbG9yOjp3aGl0ZTsKKyAgICBDb2xvciBiYWNrZ3JvdW5kQ29sb3IgPSB3ZWJQYWdlLT5kcmF3 c0JhY2tncm91bmQoKSA/IENvbG9yOjp3aGl0ZSA6IENvbG9yOjp0cmFuc3BhcmVudDsKICAgICBi b29sIGlzTWFpbkZyYW1lID0gbV9mcmFtZS0+aXNNYWluRnJhbWUoKTsKICAgICBib29sIGlzVHJh bnNwYXJlbnQgPSAhd2ViUGFnZS0+ZHJhd3NCYWNrZ3JvdW5kKCk7CiAgICAgYm9vbCBzaG91bGRV c2VGaXhlZExheW91dCA9IGlzTWFpbkZyYW1lICYmIHdlYlBhZ2UtPnVzZUZpeGVkTGF5b3V0KCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXgg MGQ3NDkxOWVjNjc1MTY1N2Q4N2I2OWM5YjU5MGNiYzZiYjFmMzRmNS4uZDRiMDlmZGU3MTBlYWIy ZGU5YmM5MmVkZDE4YjkwMmRmMzE3ZDA3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjYxLDcgKzI2MSw2IEBAIFdlYlBhZ2U6OldlYlBh Z2UodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJh bWV0ZXJzKQogICAgICwgbV9oYXNTZWVuUGx1Z2luKGZhbHNlKQogICAgICwgbV91c2VGaXhlZExh eW91dChmYWxzZSkKICAgICAsIG1fZHJhd3NCYWNrZ3JvdW5kKHRydWUpCi0gICAgLCBtX2RyYXdz VHJhbnNwYXJlbnRCYWNrZ3JvdW5kKGZhbHNlKQogICAgICwgbV9pc0luUmVkbyhmYWxzZSkKICAg ICAsIG1faXNDbG9zZWQoZmFsc2UpCiAgICAgLCBtX3RhYlRvTGlua3MoZmFsc2UpCkBAIC00MzYs NyArNDM1LDYgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBh Z2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgc2V0VXNlRml4ZWRMYXlvdXQo cGFyYW1ldGVycy51c2VGaXhlZExheW91dCk7CiAKICAgICBzZXREcmF3c0JhY2tncm91bmQocGFy YW1ldGVycy5kcmF3c0JhY2tncm91bmQpOwotICAgIHNldERyYXdzVHJhbnNwYXJlbnRCYWNrZ3Jv dW5kKHBhcmFtZXRlcnMuZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQpOwogCiAgICAgc2V0VW5k ZXJsYXlDb2xvcihwYXJhbWV0ZXJzLnVuZGVybGF5Q29sb3IpOwogCkBAIC0yMjY0LDIzICsyMjYy LDYgQEAgdm9pZCBXZWJQYWdlOjpzZXREcmF3c0JhY2tncm91bmQoYm9vbCBkcmF3c0JhY2tncm91 bmQpCiAgICAgbV9kcmF3aW5nQXJlYS0+c2V0TmVlZHNEaXNwbGF5KCk7CiB9CiAKLXZvaWQgV2Vi UGFnZTo6c2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQoYm9vbCBkcmF3c1RyYW5zcGFyZW50 QmFja2dyb3VuZCkKLXsKLSAgICBpZiAobV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCA9PSBk cmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9kcmF3 c1RyYW5zcGFyZW50QmFja2dyb3VuZCA9IGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOwotCi0g ICAgQ29sb3IgYmFja2dyb3VuZENvbG9yID0gZHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQgPyBD b2xvcjo6dHJhbnNwYXJlbnQgOiBDb2xvcjo6d2hpdGU7Ci0gICAgZm9yIChGcmFtZSogY29yZUZy YW1lID0gbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpOyBjb3JlRnJhbWU7IGNvcmVGcmFtZSA9IGNv cmVGcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgpKSB7Ci0gICAgICAgIGlmIChGcmFtZVZpZXcq IHZpZXcgPSBjb3JlRnJhbWUtPnZpZXcoKSkKLSAgICAgICAgICAgIHZpZXctPnNldEJhc2VCYWNr Z3JvdW5kQ29sb3IoYmFja2dyb3VuZENvbG9yKTsKLSAgICB9Ci0KLSAgICBtX2RyYXdpbmdBcmVh LT5wYWdlQmFja2dyb3VuZFRyYW5zcGFyZW5jeUNoYW5nZWQoKTsKLSAgICBtX2RyYXdpbmdBcmVh LT5zZXROZWVkc0Rpc3BsYXkoKTsKLX0KLQogdm9pZCBXZWJQYWdlOjpzZXRUb3BDb250ZW50SW5z ZXQoZmxvYXQgY29udGVudEluc2V0KQogewogICAgIGlmIChjb250ZW50SW5zZXQgPT0gbV9wYWdl LT50b3BDb250ZW50SW5zZXQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCmluZGV4IDE5ZThhNjUxYjY0NjRjODg1OTQ0Y2FjZjc2MzViZDRkZTY3NTU4MWMu LmQ5ODU0MjgwZjUxOWE1OWZiYjRkYTIwMmZjMTczYzU2N2U3NjM2ZjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNDAwLDcgKzQwMCw2IEBAIHB1 YmxpYzoKICAgICB2b2lkIHBvc3RJbmplY3RlZEJ1bmRsZU1lc3NhZ2UoY29uc3QgU3RyaW5nJiBt ZXNzYWdlTmFtZSwgY29uc3QgVXNlckRhdGEmKTsKIAogICAgIGJvb2wgZHJhd3NCYWNrZ3JvdW5k KCkgY29uc3QgeyByZXR1cm4gbV9kcmF3c0JhY2tncm91bmQ7IH0KLSAgICBib29sIGRyYXdzVHJh bnNwYXJlbnRCYWNrZ3JvdW5kKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3c1RyYW5zcGFyZW50QmFj a2dyb3VuZDsgfQogCiAgICAgdm9pZCBzZXRVbmRlcmxheUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNv bG9yJiBjb2xvcikgeyBtX3VuZGVybGF5Q29sb3IgPSBjb2xvcjsgfQogICAgIFdlYkNvcmU6OkNv bG9yIHVuZGVybGF5Q29sb3IoKSBjb25zdCB7IHJldHVybiBtX3VuZGVybGF5Q29sb3I7IH0KQEAg LTEwMjksNyArMTAyOCw2IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIHZvaWQgc2V0RHJhd3NC YWNrZ3JvdW5kKGJvb2wpOwotICAgIHZvaWQgc2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91bmQo Ym9vbCk7CiAKICAgICB2b2lkIHNldFRvcENvbnRlbnRJbnNldChmbG9hdCk7CiAKQEAgLTExOTcs NyArMTE5NSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3VzZUZpeGVkTGF5b3V0OwogCiAgICAg Ym9vbCBtX2RyYXdzQmFja2dyb3VuZDsKLSAgICBib29sIG1fZHJhd3NUcmFuc3BhcmVudEJhY2tn cm91bmQ7CiAKICAgICBXZWJDb3JlOjpDb2xvciBtX3VuZGVybGF5Q29sb3I7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmlu IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4K aW5kZXggNzkyN2RhOTBlNWEwZjUxMGUwNzQ2ZDRjY2QxMGFiMmIyZmI0ZWQ2Ny4uZGU4ZTEzMjQy OWI4NzMwZjA1YzI4ZTFkZDNlYTE4NGVmMmU2MjZlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KQEAgLTI4LDcgKzI4 LDYgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgU2V0U2Vzc2lv bklEKFdlYkNvcmU6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAKICAgICBTZXREcmF3c0JhY2tncm91 bmQoYm9vbCBkcmF3c0JhY2tncm91bmQpCi0gICAgU2V0RHJhd3NUcmFuc3BhcmVudEJhY2tncm91 bmQoYm9vbCBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCkKIAogICAgIFNldFRvcENvbnRlbnRJ bnNldChmbG9hdCBjb250ZW50SW5zZXQpCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiOTU0Mjk5MjQ0MzY4ZjM5NWU5ZTU0NDNhZmYyYzBjZDA0 NTEwNjM0Li43M2VjOGMyZmRjZTNmYjEwOGE4MDM0NDZiY2RlNjMzZjI3ODNkZTdlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTUtMTEtMDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIGRyYXdzQmFja2dyb3VuZCBTUEkgdG8gV0tXZWJWaWV3LCBhbmQgZ2V0IHJp ZCBvZiBkcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCBmcm9tIFdlYktpdDIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTA1NAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMjI5MDc5OTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXIubToKKyAgICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZGlkQ2hhbmdlU2V0 dGluZ3NdKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRy b2xsZXIubToKKyAgICAgICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgZGlkQ2hhbmdl U2V0dGluZ3NdKToKKyAgICAgICAgVXNlIGRyYXdzQmFja2dyb3VuZCBpbnN0ZWFkLCBhbmQgbWFr ZSBzdXJlIHRvIHNldCB0aGUgd2luZG93IGJhY2tncm91bmQgY29sb3IsCisgICAgICAgIG90aGVy d2lzZSBpdCBtaWdodCBlbmQgdXAgYmVpbmcgZ3JheSBhbnl3YXkhCisKKyAgICAgICAgV2ViS2l0 MSBzdGlsbCBkb2Vzbid0IHdvcmsgdW5sZXNzIHlvdSB0dXJuIG9mZiB0b29sYmFyIGJsdXJyaW5n LCBidXQgYXQgbGVhc3QKKyAgICAgICAgV2ViS2l0MiBpcyB3b3JraW5nIG5vdyEKKwogMjAxNS0x MS0wOSAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtF RkxdIEZpeCB0aGUgZ3N0LXBsdWdpbnMtYmFkIGpoYnVpbGQgbW9kdWxlIGJ1aWxkIG9uIFVidW50 dSAxNS4xMApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5k b3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIubQppbmRleCBiMGM4ODM3MGU1Yzg4ZDQ0MDUxNDRhNGM2N2I1MWQ2OGExZDc3MzY2 Li45ZDMyMzYxMGNlM2E0YmQyNGQ5ZGJmYzE3MGZmZTE2OTRjNGYzYjgxIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtMjY0 LDYgKzI2NCw3IEBAIC0gKHZvaWQpZGlkQ2hhbmdlU2V0dGluZ3MKICAgICBCT09MIHVzZVRyYW5z cGFyZW50V2luZG93cyA9IHNldHRpbmdzLnVzZVRyYW5zcGFyZW50V2luZG93czsKICAgICBpZiAo dXNlVHJhbnNwYXJlbnRXaW5kb3dzICE9ICFzZWxmLndpbmRvdy5pc09wYXF1ZSkgewogICAgICAg ICBbc2VsZi53aW5kb3cgc2V0T3BhcXVlOiF1c2VUcmFuc3BhcmVudFdpbmRvd3NdOworICAgICAg ICBbc2VsZi53aW5kb3cgc2V0QmFja2dyb3VuZENvbG9yOltOU0NvbG9yIGNsZWFyQ29sb3JdXTsK ICAgICAgICAgW3NlbGYud2luZG93IHNldEhhc1NoYWRvdzohdXNlVHJhbnNwYXJlbnRXaW5kb3dz XTsKIAogICAgICAgICBbX3dlYlZpZXcgc2V0QmFja2dyb3VuZENvbG9yOnVzZVRyYW5zcGFyZW50 V2luZG93cyA/IFtOU0NvbG9yIGNsZWFyQ29sb3JdIDogW05TQ29sb3Igd2hpdGVDb2xvcl1dOwpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIu bQppbmRleCAwNGUzMGQxNTQ1NjliMzJjZTQxMmRiOWJiNDMzYzY4OWZkOWIxMjY0Li5mYTlhYjli N2VjMWM3OTRkNzBmMThiMDM5MWM1OWJiYWI0ZmIxMDFkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtMzQ1LDExICszNDUs MTIgQEAgLSAodm9pZClkaWRDaGFuZ2VTZXR0aW5ncwogICAgIHByZWZlcmVuY2VzLl9yZXNvdXJj ZVVzYWdlT3ZlcmxheVZpc2libGUgPSBzZXR0aW5ncy5yZXNvdXJjZVVzYWdlT3ZlcmxheVZpc2li bGU7CiAKICAgICBCT09MIHVzZVRyYW5zcGFyZW50V2luZG93cyA9IHNldHRpbmdzLnVzZVRyYW5z cGFyZW50V2luZG93czsKLSAgICBpZiAodXNlVHJhbnNwYXJlbnRXaW5kb3dzICE9IF93ZWJWaWV3 Ll9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZCkgeworICAgIGlmICh1c2VUcmFuc3BhcmVudFdp bmRvd3MgIT0gIV93ZWJWaWV3Ll9kcmF3c0JhY2tncm91bmQpIHsKICAgICAgICAgW3NlbGYud2lu ZG93IHNldE9wYXF1ZTohdXNlVHJhbnNwYXJlbnRXaW5kb3dzXTsKKyAgICAgICAgW3NlbGYud2lu ZG93IHNldEJhY2tncm91bmRDb2xvcjpbTlNDb2xvciBjbGVhckNvbG9yXV07CiAgICAgICAgIFtz ZWxmLndpbmRvdyBzZXRIYXNTaGFkb3c6IXVzZVRyYW5zcGFyZW50V2luZG93c107CiAKLSAgICAg ICAgX3dlYlZpZXcuX2RyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kID0gdXNlVHJhbnNwYXJlbnRX aW5kb3dzOworICAgICAgICBfd2ViVmlldy5fZHJhd3NCYWNrZ3JvdW5kID0gIXVzZVRyYW5zcGFy ZW50V2luZG93czsKIAogICAgICAgICBbc2VsZi53aW5kb3cgZGlzcGxheV07CiAgICAgfQo=