214400 2020-07-15 23:26:01 -0700 Double tapping to zoom out a fullscreen video will zoom in slightly before zooming out 2020-07-16 10:59:28 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 peng.liu6 peng.liu6 eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1672058 0 peng.liu6 2020-07-15 23:26:01 -0700 Double tapping to zoom out a fullscreen video will zoom in slightly before zooming out 1672059 1 peng.liu6 2020-07-15 23:26:47 -0700 <rdar://problem/64579374> 1672061 2 404426 peng.liu6 2020-07-15 23:53:10 -0700 Created attachment 404426 Patch 1672168 3 404426 peng.liu6 2020-07-16 10:04:19 -0700 Comment on attachment 404426 Patch This patch handles two video gravity changes differently: 1) AVLayerVideoGravityResizeAspect -> AVLayerVideoGravityResizeAspectFill, 2) AVLayerVideoGravityResizeAspectFill -> AVLayerVideoGravityResizeAspect). The animation happens on the UI process for 1), and the animation happens on the web process for 2). We had better let the animations happen on the UI process for both cases. 1672176 4 404461 peng.liu6 2020-07-16 10:23:36 -0700 Created attachment 404461 A better patch 1672185 5 ews-feeder 2020-07-16 10:59:27 -0700 Committed r264471: <https://trac.webkit.org/changeset/264471> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404461. 404426 2020-07-15 23:53:10 -0700 2020-07-16 10:23:35 -0700 Patch bug-214400-20200715235309.patch text/plain 6050 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFlMGNiNWUyZTFkNDBh YjFkMGEwZjUxNDZmODhlMjllOWU2MGRkNy4uODc2MzlhNmNiNDJlMDkxYTUzNTg2MGFkNGEwOTEw NTRkZWMxNjc0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA3LTE1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgRG91YmxlIHRhcHBpbmcgdG8g em9vbSBvdXQgYSBmdWxsc2NyZWVuIHZpZGVvIHdpbGwgem9vbSBpbiBzbGlnaHRseSBiZWZvcmUg em9vbWluZyBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNDQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdoZW4gY2hhbmdpbmcgdGhlIHZpZGVvIGdyYXZpdHkgb2YgYSBmdWxsc2NyZWVuIHZpZGVv IGZyb20gQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdEZpbGwKKyAgICAgICAgdG8gQVZM YXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdCwgdGhlIGltcGxpY2l0IGFuaW1hdGlvbiBvZiB0 aGUgQVZQbGF5ZXJMYXllciBpbiB0aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgd2lsbCBjb25mbGlj dCB3aXRoIHRoZSBpbXBsaWNpdCBhbmltYXRpb24gb2YgdGhlIF92aWRlb1N1YmxheWVyIGluIHRo ZSBXZWJBVlBsYXllckxheWVyIGluIHRoZQorICAgICAgICBVSSBwcm9jZXNzLiBUaGVyZWZvcmUs IHdlIG5lZWQgdG8gc2tpcCB0aGUgdHJhbnNmb3JtIGluIHRoZSBXZWJBVlBsYXllckxheWVyIHRv IGF2b2lkIGNyZWF0aW5nCisgICAgICAgIGFuIGFuaW1hdGlvbiBpbiB0aGUgVUkgcHJvY2Vzcy4K KyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIGFkZHMgYW4gaW5zdGFuY2UgdmFyaWFibGUgX3ByZXZp b3VzVmlkZW9HcmF2aXR5IHRvIG1ha2Ugc3VyZSB0aGUgdHJhbnNmb3JtIGlzCisgICAgICAgIGNv cnJlY3RseSBjYWxjdWxhdGVkIHdoZW4gdmlkZW8gZ3Jhdml0eSBpcyBjaGFuZ2luZy4KKworICAg ICAgICAqIHBsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbToKKyAg ICAgICAgKC1bV2ViQVZQbGF5ZXJMYXllciBpbml0XSk6CisgICAgICAgICgtW1dlYkFWUGxheWVy TGF5ZXIgbGF5b3V0U3VibGF5ZXJzXSk6CisgICAgICAgICgtW1dlYkFWUGxheWVyTGF5ZXIgcmVz b2x2ZUJvdW5kc10pOgorICAgICAgICAoLVtXZWJBVlBsYXllckxheWVyIHNldFZpZGVvR3Jhdml0 eTpdKToKKwogMjAyMC0wNy0xNCAgQ2xhcmsgV2FuZyAgPGNsYXJrX3dhbmdAYXBwbGUuY29tPgog CiAgICAgICAgIFVwZGF0ZWQgQXVkaW9Db250ZXh0IGNvbnN0cnVjdG9yIGFjY29yZGluZyB0byBz cGVjCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2Ny ZWVuSW50ZXJmYWNlQVZLaXQubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlkZW9G dWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KaW5kZXggYmRlNTcwNDA1NWNhZDc4NWRmNGU4NzNi MWU5NTcwYmIxNGM4YWViMC4uYmE0MGRkNDIwNGY4MDEzMDJjZDZjYTk3ODUzYjEyODgwMjFhYWYx NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNjcmVl bkludGVyZmFjZUFWS2l0Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRl b0Z1bGxzY3JlZW5JbnRlcmZhY2VBVktpdC5tbQpAQCAtMjAzLDYgKzIwMyw3IEBAIEBpbXBsZW1l bnRhdGlvbiBXZWJBVlBsYXllckxheWVyIHsKICAgICBSZXRhaW5QdHI8V2ViQVZQbGF5ZXJDb250 cm9sbGVyPiBfYXZQbGF5ZXJDb250cm9sbGVyOwogICAgIFJldGFpblB0cjxDQUxheWVyPiBfdmlk ZW9TdWJsYXllcjsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF92aWRlb0dyYXZpdHk7CisgICAg UmV0YWluUHRyPE5TU3RyaW5nPiBfcHJldmlvdXNWaWRlb0dyYXZpdHk7CiB9CiAKIC0gKGluc3Rh bmNldHlwZSlpbml0CkBAIC0yMTIsNiArMjEzLDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXQKICAg ICAgICAgc2VsZi5tYXNrc1RvQm91bmRzID0gWUVTOwogICAgICAgICBzZWxmLmFsbG93c0hpdFRl c3RpbmcgPSBOTzsKICAgICAgICAgX3ZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRlb0dyYXZpdHlS ZXNpemVBc3BlY3Q7CisgICAgICAgIF9wcmV2aW91c1ZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRl b0dyYXZpdHlSZXNpemVBc3BlY3Q7CiAgICAgfQogICAgIHJldHVybiBzZWxmOwogfQpAQCAtMjcw LDIzICsyNzIsMzUgQEAgLSAodm9pZClsYXlvdXRTdWJsYXllcnMKICAgICBGbG9hdFJlY3Qgc291 cmNlVmlkZW9GcmFtZTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0VmlkZW9GcmFtZTsKICAgICBmbG9h dCB2aWRlb0FzcGVjdFJhdGlvID0gc2VsZi52aWRlb0RpbWVuc2lvbnMud2lkdGggLyBzZWxmLnZp ZGVvRGltZW5zaW9ucy5oZWlnaHQ7Ci0gICAgCi0gICAgaWYgKFtBVkxheWVyVmlkZW9HcmF2aXR5 UmVzaXplIGlzRXF1YWxUb1N0cmluZzpzZWxmLnZpZGVvR3Jhdml0eV0pIHsKKworICAgIGlmIChb QVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZSBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9H cmF2aXR5LmdldCgpXSkKICAgICAgICAgc291cmNlVmlkZW9GcmFtZSA9IHNlbGYubW9kZWxWaWRl b0xheWVyRnJhbWU7Ci0gICAgICAgIHRhcmdldFZpZGVvRnJhbWUgPSBzZWxmLmJvdW5kczsKLSAg ICB9IGVsc2UgaWYgKFtBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0IGlzRXF1YWxUb1N0 cmluZzpzZWxmLnZpZGVvR3Jhdml0eV0pIHsKKyAgICBlbHNlIGlmIChbQVZMYXllclZpZGVvR3Jh dml0eVJlc2l6ZUFzcGVjdCBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5Lmdl dCgpXSkKICAgICAgICAgc291cmNlVmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJh dGlvSW5zaWRlUmVjdCh2aWRlb0FzcGVjdFJhdGlvLCBzZWxmLm1vZGVsVmlkZW9MYXllckZyYW1l KTsKLSAgICAgICAgdGFyZ2V0VmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlv SW5zaWRlUmVjdCh2aWRlb0FzcGVjdFJhdGlvLCBzZWxmLmJvdW5kcyk7Ci0gICAgfSBlbHNlIGlm IChbQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdEZpbGwgaXNFcXVhbFRvU3RyaW5nOnNl bGYudmlkZW9HcmF2aXR5XSkgeworICAgIGVsc2UgaWYgKFtBVkxheWVyVmlkZW9HcmF2aXR5UmVz aXplQXNwZWN0RmlsbCBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5LmdldCgp XSkKICAgICAgICAgc291cmNlVmlkZW9GcmFtZSA9IHNtYWxsZXN0UmVjdFdpdGhBc3BlY3RSYXRp b0Fyb3VuZFJlY3QodmlkZW9Bc3BlY3RSYXRpbywgc2VsZi5tb2RlbFZpZGVvTGF5ZXJGcmFtZSk7 CisgICAgZWxzZQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAgIGlmIChbQVZM YXllclZpZGVvR3Jhdml0eVJlc2l6ZSBpc0VxdWFsVG9TdHJpbmc6c2VsZi52aWRlb0dyYXZpdHld KQorICAgICAgICB0YXJnZXRWaWRlb0ZyYW1lID0gc2VsZi5ib3VuZHM7CisgICAgZWxzZSBpZiAo W0FWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QgaXNFcXVhbFRvU3RyaW5nOnNlbGYudmlk ZW9HcmF2aXR5XSkKKyAgICAgICAgdGFyZ2V0VmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFz cGVjdFJhdGlvSW5zaWRlUmVjdCh2aWRlb0FzcGVjdFJhdGlvLCBzZWxmLmJvdW5kcyk7CisgICAg ZWxzZSBpZiAoW0FWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3RGaWxsIGlzRXF1YWxUb1N0 cmluZzpzZWxmLnZpZGVvR3Jhdml0eV0pCiAgICAgICAgIHRhcmdldFZpZGVvRnJhbWUgPSBzbWFs bGVzdFJlY3RXaXRoQXNwZWN0UmF0aW9Bcm91bmRSZWN0KHZpZGVvQXNwZWN0UmF0aW8sIHNlbGYu Ym91bmRzKTsKLSAgICB9IGVsc2UKKyAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwogCi0gICAgVUlWaWV3ICp2aWV3ID0gKFVJVmlldyAqKVtfdmlkZW9TdWJsYXllciBkZWxl Z2F0ZV07Ci0gICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQ0dBZmZpbmVUcmFuc2Zv cm1NYWtlU2NhbGUodGFyZ2V0VmlkZW9GcmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFtZS53 aWR0aCgpLCB0YXJnZXRWaWRlb0ZyYW1lLmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5oZWln aHQoKSk7Ci0gICAgW3ZpZXcgc2V0VHJhbnNmb3JtOnRyYW5zZm9ybV07Ci0gICAgCisgICAgLy8g RG9uJ3QgYXBwbHkgdGhlIHRyYW5zZm9ybSB0byBfdmlkZW9TdWJsYXllciB3aGVuIHZpZGVvIGdy YXZpdHkgaXMgYmVpbmcgY2hhbmdlZAorICAgIC8vIGZyb20gQVZMYXllclZpZGVvR3Jhdml0eVJl c2l6ZUFzcGVjdEZpbGwgdG8gQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdC4KKyAgICAv LyBCZWNhdXNlIHRoZSBpbXBsaWNpdCBhbmltYXRpb24gd2lsbCBjb25mbGljdCB3aXRoIHRoZSBh bmltYXRpb24gb2YgdGhlIGNvcnJlc3BvbmRpbmcKKyAgICAvLyBBVlBsYXllckxheWVyIGluIHRo ZSB3ZWIgcHJvY2Vzcy4KKyAgICBpZiAoIVtBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0 RmlsbCBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5LmdldCgpXSkgeworICAg ICAgICBVSVZpZXcgKnZpZXcgPSAoVUlWaWV3ICopW192aWRlb1N1YmxheWVyIGRlbGVnYXRlXTsK KyAgICAgICAgQ0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQ0dBZmZpbmVUcmFuc2Zvcm1N YWtlU2NhbGUodGFyZ2V0VmlkZW9GcmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFtZS53aWR0 aCgpLCB0YXJnZXRWaWRlb0ZyYW1lLmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5oZWlnaHQo KSk7CisgICAgICAgIFt2aWV3IHNldFRyYW5zZm9ybTp0cmFuc2Zvcm1dOworICAgIH0KKwogICAg IE5TVGltZUludGVydmFsIGFuaW1hdGlvbkR1cmF0aW9uID0gW0NBVHJhbnNhY3Rpb24gYW5pbWF0 aW9uRHVyYXRpb25dOwogICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl KCksIF57CiAgICAgICAgIFtOU09iamVjdCBjYW5jZWxQcmV2aW91c1BlcmZvcm1SZXF1ZXN0c1dp dGhUYXJnZXQ6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IocmVzb2x2ZUJvdW5kcykgb2JqZWN0Om5p bF07CkBAIC0zMTUsNiArMzI5LDggQEAgLSAodm9pZClyZXNvbHZlQm91bmRzCiAgICAgICAgIHNl bGYubW9kZWxWaWRlb0xheWVyRnJhbWUgPSBbc2VsZiBib3VuZHNdOwogICAgICAgICBpZiAoYXV0 byogbW9kZWwgPSBfZnVsbHNjcmVlbkludGVyZmFjZS0+dmlkZW9GdWxsc2NyZWVuTW9kZWwoKSkK ICAgICAgICAgICAgIG1vZGVsLT5zZXRWaWRlb0xheWVyRnJhbWUoc2VsZi5tb2RlbFZpZGVvTGF5 ZXJGcmFtZSk7CisKKyAgICAgICAgX3ByZXZpb3VzVmlkZW9HcmF2aXR5ID0gX3ZpZGVvR3Jhdml0 eTsKICAgICB9CiAgICAgWyhVSVZpZXcgKilbX3ZpZGVvU3VibGF5ZXIgZGVsZWdhdGVdIHNldFRy YW5zZm9ybTpDR0FmZmluZVRyYW5zZm9ybUlkZW50aXR5XTsKICAgICAKQEAgLTMyOSw4ICszNDUs MTIgQEAgLSAodm9pZClzZXRWaWRlb0dyYXZpdHk6KE5TU3RyaW5nICopdmlkZW9HcmF2aXR5CiAg ICAgICAgIHZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3Q7CiAj ZW5kaWYKIAorICAgIGlmIChbX3ZpZGVvR3Jhdml0eS5nZXQoKSBpc0VxdWFsVG9TdHJpbmc6dmlk ZW9HcmF2aXR5XSkKKyAgICAgICAgcmV0dXJuOworCisgICAgX3ByZXZpb3VzVmlkZW9HcmF2aXR5 ID0gX3ZpZGVvR3Jhdml0eTsKICAgICBfdmlkZW9HcmF2aXR5ID0gdmlkZW9HcmF2aXR5OwotICAg IAorCiAgICAgaWYgKCFbX2F2UGxheWVyQ29udHJvbGxlciBkZWxlZ2F0ZV0pCiAgICAgICAgIHJl dHVybjsKIAo= 404461 2020-07-16 10:23:36 -0700 2020-07-16 10:59:28 -0700 A better patch bug-214400-20200716102335.patch text/plain 6227 peng.liu6 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFlMGNiNWUyZTFkNDBh YjFkMGEwZjUxNDZmODhlMjllOWU2MGRkNy4uYjMwMGRiNDIyYjZkMzBiMzU3ZThhZTRiOGQ5YWU4 YTMwNzVlY2Y0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA3LTE1ICBQZW5n IExpdSAgPHBlbmcubGl1NkBhcHBsZS5jb20+CisKKyAgICAgICAgRG91YmxlIHRhcHBpbmcgdG8g em9vbSBvdXQgYSBmdWxsc2NyZWVuIHZpZGVvIHdpbGwgem9vbSBpbiBzbGlnaHRseSBiZWZvcmUg em9vbWluZyBvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNDQwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdoZW4gY2hhbmdpbmcgdGhlIHZpZGVvIGdyYXZpdHkgb2YgYSBmdWxsc2NyZWVuIHZpZGVv IGZyb20gQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdEZpbGwKKyAgICAgICAgdG8gQVZM YXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdCwgdGhlIGltcGxpY2l0IGFuaW1hdGlvbiBvZiB0 aGUgQVZQbGF5ZXJMYXllciBpbiB0aGUgd2ViIHByb2Nlc3MKKyAgICAgICAgd2lsbCBjb25mbGlj dCB3aXRoIHRoZSBpbXBsaWNpdCBhbmltYXRpb24gb2YgdGhlIF92aWRlb1N1YmxheWVyIGluIHRo ZSBXZWJBVlBsYXllckxheWVyIGluIHRoZQorICAgICAgICBVSSBwcm9jZXNzLiBUbyBhdm9pZCB0 aGUgaW1wbGljaXQgYW5pbWF0aW9uIGluIHRoZSB3ZWIgcHJvY2VzcyBiZWNhdXNlIG9mIHRoZSB2 aWRlbyBncmF2aXR5IGNoYW5nZSwKKyAgICAgICAgd2UgaGF2ZSB0byBsZXQgdGhlIHJlbW90ZSBo b3N0aW5nIGxheWVyIGFuZCB0aGUgY29ycmVzcG9uZGluZyBBVlBsYXllckxheWVyIGluIHRoZSB3 ZWIgcHJvY2VzcworICAgICAgICB0byBpbmNsdWRlIHRoZSB3aG9sZSB2aWRlbywgZXZlbiB3aGVu IHRoZSB2aWRlbyBncmF2aXR5IGlzIEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3RGaWxs CisgICAgICAgIGFuZCB0aGUgdmlkZW8gd2lsbCBiZSBjbGlwcGVkIGJ5IHRoZSBzdXBlcmxheWVy LiBXaGVuIHRoZSBBVlBsYXllckxheWVyIGhhcyB0aGUgd2hvbGUgdmlkZW8sCisgICAgICAgIGNo YW5naW5nIHRoZSB2aWRlbyBncmF2aXR5IGZyb20gQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFz cGVjdEZpbGwgdG8gQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdAorICAgICAgICB3aWxs IG5vdCBnZW5lcmF0ZSBhbiBpbXBsaWNpdCBhbmltYXRpb24gaW4gdGhlIHdlYiBwcm9jZXNzLgor CisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyBhZGRzIGFuIGluc3RhbmNlIHZhcmlhYmxlIF9wcmV2 aW91c1ZpZGVvR3Jhdml0eSB0byBtYWtlIHN1cmUgdGhlIHRyYW5zZm9ybSBpcworICAgICAgICBj b3JyZWN0bHkgY2FsY3VsYXRlZCB3aGVuIHZpZGVvIGdyYXZpdHkgaXMgY2hhbmdpbmcuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9pb3MvVmlkZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW06Cisg ICAgICAgICgtW1dlYkFWUGxheWVyTGF5ZXIgaW5pdF0pOgorICAgICAgICAoLVtXZWJBVlBsYXll ckxheWVyIGxheW91dFN1YmxheWVyc10pOgorICAgICAgICAoLVtXZWJBVlBsYXllckxheWVyIHJl c29sdmVCb3VuZHNdKToKKyAgICAgICAgKC1bV2ViQVZQbGF5ZXJMYXllciBzZXRWaWRlb0dyYXZp dHk6XSk6CisKIDIwMjAtMDctMTQgIENsYXJrIFdhbmcgIDxjbGFya193YW5nQGFwcGxlLmNvbT4K IAogICAgICAgICBVcGRhdGVkIEF1ZGlvQ29udGV4dCBjb25zdHJ1Y3RvciBhY2NvcmRpbmcgdG8g c3BlYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVvRnVsbHNj cmVlbkludGVyZmFjZUFWS2l0Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1ZpZGVv RnVsbHNjcmVlbkludGVyZmFjZUFWS2l0Lm1tCmluZGV4IGJkZTU3MDQwNTVjYWQ3ODVkZjRlODcz YjFlOTU3MGJiMTRjOGFlYjAuLmIxODYxMzk5ZDg2ZDJmNDc5MjNkOTUyNDRkOGMxZDY4OWYzZDY3 MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9WaWRlb0Z1bGxzY3Jl ZW5JbnRlcmZhY2VBVktpdC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvVmlk ZW9GdWxsc2NyZWVuSW50ZXJmYWNlQVZLaXQubW0KQEAgLTIwMiw3ICsyMDIsOSBAQCBAaW1wbGVt ZW50YXRpb24gV2ViQVZQbGF5ZXJMYXllciB7CiAgICAgUmVmUHRyPFZpZGVvRnVsbHNjcmVlbklu dGVyZmFjZUFWS2l0PiBfZnVsbHNjcmVlbkludGVyZmFjZTsKICAgICBSZXRhaW5QdHI8V2ViQVZQ bGF5ZXJDb250cm9sbGVyPiBfYXZQbGF5ZXJDb250cm9sbGVyOwogICAgIFJldGFpblB0cjxDQUxh eWVyPiBfdmlkZW9TdWJsYXllcjsKKyAgICBGbG9hdFJlY3QgX3ZpZGVvU3VibGF5ZXJGcmFtZTsK ICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF92aWRlb0dyYXZpdHk7CisgICAgUmV0YWluUHRyPE5T U3RyaW5nPiBfcHJldmlvdXNWaWRlb0dyYXZpdHk7CiB9CiAKIC0gKGluc3RhbmNldHlwZSlpbml0 CkBAIC0yMTIsNiArMjE0LDcgQEAgLSAoaW5zdGFuY2V0eXBlKWluaXQKICAgICAgICAgc2VsZi5t YXNrc1RvQm91bmRzID0gWUVTOwogICAgICAgICBzZWxmLmFsbG93c0hpdFRlc3RpbmcgPSBOTzsK ICAgICAgICAgX3ZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3Q7 CisgICAgICAgIF9wcmV2aW91c1ZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNp emVBc3BlY3Q7CiAgICAgfQogICAgIHJldHVybiBzZWxmOwogfQpAQCAtMjcwLDI3ICsyNzMsMzQg QEAgLSAodm9pZClsYXlvdXRTdWJsYXllcnMKICAgICBGbG9hdFJlY3Qgc291cmNlVmlkZW9GcmFt ZTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0VmlkZW9GcmFtZTsKICAgICBmbG9hdCB2aWRlb0FzcGVj dFJhdGlvID0gc2VsZi52aWRlb0RpbWVuc2lvbnMud2lkdGggLyBzZWxmLnZpZGVvRGltZW5zaW9u cy5oZWlnaHQ7Ci0gICAgCi0gICAgaWYgKFtBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplIGlzRXF1 YWxUb1N0cmluZzpzZWxmLnZpZGVvR3Jhdml0eV0pIHsKKworICAgIGlmIChbQVZMYXllclZpZGVv R3Jhdml0eVJlc2l6ZSBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5LmdldCgp XSkKICAgICAgICAgc291cmNlVmlkZW9GcmFtZSA9IHNlbGYubW9kZWxWaWRlb0xheWVyRnJhbWU7 Ci0gICAgICAgIHRhcmdldFZpZGVvRnJhbWUgPSBzZWxmLmJvdW5kczsKLSAgICB9IGVsc2UgaWYg KFtBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0IGlzRXF1YWxUb1N0cmluZzpzZWxmLnZp ZGVvR3Jhdml0eV0pIHsKKyAgICBlbHNlIGlmIChbQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFz cGVjdCBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5LmdldCgpXSkKICAgICAg ICAgc291cmNlVmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVj dCh2aWRlb0FzcGVjdFJhdGlvLCBzZWxmLm1vZGVsVmlkZW9MYXllckZyYW1lKTsKLSAgICAgICAg dGFyZ2V0VmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5zaWRlUmVjdCh2 aWRlb0FzcGVjdFJhdGlvLCBzZWxmLmJvdW5kcyk7Ci0gICAgfSBlbHNlIGlmIChbQVZMYXllclZp ZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdEZpbGwgaXNFcXVhbFRvU3RyaW5nOnNlbGYudmlkZW9HcmF2 aXR5XSkgeworICAgIGVsc2UgaWYgKFtBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0Rmls bCBpc0VxdWFsVG9TdHJpbmc6X3ByZXZpb3VzVmlkZW9HcmF2aXR5LmdldCgpXSkKICAgICAgICAg c291cmNlVmlkZW9GcmFtZSA9IHNtYWxsZXN0UmVjdFdpdGhBc3BlY3RSYXRpb0Fyb3VuZFJlY3Qo dmlkZW9Bc3BlY3RSYXRpbywgc2VsZi5tb2RlbFZpZGVvTGF5ZXJGcmFtZSk7CisgICAgZWxzZQor ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKworICAgIGlmIChbQVZMYXllclZpZGVvR3Jh dml0eVJlc2l6ZSBpc0VxdWFsVG9TdHJpbmc6c2VsZi52aWRlb0dyYXZpdHldKQorICAgICAgICB0 YXJnZXRWaWRlb0ZyYW1lID0gc2VsZi5ib3VuZHM7CisgICAgZWxzZSBpZiAoW0FWTGF5ZXJWaWRl b0dyYXZpdHlSZXNpemVBc3BlY3QgaXNFcXVhbFRvU3RyaW5nOnNlbGYudmlkZW9HcmF2aXR5XSkK KyAgICAgICAgdGFyZ2V0VmlkZW9GcmFtZSA9IGxhcmdlc3RSZWN0V2l0aEFzcGVjdFJhdGlvSW5z aWRlUmVjdCh2aWRlb0FzcGVjdFJhdGlvLCBzZWxmLmJvdW5kcyk7CisgICAgZWxzZSBpZiAoW0FW TGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3RGaWxsIGlzRXF1YWxUb1N0cmluZzpzZWxmLnZp ZGVvR3Jhdml0eV0pCiAgICAgICAgIHRhcmdldFZpZGVvRnJhbWUgPSBzbWFsbGVzdFJlY3RXaXRo QXNwZWN0UmF0aW9Bcm91bmRSZWN0KHZpZGVvQXNwZWN0UmF0aW8sIHNlbGYuYm91bmRzKTsKLSAg ICB9IGVsc2UKKyAgICBlbHNlCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAg VUlWaWV3ICp2aWV3ID0gKFVJVmlldyAqKVtfdmlkZW9TdWJsYXllciBkZWxlZ2F0ZV07CiAgICAg Q0dBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtID0gQ0dBZmZpbmVUcmFuc2Zvcm1NYWtlU2NhbGUo dGFyZ2V0VmlkZW9GcmFtZS53aWR0aCgpIC8gc291cmNlVmlkZW9GcmFtZS53aWR0aCgpLCB0YXJn ZXRWaWRlb0ZyYW1lLmhlaWdodCgpIC8gc291cmNlVmlkZW9GcmFtZS5oZWlnaHQoKSk7CiAgICAg W3ZpZXcgc2V0VHJhbnNmb3JtOnRyYW5zZm9ybV07Ci0gICAgCisKICAgICBOU1RpbWVJbnRlcnZh bCBhbmltYXRpb25EdXJhdGlvbiA9IFtDQVRyYW5zYWN0aW9uIGFuaW1hdGlvbkR1cmF0aW9uXTsK ICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewogICAgICAg ICBbTlNPYmplY3QgY2FuY2VsUHJldmlvdXNQZXJmb3JtUmVxdWVzdHNXaXRoVGFyZ2V0OnNlbGYg c2VsZWN0b3I6QHNlbGVjdG9yKHJlc29sdmVCb3VuZHMpIG9iamVjdDpuaWxdOwogCisgICAgICAg IF92aWRlb1N1YmxheWVyRnJhbWUgPSB0YXJnZXRWaWRlb0ZyYW1lOwogICAgICAgICBbc2VsZiBw ZXJmb3JtU2VsZWN0b3I6QHNlbGVjdG9yKHJlc29sdmVCb3VuZHMpIHdpdGhPYmplY3Q6bmlsIGFm dGVyRGVsYXk6YW5pbWF0aW9uRHVyYXRpb24gKyAwLjFdOwogICAgIH0pOwogfQpAQCAtMzE0LDcg KzMyNCw5IEBAIC0gKHZvaWQpcmVzb2x2ZUJvdW5kcwogICAgIGlmICghQ0dSZWN0RXF1YWxUb1Jl Y3Qoc2VsZi5tb2RlbFZpZGVvTGF5ZXJGcmFtZSwgW3NlbGYgYm91bmRzXSkpIHsKICAgICAgICAg c2VsZi5tb2RlbFZpZGVvTGF5ZXJGcmFtZSA9IFtzZWxmIGJvdW5kc107CiAgICAgICAgIGlmIChh dXRvKiBtb2RlbCA9IF9mdWxsc2NyZWVuSW50ZXJmYWNlLT52aWRlb0Z1bGxzY3JlZW5Nb2RlbCgp KQotICAgICAgICAgICAgbW9kZWwtPnNldFZpZGVvTGF5ZXJGcmFtZShzZWxmLm1vZGVsVmlkZW9M YXllckZyYW1lKTsKKyAgICAgICAgICAgIG1vZGVsLT5zZXRWaWRlb0xheWVyRnJhbWUoX3ZpZGVv U3VibGF5ZXJGcmFtZSk7CisKKyAgICAgICAgX3ByZXZpb3VzVmlkZW9HcmF2aXR5ID0gX3ZpZGVv R3Jhdml0eTsKICAgICB9CiAgICAgWyhVSVZpZXcgKilbX3ZpZGVvU3VibGF5ZXIgZGVsZWdhdGVd IHNldFRyYW5zZm9ybTpDR0FmZmluZVRyYW5zZm9ybUlkZW50aXR5XTsKICAgICAKQEAgLTMyOSw4 ICszNDEsMTIgQEAgLSAodm9pZClzZXRWaWRlb0dyYXZpdHk6KE5TU3RyaW5nICopdmlkZW9HcmF2 aXR5CiAgICAgICAgIHZpZGVvR3Jhdml0eSA9IEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3Bl Y3Q7CiAjZW5kaWYKIAorICAgIGlmIChbX3ZpZGVvR3Jhdml0eS5nZXQoKSBpc0VxdWFsVG9TdHJp bmc6dmlkZW9HcmF2aXR5XSkKKyAgICAgICAgcmV0dXJuOworCisgICAgX3ByZXZpb3VzVmlkZW9H cmF2aXR5ID0gX3ZpZGVvR3Jhdml0eTsKICAgICBfdmlkZW9HcmF2aXR5ID0gdmlkZW9HcmF2aXR5 OwotICAgIAorCiAgICAgaWYgKCFbX2F2UGxheWVyQ29udHJvbGxlciBkZWxlZ2F0ZV0pCiAgICAg ICAgIHJldHVybjsKIAo=