179399 2017-11-07 15:23:35 -0800 [LayoutState cleanup] Rename enable/disableLayoutState 2017-11-07 16:29:38 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1369244 0 zalan 2017-11-07 15:23:35 -0800 it only enables/disables paint offset caching. 1369246 1 webkit-bug-importer 2017-11-07 15:24:08 -0800 <rdar://problem/35400245> 1369250 2 326270 zalan 2017-11-07 15:30:36 -0800 Created attachment 326270 Patch 1369269 3 326270 commit-queue 2017-11-07 16:29:36 -0800 Comment on attachment 326270 Patch Clearing flags on attachment: 326270 Committed r224559: <https://trac.webkit.org/changeset/224559> 1369270 4 commit-queue 2017-11-07 16:29:38 -0800 All reviewed patches have been landed. Closing bug. 326270 2017-11-07 15:30:36 -0800 2017-11-07 16:29:36 -0800 Patch bug-179399-20171107153036.patch text/plain 17368 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ3ZjNiNWJiZTMzZDU4 ZTJlOGY3ZjhhNTA2YzlkZmU0ZDU1N2QyYS4uNzc4ZWQzNjViODI1Y2E0YjIwNjk3ZTA5NWM5MTdi Njg5OTUxNzUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDE3LTExLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFN0YXRlIGNsZWFu dXBdIFJlbmFtZSBlbmFibGUvZGlzYWJsZUxheW91dFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzkzOTkKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzM1NDAwMjQ1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEl0IG9ubHkgZW5hYmxlcy9kaXNhYmxlcyBwYWludCBvZmZzZXQgY2FjaGluZy4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHBhZ2UvTGF5 b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRDb250ZXh0OjpwdXNoTGF5 b3V0U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Q29udGV4dDo6Y2hlY2tMYXlvdXRT dGF0ZSk6CisgICAgICAgICogcGFnZS9MYXlvdXRDb250ZXh0Lmg6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXRDb250ZXh0Ojppc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVkIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dENvbnRleHQ6OmRpc2FibGVQYWludE9mZnNldENhY2hlKToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dENvbnRleHQ6OmVuYWJsZVBhaW50T2Zmc2V0Q2FjaGUpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Q29udGV4dDo6bGF5b3V0U3RhdGVFbmFibGVkIGNvbnN0 KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dENvbnRleHQ6OmRpc2FibGVMYXlv dXRTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRDb250ZXh0OjplbmFi bGVMYXlvdXRTdGF0ZSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL0xheW91dFN0YXRl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlTWFpbnRhaW5lcjo6TGF5b3V0U3Rh dGVNYWludGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlTWFpbnRhaW5lcjo6 cHVzaCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZU1haW50YWluZXI6OnBvcCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZURpc2FibGVyOjpMYXlvdXRTdGF0ZURpc2FibGVy KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFN0YXRlRGlzYWJsZXI6On5MYXlvdXRTdGF0ZURp c2FibGVyKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZERpc2FibGVQYWludE9mZnNldENhY2hl Rm9yU3VidHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFp bmVyOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlN1 YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXI6On5TdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVy KToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZERpc2FibGVMYXlvdXRTdGF0ZUZvclN1YnRyZWUp OiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9MYXlvdXRTdGF0ZS5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpt YXBMb2NhbFRvQ29udGFpbmVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6 Y29tcHV0ZVJlY3RGb3JSZXBhaW50IGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy SW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklubGluZTo6Y2xpcHBlZE92ZXJm bG93UmVjdEZvclJlcGFpbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySW5saW5l Ojpjb21wdXRlUmVjdEZvclJlcGFpbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy SW5saW5lOjptYXBMb2NhbFRvQ29udGFpbmVyIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUxh eWVyUG9zaXRpb25zKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlQ2VsbDo6Y29tcHV0ZVJlY3RGb3JSZXBhaW50 IGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdDb250YWluZXI6OmxheW91dCk6CisgICAgICAg ICogcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdGb3JlaWduT2JqZWN0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclNWR0ZvcmVpZ25PYmplY3Q6OmxheW91dCk6CisKIDIwMTctMTEtMDcgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGF5b3V0U3RhdGUgY2xl YW51cF0gUmVtb3ZlIGV4cGxpY2l0IExheW91dFN0YXRlTWFpbnRhaW5lcjo6cG9wIGNhbGxzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvTGF5b3V0Q29udGV4dC5jcHAKaW5kZXggN2U4YTFjNGM1Mjc1ZWVjYjcz YzEwODBhNTM4ZGIzOTM5MzFmYTYxNS4uZGYxMTg1YzEzOGVjN2MyMTY3NzU4NDViMTcxNjdmY2Qw YmVkYmM0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dENvbnRleHQuY3BwCkBAIC01NTgsNyAr NTU4LDcgQEAgYm9vbCBMYXlvdXRDb250ZXh0OjpsYXlvdXREZWx0YU1hdGNoZXMoY29uc3QgTGF5 b3V0U2l6ZSYgZGVsdGEpCiAgICAgCiB2b2lkIExheW91dENvbnRleHQ6OnB1c2hMYXlvdXRTdGF0 ZShSZW5kZXJFbGVtZW50JiByb290KQogewotICAgIEFTU0VSVCghbV9sYXlvdXRTdGF0ZURpc2Fi bGVDb3VudCk7CisgICAgQVNTRVJUKCFtX3BhaW50T2Zmc2V0Q2FjaGVEaXNhYmxlQ291bnQpOwog ICAgIEFTU0VSVCghbV9sYXlvdXRTdGF0ZSk7CiAKICAgICBtX2xheW91dFN0YXRlID0gc3RkOjpt YWtlX3VuaXF1ZTxMYXlvdXRTdGF0ZT4ocm9vdCk7CkBAIC02MDAsNyArNjAwLDcgQEAgdm9pZCBM YXlvdXRDb250ZXh0Ojpwb3BMYXlvdXRTdGF0ZSgpCiB2b2lkIExheW91dENvbnRleHQ6OmNoZWNr TGF5b3V0U3RhdGUoKQogewogICAgIEFTU0VSVChsYXlvdXREZWx0YU1hdGNoZXMoTGF5b3V0U2l6 ZSgpKSk7Ci0gICAgQVNTRVJUKCFtX2xheW91dFN0YXRlRGlzYWJsZUNvdW50KTsKKyAgICBBU1NF UlQoIW1fcGFpbnRPZmZzZXRDYWNoZURpc2FibGVDb3VudCk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9MYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0xheW91dENvbnRleHQuaAppbmRleCAyN2Y0NDRkOTY2OGUzNjBjNTFjZGY0OTJmMDM5 ZGI5ZDk3MGRiNTVjLi42MWEzNmUzN2Q2MjNiZWM4ODRmZjQxMWM0ODMzYTM3ZTMxNzJjNWY0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0xheW91dENvbnRleHQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0xheW91dENvbnRleHQuaApAQCAtOTQsNyArOTQsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBwb3BMYXlvdXRTdGF0ZShSZW5kZXJPYmplY3QmKTsKICAgICBMYXlvdXRTdGF0 ZSogbGF5b3V0U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX2xheW91dFN0YXRlLmdldCgpOyB9CiAg ICAgLy8gUmV0dXJucyB0cnVlIGlmIGxheW91dFN0YXRlIHNob3VsZCBiZSB1c2VkIGZvciBpdHMg Y2FjaGVkIG9mZnNldCBhbmQgY2xpcC4KLSAgICBib29sIGxheW91dFN0YXRlRW5hYmxlZCgpIGNv bnN0IHsgcmV0dXJuICFtX2xheW91dFN0YXRlRGlzYWJsZUNvdW50ICYmIG1fbGF5b3V0U3RhdGU7 IH0KKyAgICBib29sIGlzUGFpbnRPZmZzZXRDYWNoZUVuYWJsZWQoKSBjb25zdCB7IHJldHVybiAh bV9wYWludE9mZnNldENhY2hlRGlzYWJsZUNvdW50ICYmIG1fbGF5b3V0U3RhdGU7IH0KICNpZm5k ZWYgTkRFQlVHCiAgICAgdm9pZCBjaGVja0xheW91dFN0YXRlKCk7CiAjZW5kaWYKQEAgLTE0MSw4 ICsxNDEsOCBAQCBwcml2YXRlOgogICAgIC8vIHRoYXQgY2FuIHRyaWdnZXIgcmVwYWludCBvZiBh IG5vbi1jaGlsZCAoZS5nLiB3aGVuIGEgbGlzdCBpdGVtIG1vdmVzIGl0cyBsaXN0IG1hcmtlciBh cm91bmQpLgogICAgIC8vIE5vdGUgdGhhdCBldmVuIHdoZW4gZGlzYWJsZWQsIExheW91dFN0YXRl IGlzIHN0aWxsIHVzZWQgdG8gc3RvcmUgbGF5b3V0RGVsdGEuCiAgICAgLy8gVGhlc2UgZnVuY3Rp b25zIG1heSBvbmx5IGJlIGFjY2Vzc2VkIGJ5IExheW91dFN0YXRlTWFpbnRhaW5lciBvciBMYXlv dXRTdGF0ZURpc2FibGVyLgotICAgIHZvaWQgZGlzYWJsZUxheW91dFN0YXRlKCkgeyBtX2xheW91 dFN0YXRlRGlzYWJsZUNvdW50Kys7IH0KLSAgICB2b2lkIGVuYWJsZUxheW91dFN0YXRlKCkgeyBB U1NFUlQobV9sYXlvdXRTdGF0ZURpc2FibGVDb3VudCA+IDApOyBtX2xheW91dFN0YXRlRGlzYWJs ZUNvdW50LS07IH0KKyAgICB2b2lkIGRpc2FibGVQYWludE9mZnNldENhY2hlKCkgeyBtX3BhaW50 T2Zmc2V0Q2FjaGVEaXNhYmxlQ291bnQrKzsgfQorICAgIHZvaWQgZW5hYmxlUGFpbnRPZmZzZXRD YWNoZSgpIHsgQVNTRVJUKG1fcGFpbnRPZmZzZXRDYWNoZURpc2FibGVDb3VudCA+IDApOyBtX3Bh aW50T2Zmc2V0Q2FjaGVEaXNhYmxlQ291bnQtLTsgfQogCiAgICAgRnJhbWUmIGZyYW1lKCkgY29u c3Q7CiAgICAgRnJhbWVWaWV3JiB2aWV3KCkgY29uc3Q7CkBAIC0xNjcsNyArMTY3LDcgQEAgcHJp dmF0ZToKICAgICBpbnQgbV9sYXlvdXREaXNhbGxvd2VkQ291bnQgeyAwIH07CiAgICAgV2Vha1B0 cjxSZW5kZXJFbGVtZW50PiBtX3N1YnRyZWVMYXlvdXRSb290OwogICAgIHN0ZDo6dW5pcXVlX3B0 cjxMYXlvdXRTdGF0ZT4gbV9sYXlvdXRTdGF0ZTsKLSAgICB1bnNpZ25lZCBtX2xheW91dFN0YXRl RGlzYWJsZUNvdW50IHsgMCB9OworICAgIHVuc2lnbmVkIG1fcGFpbnRPZmZzZXRDYWNoZURpc2Fi bGVDb3VudCB7IDAgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCmluZGV4IDZmNTgyMDE0OTk0YmEyYTQxZmZlYTNk NjEwYmFkOTFkNTYwZDE2NDcuLmRkMGUxM2RkNjk2MDY1MGRlODJlYWFkYjJmNDQyNjU0NmU5MGY5 OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcApAQCAtMjE4LDkg KzIxOCw5IEBAIHZvaWQgTGF5b3V0U3RhdGU6OmVzdGFibGlzaExpbmVHcmlkKFJlbmRlckJsb2Nr RmxvdyYgcmVuZGVyZXIpCiAgICAgbV9saW5lR3JpZE9mZnNldCA9IG1fbGF5b3V0T2Zmc2V0Owog fQogCi1MYXlvdXRTdGF0ZU1haW50YWluZXI6OkxheW91dFN0YXRlTWFpbnRhaW5lcihSZW5kZXJC b3gmIHJvb3QsIExheW91dFNpemUgb2Zmc2V0LCBib29sIGRpc2FibGVTdGF0ZSwgTGF5b3V0VW5p dCBwYWdlSGVpZ2h0LCBib29sIHBhZ2VIZWlnaHRDaGFuZ2VkKQorTGF5b3V0U3RhdGVNYWludGFp bmVyOjpMYXlvdXRTdGF0ZU1haW50YWluZXIoUmVuZGVyQm94JiByb290LCBMYXlvdXRTaXplIG9m ZnNldCwgYm9vbCBkaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSwgTGF5b3V0VW5pdCBwYWdlSGVpZ2h0 LCBib29sIHBhZ2VIZWlnaHRDaGFuZ2VkKQogICAgIDogbV9sYXlvdXRDb250ZXh0KHJvb3Qudmll dygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKSkKLSAgICAsIG1fZGlzYWJsZWQoZGlzYWJs ZVN0YXRlKQorICAgICwgbV9wYWludE9mZnNldENhY2hlSXNEaXNhYmxlZChkaXNhYmxlUGFpbnRP ZmZzZXRDYWNoZSkKIHsKICAgICBwdXNoKHJvb3QsIG9mZnNldCwgcGFnZUhlaWdodCwgcGFnZUhl aWdodENoYW5nZWQpOwogfQpAQCAtMjQ2LDggKzI0Niw4IEBAIHZvaWQgTGF5b3V0U3RhdGVNYWlu dGFpbmVyOjpwdXNoKFJlbmRlckJveCYgcm9vdCwgTGF5b3V0U2l6ZSBvZmZzZXQsIExheW91dFVu aXQKICAgICBtX2RpZFB1c2hMYXlvdXRTdGF0ZSA9IG1fbGF5b3V0Q29udGV4dC5wdXNoTGF5b3V0 U3RhdGUocm9vdCwgb2Zmc2V0LCBwYWdlSGVpZ2h0LCBwYWdlSGVpZ2h0Q2hhbmdlZCk7CiAgICAg aWYgKCFtX2RpZFB1c2hMYXlvdXRTdGF0ZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX2Rp c2FibGVkKQotICAgICAgICBtX2xheW91dENvbnRleHQuZGlzYWJsZUxheW91dFN0YXRlKCk7Cisg ICAgaWYgKG1fcGFpbnRPZmZzZXRDYWNoZUlzRGlzYWJsZWQpCisgICAgICAgIG1fbGF5b3V0Q29u dGV4dC5kaXNhYmxlUGFpbnRPZmZzZXRDYWNoZSgpOwogfQogCiB2b2lkIExheW91dFN0YXRlTWFp bnRhaW5lcjo6cG9wKCkKQEAgLTI1OSwyMiArMjU5LDIyIEBAIHZvaWQgTGF5b3V0U3RhdGVNYWlu dGFpbmVyOjpwb3AoKQogICAgIGlmICghbV9kaWRQdXNoTGF5b3V0U3RhdGUpCiAgICAgICAgIHJl dHVybjsKICAgICBtX2xheW91dENvbnRleHQucG9wTGF5b3V0U3RhdGUoKTsKLSAgICBpZiAobV9k aXNhYmxlZCkKLSAgICAgICAgbV9sYXlvdXRDb250ZXh0LmVuYWJsZUxheW91dFN0YXRlKCk7Cisg ICAgaWYgKG1fcGFpbnRPZmZzZXRDYWNoZUlzRGlzYWJsZWQpCisgICAgICAgIG1fbGF5b3V0Q29u dGV4dC5lbmFibGVQYWludE9mZnNldENhY2hlKCk7CiB9CiAKIExheW91dFN0YXRlRGlzYWJsZXI6 OkxheW91dFN0YXRlRGlzYWJsZXIoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCkKICAgICA6 IG1fbGF5b3V0Q29udGV4dChsYXlvdXRDb250ZXh0KQogewotICAgIG1fbGF5b3V0Q29udGV4dC5k aXNhYmxlTGF5b3V0U3RhdGUoKTsKKyAgICBtX2xheW91dENvbnRleHQuZGlzYWJsZVBhaW50T2Zm c2V0Q2FjaGUoKTsKIH0KIAogTGF5b3V0U3RhdGVEaXNhYmxlcjo6fkxheW91dFN0YXRlRGlzYWJs ZXIoKQogewotICAgIG1fbGF5b3V0Q29udGV4dC5lbmFibGVMYXlvdXRTdGF0ZSgpOworICAgIG1f bGF5b3V0Q29udGV4dC5lbmFibGVQYWludE9mZnNldENhY2hlKCk7CiB9CiAKLXN0YXRpYyBib29s IHNob3VsZERpc2FibGVMYXlvdXRTdGF0ZUZvclN1YnRyZWUoUmVuZGVyRWxlbWVudCYgc3VidHJl ZUxheW91dFJvb3QpCitzdGF0aWMgYm9vbCBzaG91bGREaXNhYmxlUGFpbnRPZmZzZXRDYWNoZUZv clN1YnRyZWUoUmVuZGVyRWxlbWVudCYgc3VidHJlZUxheW91dFJvb3QpCiB7CiAgICAgZm9yIChh dXRvKiByZW5kZXJlciA9ICZzdWJ0cmVlTGF5b3V0Um9vdDsgcmVuZGVyZXI7IHJlbmRlcmVyID0g cmVuZGVyZXItPmNvbnRhaW5lcigpKSB7CiAgICAgICAgIGlmIChyZW5kZXJlci0+aGFzVHJhbnNm b3JtKCkgfHwgcmVuZGVyZXItPmhhc1JlZmxlY3Rpb24oKSkKQEAgLTI4OSw5ICsyODksOSBAQCBT dWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyOjpTdWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVy KFJlbmRlckVsZW1lbnQqIHN1YnRyZQogICAgIGlmIChtX3N1YnRyZWVMYXlvdXRSb290KSB7CiAg ICAgICAgIGF1dG8mIGxheW91dENvbnRleHQgPSBtX3N1YnRyZWVMYXlvdXRSb290LT52aWV3KCku ZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpOwogICAgICAgICBsYXlvdXRDb250ZXh0LnB1c2hM YXlvdXRTdGF0ZSgqbV9zdWJ0cmVlTGF5b3V0Um9vdCk7Ci0gICAgICAgIGlmIChzaG91bGREaXNh YmxlTGF5b3V0U3RhdGVGb3JTdWJ0cmVlKCptX3N1YnRyZWVMYXlvdXRSb290KSkgewotICAgICAg ICAgICAgbGF5b3V0Q29udGV4dC5kaXNhYmxlTGF5b3V0U3RhdGUoKTsKLSAgICAgICAgICAgIG1f ZGlkRGlzYWJsZUxheW91dFN0YXRlID0gdHJ1ZTsKKyAgICAgICAgaWYgKHNob3VsZERpc2FibGVQ YWludE9mZnNldENhY2hlRm9yU3VidHJlZSgqbV9zdWJ0cmVlTGF5b3V0Um9vdCkpIHsKKyAgICAg ICAgICAgIGxheW91dENvbnRleHQuZGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUoKTsKKyAgICAgICAg ICAgIG1fZGlkRGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUgPSB0cnVlOwogICAgICAgICB9CiAgICAg fQogfQpAQCAtMzAxLDggKzMwMSw4IEBAIFN1YnRyZWVMYXlvdXRTdGF0ZU1haW50YWluZXI6On5T dWJ0cmVlTGF5b3V0U3RhdGVNYWludGFpbmVyKCkKICAgICBpZiAobV9zdWJ0cmVlTGF5b3V0Um9v dCkgewogICAgICAgICBhdXRvJiBsYXlvdXRDb250ZXh0ID0gbV9zdWJ0cmVlTGF5b3V0Um9vdC0+ dmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKTsKICAgICAgICAgbGF5b3V0Q29udGV4 dC5wb3BMYXlvdXRTdGF0ZSgqbV9zdWJ0cmVlTGF5b3V0Um9vdCk7Ci0gICAgICAgIGlmIChtX2Rp ZERpc2FibGVMYXlvdXRTdGF0ZSkKLSAgICAgICAgICAgIGxheW91dENvbnRleHQuZW5hYmxlTGF5 b3V0U3RhdGUoKTsKKyAgICAgICAgaWYgKG1fZGlkRGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUpCisg ICAgICAgICAgICBsYXlvdXRDb250ZXh0LmVuYWJsZVBhaW50T2Zmc2V0Q2FjaGUoKTsKICAgICB9 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5o IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgKaW5kZXggYjQ1NDllNWE3 ZGQ3NGQzZjAxNzY0ZjllYzQxNzYzZWNlZjE0MWUwYS4uMWRiYjE1YmMzMGY3ZDJhMjI5YjllYWVh NjdlN2Q0NWE2YmIzNDc1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xh eW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgK QEAgLTE0Myw3ICsxNDMsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgTGF5b3V0Q29udGV4 dCYgbV9sYXlvdXRDb250ZXh0OwotICAgIGJvb2wgbV9kaXNhYmxlZCB7IGZhbHNlIH07CisgICAg Ym9vbCBtX3BhaW50T2Zmc2V0Q2FjaGVJc0Rpc2FibGVkIHsgZmFsc2UgfTsKICAgICBib29sIG1f ZGlkQ2FsbFB1c2ggeyBmYWxzZSB9OwogICAgIGJvb2wgbV9kaWRDYWxsUG9wIHsgZmFsc2UgfTsK ICAgICBib29sIG1fZGlkUHVzaExheW91dFN0YXRlIHsgZmFsc2UgfTsKQEAgLTE1Niw3ICsxNTYs NyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgUmVuZGVyRWxlbWVudCogbV9zdWJ0cmVlTGF5 b3V0Um9vdCB7IG51bGxwdHIgfTsKLSAgICBib29sIG1fZGlkRGlzYWJsZUxheW91dFN0YXRlIHsg ZmFsc2UgfTsKKyAgICBib29sIG1fZGlkRGlzYWJsZVBhaW50T2Zmc2V0Q2FjaGUgeyBmYWxzZSB9 OwogfTsKIAogY2xhc3MgTGF5b3V0U3RhdGVEaXNhYmxlciB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCb3guY3BwCmluZGV4IDFmYTY2ZDBjOTg3MjRmNTlhYmJkZDA1OWIxNmQzNjczZmUy Njg4NDguLjIzY2ZmNzIyYjQ2YzIzMmU2MjQzODQ0YTc3NzZiNTQzNGE0N2YxMDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0xOTI0LDcgKzE5MjQsNyBAQCB2b2lk IFJlbmRlckJveDo6bWFwTG9jYWxUb0NvbnRhaW5lcihjb25zdCBSZW5kZXJMYXllck1vZGVsT2Jq ZWN0KiByZXBhaW50Q29udGFpbgogICAgIGlmIChyZXBhaW50Q29udGFpbmVyID09IHRoaXMpCiAg ICAgICAgIHJldHVybjsKIAotICAgIGlmICh2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4 dCgpLmxheW91dFN0YXRlRW5hYmxlZCgpICYmICFyZXBhaW50Q29udGFpbmVyKSB7CisgICAgaWYg KHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNldENhY2hlRW5h YmxlZCgpICYmICFyZXBhaW50Q29udGFpbmVyKSB7CiAgICAgICAgIGF1dG8qIGxheW91dFN0YXRl ID0gdmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0ZSgpOwogICAg ICAgICBMYXlvdXRTaXplIG9mZnNldCA9IGxheW91dFN0YXRlLT5tX3BhaW50T2Zmc2V0ICsgbG9j YXRpb25PZmZzZXQoKTsKICAgICAgICAgaWYgKHN0eWxlKCkuaGFzSW5GbG93UG9zaXRpb24oKSAm JiBsYXllcigpKQpAQCAtMjEzOSw4ICsyMTM5LDggQEAgTGF5b3V0UmVjdCBSZW5kZXJCb3g6OmNv bXB1dGVSZWN0Rm9yUmVwYWludChjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBSZW5kZXIK ICAgICAvLyBwaHlzaWNhbCBjb29yZGluYXRlIHNwYWNlIG9mIHRoZSByZXBhaW50Q29udGFpbmVy LgogICAgIExheW91dFJlY3QgYWRqdXN0ZWRSZWN0ID0gcmVjdDsKICAgICBjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxlKCk7Ci0gICAgLy8gTGF5b3V0U3RhdGUgaXMgb25seSB2 YWxpZCBmb3Igcm9vdC1yZWxhdGl2ZSwgbm9uLWZpeGVkIHBvc2l0aW9uIHJlcGFpbnRpbmcKLSAg ICBpZiAodmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0ZUVuYWJs ZWQoKSAmJiAhcmVwYWludENvbnRhaW5lciAmJiBzdHlsZVRvVXNlLnBvc2l0aW9uKCkgIT0gRml4 ZWRQb3NpdGlvbikgeworICAgIC8vIFBhaW50IG9mZnNldCBjYWNoZSBpcyBvbmx5IHZhbGlkIGZv ciByb290LXJlbGF0aXZlLCBub24tZml4ZWQgcG9zaXRpb24gcmVwYWludGluZworICAgIGlmICh2 aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLmlzUGFpbnRPZmZzZXRDYWNoZUVuYWJs ZWQoKSAmJiAhcmVwYWludENvbnRhaW5lciAmJiBzdHlsZVRvVXNlLnBvc2l0aW9uKCkgIT0gRml4 ZWRQb3NpdGlvbikgewogICAgICAgICBhdXRvKiBsYXlvdXRTdGF0ZSA9IHZpZXcoKS5mcmFtZVZp ZXcoKS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGUoKTsKIAogICAgICAgICBpZiAobGF5ZXIo KSAmJiBsYXllcigpLT50cmFuc2Zvcm0oKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl cklubGluZS5jcHAKaW5kZXggMWU0ODk3MTNkODIxNWNlYmJlNDllYzMzOWQ0NzQxNGExZTE1NDcx ZS4uYWNlMjYwNWZmN2Q3NmRkNDYyOWY2NGU5YjJiNGFhZTQzMDgwNTdhOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTExNjUsNyArMTE2NSw3IEBAIExh eW91dFJlY3QgUmVuZGVySW5saW5lOjpsaW5lc1Zpc3VhbE92ZXJmbG93Qm91bmRpbmdCb3hJbkZy YWdtZW50KGNvbnN0IFJlbmRlckZyCiBMYXlvdXRSZWN0IFJlbmRlcklubGluZTo6Y2xpcHBlZE92 ZXJmbG93UmVjdEZvclJlcGFpbnQoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCogcmVwYWlu dENvbnRhaW5lcikgY29uc3QKIHsKICAgICAvLyBPbmx5IGZpcnN0LWxldHRlciByZW5kZXJlcnMg YXJlIGFsbG93ZWQgaW4gaGVyZSBkdXJpbmcgbGF5b3V0LiBUaGV5IG11dGF0ZSB0aGUgdHJlZSB0 cmlnZ2VyaW5nIHJlcGFpbnRzLgotICAgIEFTU0VSVCghdmlldygpLmZyYW1lVmlldygpLmxheW91 dENvbnRleHQoKS5sYXlvdXRTdGF0ZUVuYWJsZWQoKSB8fCBzdHlsZSgpLnN0eWxlVHlwZSgpID09 IEZJUlNUX0xFVFRFUiB8fCBoYXNTZWxmUGFpbnRpbmdMYXllcigpKTsKKyAgICBBU1NFUlQoIXZp ZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNldENhY2hlRW5hYmxl ZCgpIHx8IHN0eWxlKCkuc3R5bGVUeXBlKCkgPT0gRklSU1RfTEVUVEVSIHx8IGhhc1NlbGZQYWlu dGluZ0xheWVyKCkpOwogCiAgICAgaWYgKCFmaXJzdExpbmVCb3hJbmNsdWRpbmdDdWxsaW5nKCkg JiYgIWNvbnRpbnVhdGlvbigpKQogICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwpAQCAtMTIy MCw5ICsxMjIwLDkgQEAgTGF5b3V0UmVjdCBSZW5kZXJJbmxpbmU6OnJlY3RXaXRoT3V0bGluZUZv clJlcGFpbnQoY29uc3QgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCoKIAogTGF5b3V0UmVjdCBSZW5k ZXJJbmxpbmU6OmNvbXB1dGVSZWN0Rm9yUmVwYWludChjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBj b25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiByZXBhaW50Q29udGFpbmVyLCBSZXBhaW50Q29u dGV4dCBjb250ZXh0KSBjb25zdAogewotICAgIC8vIExheW91dFN0YXRlIGlzIG9ubHkgdmFsaWQg Zm9yIHJvb3QtcmVsYXRpdmUgcmVwYWludGluZworICAgIC8vIFJlcGFpbnQgb2Zmc2V0IGNhY2hl IGlzIG9ubHkgdmFsaWQgZm9yIHJvb3QtcmVsYXRpdmUgcmVwYWludGluZwogICAgIExheW91dFJl Y3QgYWRqdXN0ZWRSZWN0ID0gcmVjdDsKLSAgICBpZiAodmlldygpLmZyYW1lVmlldygpLmxheW91 dENvbnRleHQoKS5sYXlvdXRTdGF0ZUVuYWJsZWQoKSAmJiAhcmVwYWludENvbnRhaW5lcikgewor ICAgIGlmICh2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLmlzUGFpbnRPZmZzZXRD YWNoZUVuYWJsZWQoKSAmJiAhcmVwYWludENvbnRhaW5lcikgewogICAgICAgICBhdXRvKiBsYXlv dXRTdGF0ZSA9IHZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGUo KTsKICAgICAgICAgaWYgKHN0eWxlKCkuaGFzSW5GbG93UG9zaXRpb24oKSAmJiBsYXllcigpKQog ICAgICAgICAgICAgYWRqdXN0ZWRSZWN0Lm1vdmUobGF5ZXIoKS0+b2Zmc2V0Rm9ySW5GbG93UG9z aXRpb24oKSk7CkBAIC0xMjkwLDcgKzEyOTAsNyBAQCB2b2lkIFJlbmRlcklubGluZTo6bWFwTG9j YWxUb0NvbnRhaW5lcihjb25zdCBSZW5kZXJMYXllck1vZGVsT2JqZWN0KiByZXBhaW50Q29udAog ICAgIGlmIChyZXBhaW50Q29udGFpbmVyID09IHRoaXMpCiAgICAgICAgIHJldHVybjsKIAotICAg IGlmICh2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4dCgpLmxheW91dFN0YXRlRW5hYmxl ZCgpICYmICFyZXBhaW50Q29udGFpbmVyKSB7CisgICAgaWYgKHZpZXcoKS5mcmFtZVZpZXcoKS5s YXlvdXRDb250ZXh0KCkuaXNQYWludE9mZnNldENhY2hlRW5hYmxlZCgpICYmICFyZXBhaW50Q29u dGFpbmVyKSB7CiAgICAgICAgIGF1dG8qIGxheW91dFN0YXRlID0gdmlldygpLmZyYW1lVmlldygp LmxheW91dENvbnRleHQoKS5sYXlvdXRTdGF0ZSgpOwogICAgICAgICBMYXlvdXRTaXplIG9mZnNl dCA9IGxheW91dFN0YXRlLT5tX3BhaW50T2Zmc2V0OwogICAgICAgICBpZiAoc3R5bGUoKS5oYXNJ bkZsb3dQb3NpdGlvbigpICYmIGxheWVyKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAppbmRleCA1MDFmY2E4ZjAwY2M4MDBhMWRjODU0ZDFhMjI2ZmMzODIzZTBkMzcz Li42OTdjZjA1NjFiYjI1NGU3NWFiOGU2YjdhNGFiMTljOTEyZTVlN2YwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTUxNCwxMCArNTE0LDEwIEBAIHZvaWQg UmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKFJlbmRlckdlb21ldHJ5TWFwKiBnZW9t ZXRyeU1hcCwgVXBkYXRlTGF5CiAgICAgICAgIG1fZW5jbG9zaW5nUGFnaW5hdGlvbkxheWVyID0g bnVsbHB0cjsKICAgICAKICAgICBpZiAobV9oYXNWaXNpYmxlQ29udGVudCkgewotICAgICAgICAv LyBGSVhNRTogTGF5b3V0U3RhdGUgZG9lcyBub3Qgd29yayB3aXRoIFJlbmRlckxheWVycyBhcyB0 aGVyZSBpcyBub3QgYSAxLXRvLTEKKyAgICAgICAgLy8gRklYTUU6IFBhaW50IG9mZnNldCBjYWNo ZSBkb2VzIG5vdCB3b3JrIHdpdGggUmVuZGVyTGF5ZXJzIGFzIHRoZXJlIGlzIG5vdCBhIDEtdG8t MQogICAgICAgICAvLyBtYXBwaW5nIGJldHdlZW4gdGhlbSBhbmQgdGhlIFJlbmRlck9iamVjdHMu IEl0IHdvdWxkIGJlIG5lYXQgdG8gZW5hYmxlCiAgICAgICAgIC8vIExheW91dFN0YXRlIG91dHNp ZGUgdGhlIGxheW91dCgpIHBoYXNlIGFuZCB1c2UgaXQgaGVyZS4KLSAgICAgICAgQVNTRVJUKCFy ZW5kZXJlcigpLnZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGVF bmFibGVkKCkpOworICAgICAgICBBU1NFUlQoIXJlbmRlcmVyKCkudmlldygpLmZyYW1lVmlldygp LmxheW91dENvbnRleHQoKS5pc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVkKCkpOwogCiAgICAgICAg IFJlbmRlckxheWVyTW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIgPSByZW5kZXJlcigpLmNv bnRhaW5lckZvclJlcGFpbnQoKTsKICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGFibGVDZWxsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZUNlbGwuY3BwCmluZGV4IDI4ZTc2MzkxYzZlZjI0ZDM3ZWMxNzRhMDUxNWEz YzYwYmNhZDI1YWEuLjI0M2FlNjBiY2Y0MGNhNDQ2NWY5YTFlMzFiMWFjZGM2ZmVjMjBlZTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZUNlbGwuY3BwCkBAIC0zOTgs NyArMzk4LDcgQEAgTGF5b3V0UmVjdCBSZW5kZXJUYWJsZUNlbGw6OmNvbXB1dGVSZWN0Rm9yUmVw YWludChjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdAogICAgIGlmIChyZXBhaW50Q29udGFp bmVyID09IHRoaXMpCiAgICAgICAgIHJldHVybiByZWN0OwogICAgIExheW91dFJlY3QgYWRqdXN0 ZWRSZWN0ID0gcmVjdDsKLSAgICBpZiAoKCF2aWV3KCkuZnJhbWVWaWV3KCkubGF5b3V0Q29udGV4 dCgpLmxheW91dFN0YXRlRW5hYmxlZCgpIHx8IHJlcGFpbnRDb250YWluZXIpICYmIHBhcmVudCgp KQorICAgIGlmICgoIXZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkuaXNQYWludE9m ZnNldENhY2hlRW5hYmxlZCgpIHx8IHJlcGFpbnRDb250YWluZXIpICYmIHBhcmVudCgpKQogICAg ICAgICBhZGp1c3RlZFJlY3QubW92ZUJ5KC1wYXJlbnRCb3goKS0+bG9jYXRpb24oKSk7IC8vIFJv d3MgYXJlIGluIHRoZSBzYW1lIGNvb3JkaW5hdGUgc3BhY2UsIHNvIGRvbid0IGFkZCB0aGVpciBv ZmZzZXQgaW4uCiAgICAgcmV0dXJuIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZVJlY3RGb3JSZXBh aW50KGFkanVzdGVkUmVjdCwgcmVwYWludENvbnRhaW5lciwgY29udGV4dCk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR0NvbnRhaW5lci5jcHAKaW5k ZXggOWIxZGZmZGRlMWZiZDhkZDZhODNiNDA4ZTQ0NjUyOGI4YjJkOTEzMS4uODE0MzYxZmZiODFm NTRmZDU0MWZiZjYxYzcxMmY1NGQ2YWEwMDlkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdDb250YWluZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHQ29udGFpbmVyLmNwcApAQCAtNTUsOCArNTUsOCBAQCB2 b2lkIFJlbmRlclNWR0NvbnRhaW5lcjo6bGF5b3V0KCkKICAgICBTdGFja1N0YXRzOjpMYXlvdXRD aGVja1BvaW50IGxheW91dENoZWNrUG9pbnQ7CiAgICAgQVNTRVJUKG5lZWRzTGF5b3V0KCkpOwog Ci0gICAgLy8gUmVuZGVyU1ZHUm9vdCBkaXNhYmxlcyBsYXlvdXRTdGF0ZSBmb3IgdGhlIFNWRyBy ZW5kZXJpbmcgdHJlZS4KLSAgICBBU1NFUlQoIXZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250 ZXh0KCkubGF5b3V0U3RhdGVFbmFibGVkKCkpOworICAgIC8vIFJlbmRlclNWR1Jvb3QgZGlzYWJs ZXMgcGFpbnQgb2Zmc2V0IGNhY2hlIGZvciB0aGUgU1ZHIHJlbmRlcmluZyB0cmVlLgorICAgIEFT U0VSVCghdmlldygpLmZyYW1lVmlldygpLmxheW91dENvbnRleHQoKS5pc1BhaW50T2Zmc2V0Q2Fj aGVFbmFibGVkKCkpOwogCiAgICAgTGF5b3V0UmVwYWludGVyIHJlcGFpbnRlcigqdGhpcywgU1ZH UmVuZGVyU3VwcG9ydDo6Y2hlY2tGb3JTVkdSZXBhaW50RHVyaW5nTGF5b3V0KCp0aGlzKSB8fCBz ZWxmV2lsbFBhaW50KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3ZnL1JlbmRlclNWR0ZvcmVpZ25PYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L3N2Zy9SZW5kZXJTVkdGb3JlaWduT2JqZWN0LmNwcAppbmRleCBmMDcyNGE5Njc3ZGNlZGI2ZTE0 OWE3YTdjYTg4NTYzOGRmNjdiMmFiLi5iOTk3YmI5YTkxMjU2OGNmN2ZlOThlNWFkN2UxMTdhNTg1 Mjc5ZmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R0ZvcmVpZ25PYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVu ZGVyU1ZHRm9yZWlnbk9iamVjdC5jcHAKQEAgLTEzNCw3ICsxMzQsNyBAQCB2b2lkIFJlbmRlclNW R0ZvcmVpZ25PYmplY3Q6OmxheW91dCgpCiB7CiAgICAgU3RhY2tTdGF0czo6TGF5b3V0Q2hlY2tQ b2ludCBsYXlvdXRDaGVja1BvaW50OwogICAgIEFTU0VSVChuZWVkc0xheW91dCgpKTsKLSAgICBB U1NFUlQoIXZpZXcoKS5mcmFtZVZpZXcoKS5sYXlvdXRDb250ZXh0KCkubGF5b3V0U3RhdGVFbmFi bGVkKCkpOyAvLyBSZW5kZXJTVkdSb290IGRpc2FibGVzIGxheW91dFN0YXRlIGZvciB0aGUgU1ZH IHJlbmRlcmluZyB0cmVlLgorICAgIEFTU0VSVCghdmlldygpLmZyYW1lVmlldygpLmxheW91dENv bnRleHQoKS5pc1BhaW50T2Zmc2V0Q2FjaGVFbmFibGVkKCkpOyAvLyBSZW5kZXJTVkdSb290IGRp c2FibGVzIHBhaW50IG9mZnNldCBjYWNoZSBmb3IgdGhlIFNWRyByZW5kZXJpbmcgdHJlZS4KIAog ICAgIExheW91dFJlcGFpbnRlciByZXBhaW50ZXIoKnRoaXMsIFNWR1JlbmRlclN1cHBvcnQ6OmNo ZWNrRm9yU1ZHUmVwYWludER1cmluZ0xheW91dCgqdGhpcykpOwogCg==