220875 2021-01-22 14:30:13 -0800 [iOS WK2] Make the "in stable state" bit in visible content rect updates more fine-grained 2021-01-25 09:46:20 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220886 1 simon.fraser simon.fraser simon.fraser thorton webkit-bug-importer oldest_to_newest 1721713 0 simon.fraser 2021-01-22 14:30:13 -0800 [iOS WK2] Make the "in stable state" bit in visible content rect updates more fine-grained 1721716 1 418182 simon.fraser 2021-01-22 14:33:59 -0800 Created attachment 418182 Patch 1721795 2 ews-feeder 2021-01-22 17:28:16 -0800 Committed r271771: <https://trac.webkit.org/changeset/271771> All reviewed patches have been landed. Closing bug and clearing flags on attachment 418182. 1721796 3 webkit-bug-importer 2021-01-22 17:29:14 -0800 <rdar://problem/73522566> 418182 2021-01-22 14:33:59 -0800 2021-01-22 17:28:17 -0800 Patch bug-220875-20210122143358.patch text/plain 22954 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRmZjljNmYyOTVjNDJkZWNi OTI5OWY2YTAxODIxMTA5YTk2NGVjY2MuLmJlY2RlNzQyMzJlNTRkMzgyOTUyMDU0MzRkMjk0YTIx ODk4Yzg3MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDcgQEAKKzIwMjEtMDEtMjIgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXSzJdIE1ha2Ug dGhlICJpbiBzdGFibGUgc3RhdGUiIGJpdCBpbiB2aXNpYmxlIGNvbnRlbnQgcmVjdCB1cGRhdGVz IG1vcmUgZmluZS1ncmFpbmVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjA4NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvIGNvbnRhaW5zIGEgc2luZ2xl ICJpbiBzdGFibGUgc3RhdGUiIGJpdCwgYnV0IGluIGEgZnV0dXJlCisgICAgICAgIHBhdGNoIHRo ZSB3ZWIgcHJvY2VzcyB3aWxsIG5lZWQgdG8ga25vdyBpZiB0aGUgVUkgcHJvY2VzcyBpcyBydWJi ZXJiYW5kaW5nLiBJbiBhZGRpdGlvbiwKKyAgICAgICAgd2UgY2FuIGZvbGQgImlzQ2hhbmdpbmdP YnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkiIGludG8gdGhlIHNhbWUgc3RhdGUgYml0cy4KKwor ICAgICAgICBTbyBnaXZlIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8gYSBPcHRpb25TZXQ8 Vmlld1N0YWJpbGl0eUZsYWc+LgorCisgICAgICAgIFRvIGdpdmUgdGhlIGNvcnJlY3Qgc3RhdGUg Zm9yIG5vbi1tYWluIFVJU2Nyb2xsVmlld3MsIGhhdmUgX3Njcm9sbFZpZXdJc1J1YmJlckJhbmRp bmcKKyAgICAgICAgdGFrZSB0aGUgVUlTY3JvbGxWaWV3IGluIHF1ZXN0aW9uLCBhbmQgb25seSBp bmNsdWRlIGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkKKyAgICAgICAgaWYg dGhlIHF1ZXN0aW9uIGlzIGJlaW5nIGFza2VkIG9mIHRoZSBtYWluIFVJU2Nyb2xsVmlldy4KKwor ICAgICAgICAqIFNoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5jb2RlIGNvbnN0KToK KyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZGVjb2RlKToK KyAgICAgICAgKFdlYktpdDo6b3BlcmF0b3I8PCk6CisgICAgICAgICogU2hhcmVkL1Zpc2libGVD b250ZW50UmVjdFVwZGF0ZUluZm8uaDoKKyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRS ZWN0VXBkYXRlSW5mbzo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyk6CisgICAgICAgIChX ZWJLaXQ6OlZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm86OmluU3RhYmxlU3RhdGUgY29uc3Qp OgorICAgICAgICAoV2ViS2l0OjpWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvOjp2aWV3U3Rh YmlsaXR5IGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl SW5mbzo6aXNGaXJzdFVwZGF0ZUZvck5ld1ZpZXdTaXplIGNvbnN0KToKKyAgICAgICAgKFdlYktp dDo6b3BlcmF0b3I9PSk6CisgICAgICAgIChXZWJLaXQ6OlZpc2libGVDb250ZW50UmVjdFVwZGF0 ZUluZm86OmlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkgY29uc3QpOiBEZWxl dGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06CisgICAgICAgICgt W1dLV2ViVmlldyBfZGlkUmVsYXVuY2hQcm9jZXNzXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBf c2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZzpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF92aWV3 U3RhYmlsaXR5U3RhdGU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfc2NoZWR1bGVWaXNpYmxl Q29udGVudFJlY3RVcGRhdGVBZnRlclNjcm9sbEluVmlldzpdKToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzXSk6CisgICAgICAgICgtW1dLV2ViVmlldyBf c2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZ10pOiBEZWxldGVkLgorICAgICAgICAoLVtXS1dlYlZp ZXcgX3Njcm9sbFZpZXdJc0luU3RhYmxlU3RhdGU6XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZFVwZGF0ZVZpc2libGVS ZWN0OnVub2JzY3VyZWRSZWN0OmNvbnRlbnRJbnNldHM6dW5vYnNjdXJlZFJlY3RJblNjcm9sbFZp ZXdDb29yZGluYXRlczpvYnNjdXJlZEluc2V0czp1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHM6aW5w dXRWaWV3Qm91bmRzOnNjYWxlOm1pbmltdW1TY2FsZTp2aWV3U3RhYmlsaXR5OmVuY2xvc2VkSW5T Y3JvbGxhYmxlQW5jZXN0b3JWaWV3OnNlbmRFdmVuSWZVbmNoYW5nZWQ6XSk6CisgICAgICAgICgt W1dLQ29udGVudFZpZXcgZGlkVXBkYXRlVmlzaWJsZVJlY3Q6dW5vYnNjdXJlZFJlY3Q6Y29udGVu dEluc2V0czp1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzOm9ic2N1cmVkSW5z ZXRzOnVub2JzY3VyZWRTYWZlQXJlYUluc2V0czppbnB1dFZpZXdCb3VuZHM6c2NhbGU6bWluaW11 bVNjYWxlOmluU3RhYmxlU3RhdGU6aXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVs eTplbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldzpzZW5kRXZlbklmVW5jaGFuZ2VkOl0p OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyk6 CisKIDIwMjEtMDEtMjEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBBZGQgZXhwZXJpbWVudGFsIGZlYXR1cmUgdG8gdXNlIG5ldHdvcmsgbG9h ZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RV cGRhdGVJbmZvLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVw ZGF0ZUluZm8uY3BwCmluZGV4IGVhZTVkMTZkNjYzMTdhZTgxNzYzYzQzYzg2MzgyOWJlZDRmN2Jk NzQuLjBhODFiNzQ4ODI1MzIxY2M1MTYyYmE2YTI0OGZiMjFmZDNkY2Q1NTkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uY3Bw CkBAIC00OSw5ICs0OSw4IEBAIHZvaWQgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbzo6ZW5j b2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8IG1fc2Nyb2xs VmVsb2NpdHk7CiAgICAgZW5jb2RlciA8PCBtX2xhc3RMYXllclRyZWVUcmFuc2FjdGlvbklEOwog ICAgIGVuY29kZXIgPDwgbV9zY2FsZTsKLSAgICBlbmNvZGVyIDw8IG1faW5TdGFibGVTdGF0ZTsK KyAgICBlbmNvZGVyIDw8IG1fdmlld1N0YWJpbGl0eTsKICAgICBlbmNvZGVyIDw8IG1faXNGaXJz dFVwZGF0ZUZvck5ld1ZpZXdTaXplOwotICAgIGVuY29kZXIgPDwgbV9pc0NoYW5naW5nT2JzY3Vy ZWRJbnNldHNJbnRlcmFjdGl2ZWx5OwogICAgIGVuY29kZXIgPDwgbV9hbGxvd1Nocmlua1RvRml0 OwogICAgIGVuY29kZXIgPDwgbV9lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldzsKIH0K QEAgLTgwLDEyICs3OSwxMCBAQCBib29sIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm86OmRl Y29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIFZpc2libGVDb250ZW50UgogICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9zY2FsZSkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2luU3Rh YmxlU3RhdGUpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fdmlld1N0YWJpbGl0 eSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5tX2lzRmlyc3RVcGRhdGVGb3JOZXdWaWV3U2l6ZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX2lzQ2hhbmdpbmdPYnNjdXJlZEluc2V0 c0ludGVyYWN0aXZlbHkpKQotICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQubV9hbGxvd1Nocmlua1RvRml0KSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0Lm1fZW5jbG9zZWRJblNjcm9sbGFibGVB bmNlc3RvclZpZXcpKQpAQCAtMTAxLDYgKzk4LDE4IEBAIFN0cmluZyBWaXNpYmxlQ29udGVudFJl Y3RVcGRhdGVJbmZvOjpkdW1wKCkgY29uc3QKICAgICByZXR1cm4gc3RyZWFtLnJlbGVhc2UoKTsK IH0KIAorVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgVmlld1N0YWJpbGl0 eUZsYWcgc3RhYmlsaXR5RmxhZykKK3sKKyAgICBzd2l0Y2ggKHN0YWJpbGl0eUZsYWcpIHsKKyAg ICBjYXNlIFZpZXdTdGFiaWxpdHlGbGFnOjpTY3JvbGxWaWV3SW50ZXJhY3Rpbmc6IHRzIDw8ICJz Y3JvbGwgdmlldyBpbnRlcmFjdGluZyI7IGJyZWFrOworICAgIGNhc2UgVmlld1N0YWJpbGl0eUZs YWc6OlNjcm9sbFZpZXdBbmltYXRlZFNjcm9sbE9yWm9vbTogdHMgPDwgInNjcm9sbCB2aWV3IGFu aW1hdGVkIHNjcm9sbCBvciB6b29tIjsgYnJlYWs7CisgICAgY2FzZSBWaWV3U3RhYmlsaXR5Rmxh Zzo6U2Nyb2xsVmlld1J1YmJlckJhbmRpbmc6IHRzIDw8ICJzY3JvbGwgdmlldyBydWJiZXJiYW5k aW5nIjsgYnJlYWs7CisgICAgY2FzZSBWaWV3U3RhYmlsaXR5RmxhZzo6Q2hhbmdpbmdPYnNjdXJl ZEluc2V0c0ludGVyYWN0aXZlbHk6IHRzIDw8ICJjaGFuZ2luZyBvYnNjdXJlZCBpbnNldHMgaW50 ZXJhY3RpdmVseSI7IGJyZWFrOworICAgIGNhc2UgVmlld1N0YWJpbGl0eUZsYWc6OlVuc3RhYmxl Rm9yVGVzdGluZzogdHMgPDwgInVuc3RhYmxlIGZvciB0ZXN0aW5nIjsgYnJlYWs7CisgICAgfQor ICAgIHJldHVybiB0czsKK30KKwogVGV4dFN0cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0 cywgY29uc3QgVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyYgaW5mbykKIHsKICAgICBUZXh0 U3RyZWFtOjpHcm91cFNjb3BlIHNjb3BlKHRzKTsKQEAgLTExOSwxMCArMTI4LDggQEAgVGV4dFN0 cmVhbSYgb3BlcmF0b3I8PChUZXh0U3RyZWFtJiB0cywgY29uc3QgVmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlSW5mbyYgaW5mbykKICAgICB0cy5kdW1wUHJvcGVydHkoInVub2JzY3VyZWRTYWZlQXJl YUluc2V0cyIsIGluZm8udW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzKCkpOwogCiAgICAgdHMuZHVt cFByb3BlcnR5KCJzY2FsZSIsIGluZm8uc2NhbGUoKSk7Ci0gICAgdHMuZHVtcFByb3BlcnR5KCJp blN0YWJsZVN0YXRlIiwgaW5mby5pblN0YWJsZVN0YXRlKCkpOworICAgIHRzLmR1bXBQcm9wZXJ0 eSgidmlld1N0YWJpbGl0eSIsIGluZm8udmlld1N0YWJpbGl0eSgpKTsKICAgICB0cy5kdW1wUHJv cGVydHkoImlzRmlyc3RVcGRhdGVGb3JOZXdWaWV3U2l6ZSIsIGluZm8uaXNGaXJzdFVwZGF0ZUZv ck5ld1ZpZXdTaXplKCkpOwotICAgIGlmIChpbmZvLmlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0lu dGVyYWN0aXZlbHkoKSkKLSAgICAgICAgdHMuZHVtcFByb3BlcnR5KCJpc0NoYW5naW5nT2JzY3Vy ZWRJbnNldHNJbnRlcmFjdGl2ZWx5IiwgaW5mby5pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRl cmFjdGl2ZWx5KCkpOwogICAgIGlmIChpbmZvLmVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JW aWV3KCkpCiAgICAgICAgIHRzLmR1bXBQcm9wZXJ0eSgiZW5jbG9zZWRJblNjcm9sbGFibGVBbmNl c3RvclZpZXciLCBpbmZvLmVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3KCkpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJ bmZvLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv LmgKaW5kZXggOTY3ZjM0NDQ1ZWUzOThkOTQyZTk4YjRjY2EwYjM5NjAzNzg0MGY0Ni4uODBjZDEw ZjIwZTQ1NjYxN2NlMTY0ODQyMGEzNWQ0NzhiMDQ1OTA3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TaGFyZWQvVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mby5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL1Zpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8uaApAQCAtMzIsNiArMzIs NyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvTGVuZ3RoQm94Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9W ZWxvY2l0eURhdGEuaD4KICNpbmNsdWRlIDx3dGYvTW9ub3RvbmljVGltZS5oPgorI2luY2x1ZGUg PHd0Zi9PcHRpb25TZXQuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFt ZXNwYWNlIElQQyB7CkBAIC00NSwxMSArNDYsMTkgQEAgY2xhc3MgVGV4dFN0cmVhbTsKIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKK2VudW0gY2xhc3MgVmlld1N0YWJpbGl0eUZsYWcgOiB1aW50OF90 IHsKKyAgICBTY3JvbGxWaWV3SW50ZXJhY3RpbmcgICAgICAgICAgICAgICA9IDEgPDwgMCwgLy8g RHJhZ2dpbmcsIHpvb21pbmcsIGludGVycnVwdGluZyBkZWNlbGVyYXRpb24KKyAgICBTY3JvbGxW aWV3QW5pbWF0ZWRTY3JvbGxPclpvb20gICAgICA9IDEgPDwgMSwgLy8gRGVjZWxlcmF0aW5nLCBz Y3JvbGxpbmcgdG8gdG9wLCBhbmltYXRlZCB6b29tCisgICAgU2Nyb2xsVmlld1J1YmJlckJhbmRp bmcgICAgICAgICAgICAgPSAxIDw8IDIsCisgICAgQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVy YWN0aXZlbHkgPSAxIDw8IDMsCisgICAgVW5zdGFibGVGb3JUZXN0aW5nICAgICAgICAgICAgICAg ICAgPSAxIDw8IDQKK307CisKIGNsYXNzIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8gewog cHVibGljOgogICAgIFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8oKSA9IGRlZmF1bHQ7CiAK LSAgICBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVj dCYgZXhwb3NlZENvbnRlbnRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3Vy ZWRDb250ZW50UmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQmIGNvbnRlbnRJbnNl dHMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZFJlY3RJblNjcm9sbFZpZXdD b29yZGluYXRlcywgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiB1bm9ic2N1cmVkQ29udGVudFJl Y3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzLCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGxh eW91dFZpZXdwb3J0UmVjdCwgY29uc3QgV2ViQ29yZTo6RmxvYXRCb3hFeHRlbnQmIG9ic2N1cmVk SW5zZXRzLCBjb25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgdW5vYnNjdXJlZFNhZmVBcmVh SW5zZXRzLCBkb3VibGUgc2NhbGUsIGJvb2wgaW5TdGFibGVTdGF0ZSwgYm9vbCBpc0ZpcnN0VXBk YXRlRm9yTmV3Vmlld1NpemUsIGJvb2wgaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3Rp dmVseSwgYm9vbCBhbGxvd1Nocmlua1RvRml0LCBib29sIGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5j ZXN0b3JWaWV3LCBjb25zdCBXZWJDb3JlOjpWZWxvY2l0eURhdGEmIHNjcm9sbFZlbG9jaXR5LCBU cmFuc2FjdGlvbklEIGxhc3RMYXllclRyZWVUcmFuc2FjdGlvbklkKQorICAgIFZpc2libGVDb250 ZW50UmVjdFVwZGF0ZUluZm8oY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBleHBvc2VkQ29udGVu dFJlY3QsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0LCBj b25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgY29udGVudEluc2V0cywgY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0JiB1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzLCBjb25z dCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1 dFZpZXdCb3VuZHMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgbGF5b3V0Vmlld3BvcnRSZWN0 LCBjb25zdCBXZWJDb3JlOjpGbG9hdEJveEV4dGVudCYgb2JzY3VyZWRJbnNldHMsIGNvbnN0IFdl YkNvcmU6OkZsb2F0Qm94RXh0ZW50JiB1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHMsIGRvdWJsZSBz Y2FsZSwgT3B0aW9uU2V0PFZpZXdTdGFiaWxpdHlGbGFnPiB2aWV3U3RhYmlsaXR5LCBib29sIGlz Rmlyc3RVcGRhdGVGb3JOZXdWaWV3U2l6ZSwgYm9vbCBhbGxvd1Nocmlua1RvRml0LCBib29sIGVu Y2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3LCBjb25zdCBXZWJDb3JlOjpWZWxvY2l0eURh dGEmIHNjcm9sbFZlbG9jaXR5LCBUcmFuc2FjdGlvbklEIGxhc3RMYXllclRyZWVUcmFuc2FjdGlv bklkKQogICAgICAgICA6IG1fZXhwb3NlZENvbnRlbnRSZWN0KGV4cG9zZWRDb250ZW50UmVjdCkK ICAgICAgICAgLCBtX3Vub2JzY3VyZWRDb250ZW50UmVjdCh1bm9ic2N1cmVkQ29udGVudFJlY3Qp CiAgICAgICAgICwgbV9jb250ZW50SW5zZXRzKGNvbnRlbnRJbnNldHMpCkBAIC02MSw5ICs3MCw4 IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX3Njcm9sbFZlbG9jaXR5KHNjcm9sbFZlbG9jaXR5KQog ICAgICAgICAsIG1fbGFzdExheWVyVHJlZVRyYW5zYWN0aW9uSUQobGFzdExheWVyVHJlZVRyYW5z YWN0aW9uSWQpCiAgICAgICAgICwgbV9zY2FsZShzY2FsZSkKLSAgICAgICAgLCBtX2luU3RhYmxl U3RhdGUoaW5TdGFibGVTdGF0ZSkKKyAgICAgICAgLCBtX3ZpZXdTdGFiaWxpdHkodmlld1N0YWJp bGl0eSkKICAgICAgICAgLCBtX2lzRmlyc3RVcGRhdGVGb3JOZXdWaWV3U2l6ZShpc0ZpcnN0VXBk YXRlRm9yTmV3Vmlld1NpemUpCi0gICAgICAgICwgbV9pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJ bnRlcmFjdGl2ZWx5KGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkpCiAgICAg ICAgICwgbV9hbGxvd1Nocmlua1RvRml0KGFsbG93U2hyaW5rVG9GaXQpCiAgICAgICAgICwgbV9l bmNsb3NlZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldyhlbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2Vz dG9yVmlldykKICAgICB7CkBAIC04MCw5ICs4OCw5IEBAIHB1YmxpYzoKICAgICBjb25zdCBXZWJD b3JlOjpGbG9hdEJveEV4dGVudCYgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzKCkgY29uc3QgeyBy ZXR1cm4gbV91bm9ic2N1cmVkU2FmZUFyZWFJbnNldHM7IH0KIAogICAgIGRvdWJsZSBzY2FsZSgp IGNvbnN0IHsgcmV0dXJuIG1fc2NhbGU7IH0KLSAgICBib29sIGluU3RhYmxlU3RhdGUoKSBjb25z dCB7IHJldHVybiBtX2luU3RhYmxlU3RhdGU7IH0KKyAgICBib29sIGluU3RhYmxlU3RhdGUoKSBj b25zdCB7IHJldHVybiBtX3ZpZXdTdGFiaWxpdHkuaXNFbXB0eSgpOyB9CisgICAgT3B0aW9uU2V0 PFZpZXdTdGFiaWxpdHlGbGFnPiB2aWV3U3RhYmlsaXR5KCkgY29uc3QgeyByZXR1cm4gbV92aWV3 U3RhYmlsaXR5OyB9CiAgICAgYm9vbCBpc0ZpcnN0VXBkYXRlRm9yTmV3Vmlld1NpemUoKSBjb25z dCB7IHJldHVybiBtX2lzRmlyc3RVcGRhdGVGb3JOZXdWaWV3U2l6ZTsgfQotICAgIGJvb2wgaXND aGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseSgpIGNvbnN0IHsgcmV0dXJuIG1faXND aGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTsgfQogICAgIGJvb2wgYWxsb3dTaHJp bmtUb0ZpdCgpIGNvbnN0IHsgcmV0dXJuIG1fYWxsb3dTaHJpbmtUb0ZpdDsgfQogICAgIGJvb2wg ZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcoKSBjb25zdCB7IHJldHVybiBtX2VuY2xv c2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3OyB9CiAgICAgVHJhbnNhY3Rpb25JRCBsYXN0TGF5 ZXJUcmVlVHJhbnNhY3Rpb25JRCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdExheWVyVHJlZVRyYW5z YWN0aW9uSUQ7IH0KQEAgLTEwNiw5ICsxMTQsOCBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlZl bG9jaXR5RGF0YSBtX3Njcm9sbFZlbG9jaXR5OwogICAgIFRyYW5zYWN0aW9uSUQgbV9sYXN0TGF5 ZXJUcmVlVHJhbnNhY3Rpb25JRDsKICAgICBkb3VibGUgbV9zY2FsZSB7IC0xIH07Ci0gICAgYm9v bCBtX2luU3RhYmxlU3RhdGUgeyBmYWxzZSB9OworICAgIE9wdGlvblNldDxWaWV3U3RhYmlsaXR5 RmxhZz4gbV92aWV3U3RhYmlsaXR5OwogICAgIGJvb2wgbV9pc0ZpcnN0VXBkYXRlRm9yTmV3Vmll d1NpemUgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRl cmFjdGl2ZWx5IHsgZmFsc2UgfTsKICAgICBib29sIG1fYWxsb3dTaHJpbmtUb0ZpdCB7IGZhbHNl IH07CiAgICAgYm9vbCBtX2VuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3IHsgZmFsc2Ug fTsKIH07CkBAIC0xMjUsMTQgKzEzMiwzMCBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0 IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mIGEsIGNvbnN0IFZpc2libGVDb250ZQogICAg ICAgICAmJiBhLm9ic2N1cmVkSW5zZXRzKCkgPT0gYi5vYnNjdXJlZEluc2V0cygpCiAgICAgICAg ICYmIGEudW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzKCkgPT0gYi51bm9ic2N1cmVkU2FmZUFyZWFJ bnNldHMoKQogICAgICAgICAmJiBhLnNjcm9sbFZlbG9jaXR5KCkuZXF1YWxJZ25vcmluZ1RpbWVz dGFtcChiLnNjcm9sbFZlbG9jaXR5KCkpCi0gICAgICAgICYmIGEuaW5TdGFibGVTdGF0ZSgpID09 IGIuaW5TdGFibGVTdGF0ZSgpCisgICAgICAgICYmIGEudmlld1N0YWJpbGl0eSgpID09IGIudmll d1N0YWJpbGl0eSgpCiAgICAgICAgICYmIGEuaXNGaXJzdFVwZGF0ZUZvck5ld1ZpZXdTaXplKCkg PT0gYi5pc0ZpcnN0VXBkYXRlRm9yTmV3Vmlld1NpemUoKQogICAgICAgICAmJiBhLmFsbG93U2hy aW5rVG9GaXQoKSA9PSBiLmFsbG93U2hyaW5rVG9GaXQoKQogICAgICAgICAmJiBhLmVuY2xvc2Vk SW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3KCkgPT0gYi5lbmNsb3NlZEluU2Nyb2xsYWJsZUFuY2Vz dG9yVmlldygpOwogfQogCitXVEY6OlRleHRTdHJlYW0mIG9wZXJhdG9yPDwoV1RGOjpUZXh0U3Ry ZWFtJiwgVmlld1N0YWJpbGl0eUZsYWcpOwogV1RGOjpUZXh0U3RyZWFtJiBvcGVyYXRvcjw8KFdU Rjo6VGV4dFN0cmVhbSYsIGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUluZm8mKTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKK25hbWVzcGFjZSBXVEYgeworCit0ZW1wbGF0ZTw+IHN0 cnVjdCBFbnVtVHJhaXRzPFdlYktpdDo6Vmlld1N0YWJpbGl0eUZsYWc+IHsKKyAgICB1c2luZyB2 YWx1ZXMgPSBFbnVtVmFsdWVzPAorICAgICAgICBXZWJLaXQ6OlZpZXdTdGFiaWxpdHlGbGFnLAor ICAgICAgICBXZWJLaXQ6OlZpZXdTdGFiaWxpdHlGbGFnOjpTY3JvbGxWaWV3SW50ZXJhY3Rpbmcs CisgICAgICAgIFdlYktpdDo6Vmlld1N0YWJpbGl0eUZsYWc6OlNjcm9sbFZpZXdBbmltYXRlZFNj cm9sbE9yWm9vbSwKKyAgICAgICAgV2ViS2l0OjpWaWV3U3RhYmlsaXR5RmxhZzo6U2Nyb2xsVmll d1J1YmJlckJhbmRpbmcsCisgICAgICAgIFdlYktpdDo6Vmlld1N0YWJpbGl0eUZsYWc6OkNoYW5n aW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5LAorICAgICAgICBXZWJLaXQ6OlZpZXdTdGFi aWxpdHlGbGFnOjpVbnN0YWJsZUZvclRlc3RpbmcKKyAgICA+OworfTsKKworfSAvLyBuYW1lc3Bh Y2UgV1RGCisKICNlbmRpZiAvLyBFTkFCTEUoVUlfU0lERV9DT01QT1NJVElORykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgK aW5kZXggMTEzZmRiN2Y4NTc4N2YwZWE2NWYzYWY2NmZmMmEzNjhkN2EzYWRhOS4uYTc4NmM3YTY0 ODI2NGVmMDJjYzZjNjc2MTM0ZDIxNWI4YWM0YTNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgKQEAgLTIzMSw3ICsy MzEsNyBAQCBjbGFzcyBWaWV3R2VzdHVyZUNvbnRyb2xsZXI7CiAgICAgUmV0YWluUHRyPFdLUGFz c3dvcmRWaWV3PiBfcGFzc3dvcmRWaWV3OwogCiAgICAgQk9PTCBfaGFzU2NoZWR1bGVkVmlzaWJs ZVJlY3RVcGRhdGU7Ci0gICAgQk9PTCBfdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlU2NoZWR1bGVk RnJvbVNjcm9sbFZpZXdJblN0YWJsZVN0YXRlOworICAgIE9wdGlvblNldDxXZWJLaXQ6OlZpZXdT dGFiaWxpdHlGbGFnPiBfdmlld1N0YWJpbGl0eVdoZW5WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVT Y2hlZHVsZWQ7CiAKICAgICBPcHRpb25hbDxXZWJDb3JlOjpXaGVlbFNjcm9sbEdlc3R1cmVTdGF0 ZT4gX2N1cnJlbnRTY3JvbGxHZXN0dXJlU3RhdGU7CiAgICAgdWludDY0X3QgX3doZWVsRXZlbnRD b3VudEluQ3VycmVudFNjcm9sbEdlc3R1cmU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCmluZGV4IDkxNGRkNjUxNTRkMThlODNmZjhhZGNiMDEy MWYwZjllNWIyNDFhYzYuLjIxMzRkYWU3NGQyMGNhMjNkOTc1OTE1ODYxYjIxZmVlYTEzMzY3OWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9T Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t CkBAIC03MDEsNyArNzAxLDcgQEAgLSAodm9pZClfZGlkUmVsYXVuY2hQcm9jZXNzCiB7CiAgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgLVtXS1dlYlZpZXcgX2RpZFJlbGF1bmNoUHJvY2Vz c10iLCBzZWxmKTsKICAgICBfaGFzU2NoZWR1bGVkVmlzaWJsZVJlY3RVcGRhdGUgPSBOTzsKLSAg ICBfdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlU2NoZWR1bGVkRnJvbVNjcm9sbFZpZXdJblN0YWJs ZVN0YXRlID0gWUVTOworICAgIF92aWV3U3RhYmlsaXR5V2hlblZpc2libGVDb250ZW50UmVjdFVw ZGF0ZVNjaGVkdWxlZCA9IHsgfTsKICAgICBpZiAoX2dlc3R1cmVDb250cm9sbGVyKQogICAgICAg ICBfZ2VzdHVyZUNvbnRyb2xsZXItPmNvbm5lY3RUb1Byb2Nlc3MoKTsKIH0KQEAgLTE4ODgsMTIg KzE4ODgsMTIgQEAgLSAoQ0dSZWN0KV9jb250ZW50UmVjdEZvclVzZXJJbnRlcmFjdGlvbgogfQog CiAvLyBJZGVhbGx5IFVJU2Nyb2xsVmlldyB3b3VsZCBleHBvc2UgdGhpcyBmb3IgdXM6IDxyZGFy Oi8vcHJvYmxlbS8yMTM5NDU2Nz4uCi0tIChCT09MKV9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5n CistIChCT09MKV9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nOihVSVNjcm9sbFZpZXcgKilzY3Jv bGxWaWV3CiB7CiAgICAgZmxvYXQgZGV2aWNlU2NhbGVGYWN0b3IgPSBfcGFnZS0+ZGV2aWNlU2Nh bGVGYWN0b3IoKTsKIAotICAgIENHUG9pbnQgY29udGVudE9mZnNldCA9IFtfc2Nyb2xsVmlldyBj b250ZW50T2Zmc2V0XTsKLSAgICBDR1BvaW50IGJvdW5kZWRPZmZzZXQgPSBjb250ZW50T2Zmc2V0 Qm91bmRlZEluVmFsaWRSYW5nZShfc2Nyb2xsVmlldy5nZXQoKSwgY29udGVudE9mZnNldCk7Cisg ICAgQ0dQb2ludCBjb250ZW50T2Zmc2V0ID0gW3Njcm9sbFZpZXcgY29udGVudE9mZnNldF07Cisg ICAgQ0dQb2ludCBib3VuZGVkT2Zmc2V0ID0gY29udGVudE9mZnNldEJvdW5kZWRJblZhbGlkUmFu Z2Uoc2Nyb2xsVmlldywgY29udGVudE9mZnNldCk7CiAgICAgcmV0dXJuICFwb2ludHNFcXVhbElu RGV2aWNlUGl4ZWxzKGNvbnRlbnRPZmZzZXQsIGJvdW5kZWRPZmZzZXQsIGRldmljZVNjYWxlRmFj dG9yKTsKIH0KIApAQCAtMTkyMCwyMyArMTkyMCwzMCBAQCAtICh2b2lkKV9zY2hlZHVsZUZvcmNl ZFZpc2libGVDb250ZW50UmVjdFVwZGF0ZQogICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250 ZW50UmVjdFVwZGF0ZV07CiB9CiAKLS0gKEJPT0wpX3Njcm9sbFZpZXdJc0luU3RhYmxlU3RhdGU6 KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKKy0gKE9wdGlvblNldDxXZWJLaXQ6OlZpZXdTdGFi aWxpdHlGbGFnPilfdmlld1N0YWJpbGl0eVN0YXRlOihVSVNjcm9sbFZpZXcgKilzY3JvbGxWaWV3 CiB7Ci0gICAgQk9PTCBpc1N0YWJsZVN0YXRlID0gIShbc2Nyb2xsVmlldyBpc0RyYWdnaW5nXSB8 fCBbc2Nyb2xsVmlldyBpc0RlY2VsZXJhdGluZ10gfHwgW3Njcm9sbFZpZXcgaXNab29taW5nXSB8 fCBbc2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSB8fCBbc2Nyb2xsVmlldyBfaXNTY3JvbGxp bmdUb1RvcF0pOworICAgIE9wdGlvblNldDxXZWJLaXQ6OlZpZXdTdGFiaWxpdHlGbGFnPiBzdGFi aWxpdHlGbGFnczsKKworICAgIGlmIChzY3JvbGxWaWV3LmlzRHJhZ2dpbmcgfHwgc2Nyb2xsVmll dy5pc1pvb21pbmcgfHwgc2Nyb2xsVmlldy5faXNJbnRlcnJ1cHRpbmdEZWNlbGVyYXRpb24pCisg ICAgICAgIHN0YWJpbGl0eUZsYWdzLmFkZChXZWJLaXQ6OlZpZXdTdGFiaWxpdHlGbGFnOjpTY3Jv bGxWaWV3SW50ZXJhY3RpbmcpOwogCi0gICAgaWYgKGlzU3RhYmxlU3RhdGUgJiYgc2Nyb2xsVmll dyA9PSBfc2Nyb2xsVmlldy5nZXQoKSkKLSAgICAgICAgaXNTdGFibGVTdGF0ZSA9ICFfaXNDaGFu Z2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTsKKyAgICBpZiAoc2Nyb2xsVmlldy5pc0Rl Y2VsZXJhdGluZyB8fCBzY3JvbGxWaWV3Ll9pc0FuaW1hdGluZ1pvb20gfHwgc2Nyb2xsVmlldy5f aXNTY3JvbGxpbmdUb1RvcCkKKyAgICAgICAgc3RhYmlsaXR5RmxhZ3MuYWRkKFdlYktpdDo6Vmll d1N0YWJpbGl0eUZsYWc6OlNjcm9sbFZpZXdBbmltYXRlZFNjcm9sbE9yWm9vbSk7CiAKLSAgICBp ZiAoaXNTdGFibGVTdGF0ZSAmJiBzY3JvbGxWaWV3ID09IF9zY3JvbGxWaWV3LmdldCgpKQotICAg ICAgICBpc1N0YWJsZVN0YXRlID0gIVtzZWxmIF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nXTsK KyAgICBpZiAoc2Nyb2xsVmlldyA9PSBfc2Nyb2xsVmlldy5nZXQoKSAmJiBfaXNDaGFuZ2luZ09i c2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseSkKKyAgICAgICAgc3RhYmlsaXR5RmxhZ3MuYWRkKFdl YktpdDo6Vmlld1N0YWJpbGl0eUZsYWc6OkNoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2 ZWx5KTsKIAotICAgIGlmIChpc1N0YWJsZVN0YXRlKQotICAgICAgICBpc1N0YWJsZVN0YXRlID0g IXNjcm9sbFZpZXcuX2lzSW50ZXJydXB0aW5nRGVjZWxlcmF0aW9uOworICAgIGlmIChbc2VsZiBf c2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZzpzY3JvbGxWaWV3XSkKKyAgICAgICAgc3RhYmlsaXR5 RmxhZ3MuYWRkKFdlYktpdDo6Vmlld1N0YWJpbGl0eUZsYWc6OlNjcm9sbFZpZXdSdWJiZXJCYW5k aW5nKTsKIAotICAgIGlmIChOU051bWJlciAqc3RhYmxlT3ZlcnJpZGUgPSBzZWxmLl9zdGFibGVT dGF0ZU92ZXJyaWRlKQotICAgICAgICBpc1N0YWJsZVN0YXRlID0gc3RhYmxlT3ZlcnJpZGUuYm9v bFZhbHVlOworICAgIGlmIChOU051bWJlciAqc3RhYmxlT3ZlcnJpZGUgPSBzZWxmLl9zdGFibGVT dGF0ZU92ZXJyaWRlKSB7CisgICAgICAgIGlmIChzdGFibGVPdmVycmlkZS5ib29sVmFsdWUpCisg ICAgICAgICAgICBzdGFiaWxpdHlGbGFncyA9IHsgfTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgc3RhYmlsaXR5RmxhZ3MuYWRkKFdlYktpdDo6Vmlld1N0YWJpbGl0eUZsYWc6OlVuc3RhYmxl Rm9yVGVzdGluZyk7CisgICAgfQogCi0gICAgcmV0dXJuIGlzU3RhYmxlU3RhdGU7CisgICAgcmV0 dXJuIHN0YWJpbGl0eUZsYWdzOwogfQogCiAtICh2b2lkKV9hZGRVcGRhdGVWaXNpYmxlQ29udGVu dFJlY3RQcmVDb21taXRIYW5kbGVyCkBAIC0xOTYwLDcgKzE5NjcsNyBAQCAtICh2b2lkKV9hZGRV cGRhdGVWaXNpYmxlQ29udGVudFJlY3RQcmVDb21taXRIYW5kbGVyCiAKIC0gKHZvaWQpX3NjaGVk dWxlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlQWZ0ZXJTY3JvbGxJblZpZXc6KFVJU2Nyb2xsVmll dyAqKXNjcm9sbFZpZXcKIHsKLSAgICBfdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlU2NoZWR1bGVk RnJvbVNjcm9sbFZpZXdJblN0YWJsZVN0YXRlID0gW3NlbGYgX3Njcm9sbFZpZXdJc0luU3RhYmxl U3RhdGU6c2Nyb2xsVmlld107CisgICAgX3ZpZXdTdGFiaWxpdHlXaGVuVmlzaWJsZUNvbnRlbnRS ZWN0VXBkYXRlU2NoZWR1bGVkID0gW3NlbGYgX3ZpZXdTdGFiaWxpdHlTdGF0ZTpzY3JvbGxWaWV3 XTsKIAogICAgIGlmIChfaGFzU2NoZWR1bGVkVmlzaWJsZVJlY3RVcGRhdGUpIHsKICAgICAgICAg YXV0byB0aW1lTm93ID0gTW9ub3RvbmljVGltZTo6bm93KCk7CkBAIC0yMDU0LDcgKzIwNjEsNyBA QCAtIChVSUVkZ2VJbnNldHMpY3VycmVudGx5VmlzaWJsZUNvbnRlbnRJbnNldHNXaXRoU2NhbGU6 KENHRmxvYXQpc2NhbGVGYWN0b3Igb2JzYwogCiAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzCiB7Ci0gICAgQk9PTCBpblN0YWJsZVN0YXRlID0gX3Zpc2libGVDb250ZW50UmVjdFVw ZGF0ZVNjaGVkdWxlZEZyb21TY3JvbGxWaWV3SW5TdGFibGVTdGF0ZTsKKyAgICBhdXRvIHZpZXdT dGFiaWxpdHkgPSBfdmlld1N0YWJpbGl0eVdoZW5WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVTY2hl ZHVsZWQ7CiAKICAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3XSkgewogICAg ICAgICBbX3Bhc3N3b3JkVmlldyBzZXRGcmFtZTpzZWxmLmJvdW5kc107CkBAIC0yMTEwLDcgKzIx MTcsNyBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgYXV0byBjb250 ZW50SW5zZXRzID0gW3NlbGYgY3VycmVudGx5VmlzaWJsZUNvbnRlbnRJbnNldHNXaXRoU2NhbGU6 c2NhbGVGYWN0b3Igb2JzY3VyZWRJbnNldHM6Y29tcHV0ZWRDb250ZW50SW5zZXRVbmFkanVzdGVk Rm9yS2V5Ym9hcmRdOwogCiAjaWYgRU5BQkxFKENTU19TQ1JPTExfU05BUCkgJiYgRU5BQkxFKEFT WU5DX1NDUk9MTElORykKLSAgICBpZiAoaW5TdGFibGVTdGF0ZSkgeworICAgIGlmICh2aWV3U3Rh YmlsaXR5LmlzRW1wdHkoKSkgewogICAgICAgICBXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3Jk aW5hdG9yUHJveHkqIGNvb3JkaW5hdG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJv eHkoKTsKICAgICAgICAgaWYgKGNvb3JkaW5hdG9yICYmIGNvb3JkaW5hdG9yLT5oYXNBY3RpdmVT bmFwUG9pbnQoKSkgewogICAgICAgICAgICAgQ0dQb2ludCBjdXJyZW50UG9pbnQgPSBbX3Njcm9s bFZpZXcgY29udGVudE9mZnNldF07CkBAIC0yMTM0LDggKzIxNDEsNyBAQCAtICh2b2lkKV91cGRh dGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIHVub2JzY3VyZWRTYWZlQXJlYUluc2V0czpb c2VsZiBfY29tcHV0ZWRVbm9ic2N1cmVkU2FmZUFyZWFJbnNldF0KICAgICAgICAgaW5wdXRWaWV3 Qm91bmRzOl9pbnB1dFZpZXdCb3VuZHMKICAgICAgICAgc2NhbGU6c2NhbGVGYWN0b3IgbWluaW11 bVNjYWxlOltfc2Nyb2xsVmlldyBtaW5pbXVtWm9vbVNjYWxlXQotICAgICAgICBpblN0YWJsZVN0 YXRlOmluU3RhYmxlU3RhdGUKLSAgICAgICAgaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJh Y3RpdmVseTpfaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseQorICAgICAgICB2 aWV3U3RhYmlsaXR5OnZpZXdTdGFiaWxpdHkKICAgICAgICAgZW5jbG9zZWRJblNjcm9sbGFibGVB bmNlc3RvclZpZXc6c2Nyb2xsVmlld0NhblNjcm9sbChbc2VsZiBfc2Nyb2xsZXJdKQogICAgICAg ICBzZW5kRXZlbklmVW5jaGFuZ2VkOl9hbHdheXNTZW5kTmV4dFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZV07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5oCmlu ZGV4IDUzOTE5ZTFhMWRkNDZkNzlhOGI0MWQ3ZDJmM2IzMGMwOTQ0NzI5ODUuLmE1YzRhNDMxZTQ2 NjI1MzZmNzE5YTZhOWJiNGM0ZjU2ODMyMjBhOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXcuaApAQCAtNTEsNiArNTEsNyBAQCBjbGFzcyBXZWJGcmFtZVBy b3h5OwogY2xhc3MgV2ViUGFnZVByb3h5OwogY2xhc3MgV2ViUHJvY2Vzc1Byb3h5OwogY2xhc3Mg V2ViUHJvY2Vzc1Bvb2w7CitlbnVtIGNsYXNzIFZpZXdTdGFiaWxpdHlGbGFnIDogdWludDhfdDsK IH0KIAogQGludGVyZmFjZSBXS0NvbnRlbnRWaWV3IDogV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tp bmdWaWV3IHsKQEAgLTgxLDggKzgyLDcgQEAgY2xhc3MgV2ViUHJvY2Vzc1Bvb2w7CiAgICAgdW5v YnNjdXJlZFNhZmVBcmVhSW5zZXRzOihVSUVkZ2VJbnNldHMpdW5vYnNjdXJlZFNhZmVBcmVhSW5z ZXRzCiAgICAgaW5wdXRWaWV3Qm91bmRzOihDR1JlY3QpaW5wdXRWaWV3Qm91bmRzCiAgICAgc2Nh bGU6KENHRmxvYXQpc2NhbGUgbWluaW11bVNjYWxlOihDR0Zsb2F0KW1pbmltdW1TY2FsZQotICAg IGluU3RhYmxlU3RhdGU6KEJPT0wpaXNTdGFibGVTdGF0ZQotICAgIGlzQ2hhbmdpbmdPYnNjdXJl ZEluc2V0c0ludGVyYWN0aXZlbHk6KEJPT0wpaXNDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJh Y3RpdmVseQorICAgIHZpZXdTdGFiaWxpdHk6KE9wdGlvblNldDxXZWJLaXQ6OlZpZXdTdGFiaWxp dHlGbGFnPil2aWV3U3RhYmlsaXR5CiAgICAgZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZp ZXc6KEJPT0wpZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcKICAgICBzZW5kRXZlbklm VW5jaGFuZ2VkOihCT09MKXNlbmRFdmVuSWZVbmNoYW5nZWQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KaW5kZXggZDMxYjYzZWEwYjBlNDFiNGIyODE2 ZjQwZmYyMmM2MWYyNzVjM2IwMi4uOTY5NzAwN2JhMWM4ZWYwMDkzYTRjYzJlYzkwMTk1YTVkYmQ3 NTg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0K QEAgLTQzNiw4ICs0MzYsNyBAQCAtICh2b2lkKWRpZFVwZGF0ZVZpc2libGVSZWN0OihDR1JlY3Qp dmlzaWJsZUNvbnRlbnRSZWN0CiAgICAgdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzOihVSUVkZ2VJ bnNldHMpdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzCiAgICAgaW5wdXRWaWV3Qm91bmRzOihDR1Jl Y3QpaW5wdXRWaWV3Qm91bmRzCiAgICAgc2NhbGU6KENHRmxvYXQpem9vbVNjYWxlIG1pbmltdW1T Y2FsZTooQ0dGbG9hdCltaW5pbXVtU2NhbGUKLSAgICBpblN0YWJsZVN0YXRlOihCT09MKWlzU3Rh YmxlU3RhdGUKLSAgICBpc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5OihCT09M KWlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkKKyAgICB2aWV3U3RhYmlsaXR5 OihPcHRpb25TZXQ8V2ViS2l0OjpWaWV3U3RhYmlsaXR5RmxhZz4pdmlld1N0YWJpbGl0eQogICAg IGVuY2xvc2VkSW5TY3JvbGxhYmxlQW5jZXN0b3JWaWV3OihCT09MKWVuY2xvc2VkSW5TY3JvbGxh YmxlQW5jZXN0b3JWaWV3CiAgICAgc2VuZEV2ZW5JZlVuY2hhbmdlZDooQk9PTClzZW5kRXZlbklm VW5jaGFuZ2VkCiB7CkBAIC00NDcsNyArNDQ2LDggQEAgLSAodm9pZClkaWRVcGRhdGVWaXNpYmxl UmVjdDooQ0dSZWN0KXZpc2libGVDb250ZW50UmVjdAogCiAgICAgTW9ub3RvbmljVGltZSB0aW1l c3RhbXAgPSBNb25vdG9uaWNUaW1lOjpub3coKTsKICAgICBXZWJDb3JlOjpWZWxvY2l0eURhdGEg dmVsb2NpdHlEYXRhOwotICAgIGlmICghaXNTdGFibGVTdGF0ZSkKKyAgICBib29sIGluU3RhYmxl U3RhdGUgPSB2aWV3U3RhYmlsaXR5LmlzRW1wdHkoKTsKKyAgICBpZiAoIWluU3RhYmxlU3RhdGUp CiAgICAgICAgIHZlbG9jaXR5RGF0YSA9IF9oaXN0b3JpY2FsS2luZW1hdGljRGF0YS52ZWxvY2l0 eUZvck5ld0RhdGEodmlzaWJsZUNvbnRlbnRSZWN0Lm9yaWdpbiwgem9vbVNjYWxlLCB0aW1lc3Rh bXApOwogICAgIGVsc2UgewogICAgICAgICBfaGlzdG9yaWNhbEtpbmVtYXRpY0RhdGEuY2xlYXIo KTsKQEAgLTQ2Nyw5ICs0NjcsOCBAQCAtICh2b2lkKWRpZFVwZGF0ZVZpc2libGVSZWN0OihDR1Jl Y3QpdmlzaWJsZUNvbnRlbnRSZWN0CiAgICAgICAgIGZsb2F0Qm94RXh0ZW50KG9ic2N1cmVkSW5z ZXRzKSwKICAgICAgICAgZmxvYXRCb3hFeHRlbnQodW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzKSwK ICAgICAgICAgem9vbVNjYWxlLAotICAgICAgICBpc1N0YWJsZVN0YXRlLAorICAgICAgICB2aWV3 U3RhYmlsaXR5LAogICAgICAgICBfc2l6ZUNoYW5nZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJl Y3RVcGRhdGUsCi0gICAgICAgIGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHks CiAgICAgICAgIHNlbGYud2ViVmlldy5fYWxsb3dzVmlld3BvcnRTaHJpbmtUb0ZpdCwKICAgICAg ICAgZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXcsCiAgICAgICAgIHZlbG9jaXR5RGF0 YSwKQEAgLTQ5MCw3ICs0ODksNyBAQCAtICh2b2lkKWRpZFVwZGF0ZVZpc2libGVSZWN0OihDR1Jl Y3QpdmlzaWJsZUNvbnRlbnRSZWN0CiAgICAgCiAgICAgW3NlbGYgdXBkYXRlRml4ZWRDbGlwcGlu Z1ZpZXc6bGF5b3V0Vmlld3BvcnRdOwogCi0gICAgaWYgKHdhc1N0YWJsZVN0YXRlICYmICFpc1N0 YWJsZVN0YXRlKQorICAgIGlmICh3YXNTdGFibGVTdGF0ZSAmJiAhaW5TdGFibGVTdGF0ZSkKICAg ICAgICAgW3NlbGYgX2RpZEV4aXRTdGFibGVTdGF0ZV07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggOThkM2Y3OTEz YjJjYjExYTc2NGY0ZjE5MzIwMWZjMzZlYjdlZGFmMy4uMjAxOWM5ZGUyYTIyN2E0ZDcwYThhZmNj ZjI1ZmE1YmM1NWIxOGFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTM5MjAsMTQgKzM5MjAsMTUgQEAgdm9pZCBXZWJQ YWdlOjp1cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKGNvbnN0IFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZUluZm8mIHZpc2kKICAgICAgICAgZnJhbWVWaWV3LmxheW91dE9yVmlzdWFsVmlld3BvcnRD aGFuZ2VkKCk7CiAgICAgfQogCi0gICAgaWYgKCF2aXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZv LmlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkoKSkKKyAgICBib29sIGlzQ2hh bmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkgPSB2aXNpYmxlQ29udGVudFJlY3RVcGRh dGVJbmZvLnZpZXdTdGFiaWxpdHkoKS5jb250YWlucyhWaWV3U3RhYmlsaXR5RmxhZzo6Q2hhbmdp bmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkpOworICAgIGlmICghaXNDaGFuZ2luZ09ic2N1 cmVkSW5zZXRzSW50ZXJhY3RpdmVseSkKICAgICAgICAgZnJhbWVWaWV3LnNldEN1c3RvbVNpemVG b3JSZXNpemVFdmVudChleHBhbmRlZEludFNpemUodmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5m by51bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3JkaW5hdGVzKCkuc2l6ZSgpKSk7CiAKICAg ICBpZiAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IqIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gdGhpcy0+ c2Nyb2xsaW5nQ29vcmRpbmF0b3IoKSkgewogICAgICAgICBWaWV3cG9ydFJlY3RTdGFiaWxpdHkg dmlld3BvcnRTdGFiaWxpdHkgPSBWaWV3cG9ydFJlY3RTdGFiaWxpdHk6OlN0YWJsZTsKICAgICAg ICAgU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbiBsYXllckFjdGlvbiA9IFNjcm9sbGluZ0xh eWVyUG9zaXRpb25BY3Rpb246OlN5bmM7CiAgICAgICAgIAotICAgICAgICBpZiAodmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlSW5mby5pc0NoYW5naW5nT2JzY3VyZWRJbnNldHNJbnRlcmFjdGl2ZWx5 KCkpIHsKKyAgICAgICAgaWYgKGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHkp IHsKICAgICAgICAgICAgIHZpZXdwb3J0U3RhYmlsaXR5ID0gVmlld3BvcnRSZWN0U3RhYmlsaXR5 OjpDaGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTsKICAgICAgICAgICAgIGxheWVy QWN0aW9uID0gU2Nyb2xsaW5nTGF5ZXJQb3NpdGlvbkFjdGlvbjo6U2V0QXBwcm94aW1hdGU7CiAg ICAgICAgIH0gZWxzZSBpZiAoIW1faXNJblN0YWJsZVN0YXRlKSB7Cg==