236822 2022-02-17 18:58:29 -0800 Client-set minimum effective device width is not respected if AllowViewportShrinkToFitContent is enabled 2022-02-18 12:24:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton hi megan_gardner webkit-bug-importer wenson_hsieh oldest_to_newest 1843239 0 thorton 2022-02-17 18:58:29 -0800 Client-set minimum effective device width is not respected if AllowViewportShrinkToFitContent is enabled 1843244 1 452469 thorton 2022-02-17 19:12:28 -0800 Created attachment 452469 Patch 1843553 2 ews-feeder 2022-02-18 12:23:15 -0800 Committed r290151 (247490@main): <https://commits.webkit.org/247490@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452469. 1843554 3 webkit-bug-importer 2022-02-18 12:24:16 -0800 <rdar://problem/89159947> 452469 2022-02-17 19:12:28 -0800 2022-02-18 12:23:17 -0800 Patch bug-236822-20220217191227.patch text/plain 14043 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5OTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjE5NjQ4OTc3ZTNmNWEz ZjZkNDc2NDFhMzE1Y2Y3YWU2YWJjNzI3OC4uMmUwNzliODVmZjNhOTIzNjAzMmE5Yzk1ZDBlNDhi NDAyNDk5YTczZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDIyLTAyLTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIENsaWVudC1zZXQg bWluaW11bSBlZmZlY3RpdmUgZGV2aWNlIHdpZHRoIGlzIG5vdCByZXNwZWN0ZWQgaWYgQWxsb3dW aWV3cG9ydFNocmlua1RvRml0Q29udGVudCBpcyBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY4MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZXcgdGVzdDogZmFzdC92aWV3cG9ydC9pb3Mv c2hyaW5rLXRvLWZpdC1jb250ZW50LXdpdGgtd2lkZXItbWluaW11bS1kZXZpY2Utd2lkdGguaHRt bAorCisgICAgICAgIFJlLWluc3RhdGUgdGhlIGZ1bmN0aW9uYWxpdHkgb2YgLVtXS1dlYlZpZXcg X3NldE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aDpdCisgICAgICAgIGFmdGVyIGl0IHdhcyBp bnRlbnRpb25hbGx5IGJyb2tlbiBpbiBmYXZvciBvZiBzaHJpbmstdG8tZml0IGluIHIyNDQ4NDku CisKKyAgICAgICAgSXQgdHVybnMgb3V0IHRoYXQgY2xpZW50cyBzb21ldGltZXMgbmVlZCBhIGxh cmdlciBtYW51YWxseS1zZXQgbWluaW11bQorICAgICAgICB0aGFuIHRoZSBvbmUgc2hyaW5rLXRv LWZpdCB3aWxsIGNob29zZSwgc28gaW5zdGVhZCBvZiBwaWNraW5nIGJldHdlZW4KKyAgICAgICAg dGhlbSwgd2UganVzdCB0YWtlIHRoZSBtYXhpbXVtIG9mIHRoZSB0d28uCisKKyAgICAgICAgKiBw YWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWaWV3cG9y dENvbmZpZ3VyYXRpb246OnNldFZpZXdMYXlvdXRTaXplKToKKyAgICAgICAgUmVuYW1lIHRoZSBj bGllbnQtc2V0IG1FRFcgdG8gYG1fbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yVmlld2Au CisKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bmF0aXZlV2VicGFn ZVBhcmFtZXRlcnMpOgorICAgICAgICAoV2ViQ29yZTo6Vmlld3BvcnRDb25maWd1cmF0aW9uOjpz ZXRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdCk6CisgICAgICAgIFJl bmFtZSB0byBzaG91bGRJZ25vcmVNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtU b0ZpdCB0byBiZSBjbGVhciB0aGF0CisgICAgICAgIGl0J3Mgb25seSBhYm91dCBpZ25vcmluZyB0 aGUgc2hyaW5rLXRvLWZpdCBtRURXLCBub3QgdGhlIGNsaWVudC1zZXQgb25lLgorCisgICAgICAg IFJlbmFtZSB0aGUgc2hyaW5rLXRvLWZpdC1zZXQgbUVEVyB0byBgbV9taW5pbXVtRWZmZWN0aXZl RGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdGAuCisKKyAgICAgICAgKFdlYkNvcmU6OlZpZXdwb3J0 Q29uZmlndXJhdGlvbjo6ZGVzY3JpcHRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Vmll d3BvcnRDb25maWd1cmF0aW9uOjpzZXRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgpOiBEZWxl dGVkLgorICAgICAgICAqIHBhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmg6CisgICAgICAgIChX ZWJDb3JlOjpWaWV3cG9ydENvbmZpZ3VyYXRpb246Om1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0 aCBjb25zdCk6CisgICAgICAgIFRoZSBlZmZlY3RpdmUtbUVEVyBub3cgdGFrZXMgdGhlIGNsaWVu dC1zZXQgdmFsdWUgaW50byBhY2NvdW50IGluIGFsbCBjYXNlcywKKyAgICAgICAgdGFraW5nIHRo ZSBtYXhpbXVtLW9mLW1pbmltdW1zIGFzIHRoZSBlZmZlY3RpdmUgdmFsdWUuCisKKyAgICAgICAg KFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2hvdWxkSWdub3JlTWluaW11bUVmZmVj dGl2ZURldmljZVdpZHRoRm9yU2hyaW5rVG9GaXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 Vmlld3BvcnRDb25maWd1cmF0aW9uOjpzaG91bGRJZ25vcmVNaW5pbXVtRWZmZWN0aXZlRGV2aWNl V2lkdGggY29uc3QpOiBEZWxldGVkLgorCiAyMDIyLTAyLTE2ICBBZHJpYW4gUGVyZXogZGUgQ2Fz dHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0NNYWtlXSBDYW5ub3QgZmluZCBP cGVuR0wgd2hlbiBzeXN0ZW0gcHJvdmlkZXMgb3BlbmdsLnBjIGluc3RlYWQgb2YgZ2wucGMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggOGNlOTIzMGRkM2E1Mzg0NGRlMDI0OGU5NWEzYTg4MThlMTZlNjY3Zi4uMWM3M2I1 ZGQ5YWMzNDRjYTZlNWFiZjFhOThkMDBkODIwYWM5MTJjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAyMi0wMi0xNyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4K KworICAgICAgICBDbGllbnQtc2V0IG1pbmltdW0gZWZmZWN0aXZlIGRldmljZSB3aWR0aCBpcyBu b3QgcmVzcGVjdGVkIGlmIEFsbG93Vmlld3BvcnRTaHJpbmtUb0ZpdENvbnRlbnQgaXMgZW5hYmxl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2ODIy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnNldFZpZXdwb3J0Q29uZmlndXJhdGlvblZpZXdMYXlvdXRTaXplKToKKyAgICAgICAgUmVz ZXQgdGhlIHNlcGFyYXRlIHNocmluay10by1maXQgbUVEVyBpZiBzaHJpbmstdG8tZml0IGlzIG5v dCBlbmdhZ2VkLgorCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNocmlua1RvRml0Q29udGVu dCk6CisKIDIwMjItMDItMTYgIEFkcmlhbiBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlh LmNvbT4KIAogICAgICAgICBbQ01ha2VdIENhbm5vdCBmaW5kIE9wZW5HTCB3aGVuIHN5c3RlbSBw cm92aWRlcyBvcGVuZ2wucGMgaW5zdGVhZCBvZiBnbC5wYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IGRjNDA2MDZkZWJjNjQxOWIxOTZjZGFi NjU0NWFlZGI4Njk4MzgwMTQuLmEyMTlhMDQzYmU2MmU0YzgwMzUxMWJlOThkMWI5MmEwODcyZDUw OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlvbi5jcHAK QEAgLTEyMywxNiArMTIzLDE2IEBAIGJvb2wgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRDb250 ZW50c1NpemUoY29uc3QgSW50U2l6ZSYgY29udGVudFNpemUpCiAgICAgcmV0dXJuIHRydWU7CiB9 CiAKLWJvb2wgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRWaWV3TGF5b3V0U2l6ZShjb25zdCBG bG9hdFNpemUmIHZpZXdMYXlvdXRTaXplLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJiBzY2FsZUZh Y3Rvciwgc3RkOjpvcHRpb25hbDxkb3VibGU+JiYgbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRo KQorYm9vbCBWaWV3cG9ydENvbmZpZ3VyYXRpb246OnNldFZpZXdMYXlvdXRTaXplKGNvbnN0IEZs b2F0U2l6ZSYgdmlld0xheW91dFNpemUsIHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiYmIHNjYWxlRmFj dG9yLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJiBtaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhG cm9tQ2xpZW50KQogewogICAgIGRvdWJsZSBuZXdTY2FsZUZhY3RvciA9IHNjYWxlRmFjdG9yLnZh bHVlX29yKG1fbGF5b3V0U2l6ZVNjYWxlRmFjdG9yKTsKLSAgICBkb3VibGUgbmV3RWZmZWN0aXZl V2lkdGggPSBtaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgudmFsdWVfb3IobV9taW5pbXVtRWZm ZWN0aXZlRGV2aWNlV2lkdGgpOwotICAgIGlmIChtX3ZpZXdMYXlvdXRTaXplID09IHZpZXdMYXlv dXRTaXplICYmIG1fbGF5b3V0U2l6ZVNjYWxlRmFjdG9yID09IG5ld1NjYWxlRmFjdG9yICYmIG5l d0VmZmVjdGl2ZVdpZHRoID09IG1fbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoKQorICAgIGRv dWJsZSBuZXdFZmZlY3RpdmVXaWR0aCA9IG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aEZyb21D bGllbnQudmFsdWVfb3IobV9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JWaWV3KTsKKyAg ICBpZiAobV92aWV3TGF5b3V0U2l6ZSA9PSB2aWV3TGF5b3V0U2l6ZSAmJiBtX2xheW91dFNpemVT Y2FsZUZhY3RvciA9PSBuZXdTY2FsZUZhY3RvciAmJiBuZXdFZmZlY3RpdmVXaWR0aCA9PSBtX21p bmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aEZvclZpZXcpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIG1fbGF5b3V0U2l6ZVNjYWxlRmFjdG9yID0gbmV3U2NhbGVGYWN0b3I7CiAgICAgbV92 aWV3TGF5b3V0U2l6ZSA9IHZpZXdMYXlvdXRTaXplOwotICAgIG1fbWluaW11bUVmZmVjdGl2ZURl dmljZVdpZHRoID0gbmV3RWZmZWN0aXZlV2lkdGg7CisgICAgbV9taW5pbXVtRWZmZWN0aXZlRGV2 aWNlV2lkdGhGb3JWaWV3ID0gbmV3RWZmZWN0aXZlV2lkdGg7CiAKICAgICB1cGRhdGVNaW5pbXVt TGF5b3V0U2l6ZSgpOwogICAgIHVwZGF0ZUNvbmZpZ3VyYXRpb24oKTsKQEAgLTM1Niw3ICszNTYs NyBAQCBib29sIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6YWxsb3dzVXNlclNjYWxpbmdJZ25vcmlu Z0Fsd2F5c1NjYWxhYmxlKCkgY29uc3QKIAogVmlld3BvcnRDb25maWd1cmF0aW9uOjpQYXJhbWV0 ZXJzIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6bmF0aXZlV2VicGFnZVBhcmFtZXRlcnMoKQogewot ICAgIGlmIChtX2Nhbklnbm9yZVNjYWxpbmdDb25zdHJhaW50cyB8fCAhc2hvdWxkSWdub3JlTWlu aW11bUVmZmVjdGl2ZURldmljZVdpZHRoKCkpCisgICAgaWYgKG1fY2FuSWdub3JlU2NhbGluZ0Nv bnN0cmFpbnRzIHx8ICFzaG91bGRJZ25vcmVNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JT aHJpbmtUb0ZpdCgpKQogICAgICAgICByZXR1cm4gVmlld3BvcnRDb25maWd1cmF0aW9uOjpuYXRp dmVXZWJwYWdlUGFyYW1ldGVyc1dpdGhTaHJpbmtUb0ZpdCgpOwogCiAgICAgcmV0dXJuIFZpZXdw b3J0Q29uZmlndXJhdGlvbjo6bmF0aXZlV2VicGFnZVBhcmFtZXRlcnNXaXRob3V0U2hyaW5rVG9G aXQoKTsKQEAgLTYxOCwxNCArNjE4LDE0IEBAIGludCBWaWV3cG9ydENvbmZpZ3VyYXRpb246Omxh eW91dEhlaWdodCgpIGNvbnN0CiAgICAgcmV0dXJuIG1pbmltdW1MYXlvdXRTaXplLmhlaWdodCgp OwogfQogCi1ib29sIFZpZXdwb3J0Q29uZmlndXJhdGlvbjo6c2V0TWluaW11bUVmZmVjdGl2ZURl dmljZVdpZHRoKGRvdWJsZSB3aWR0aCkKK2Jvb2wgVmlld3BvcnRDb25maWd1cmF0aW9uOjpzZXRN aW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdChkb3VibGUgd2lkdGgpCiB7 Ci0gICAgaWYgKFdURjo6YXJlRXNzZW50aWFsbHlFcXVhbChtX21pbmltdW1FZmZlY3RpdmVEZXZp Y2VXaWR0aCwgd2lkdGgpKQorICAgIGlmIChXVEY6OmFyZUVzc2VudGlhbGx5RXF1YWwobV9taW5p bXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdCwgd2lkdGgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBtX21pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCA9IHdpZHRo OworICAgIG1fbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yU2hyaW5rVG9GaXQgPSB3aWR0 aDsKIAotICAgIGlmIChzaG91bGRJZ25vcmVNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgoKSkK KyAgICBpZiAoc2hvdWxkSWdub3JlTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yU2hyaW5r VG9GaXQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgdXBkYXRlTWluaW11bUxheW91 dFNpemUoKTsKQEAgLTcyMSw3ICs3MjEsOCBAQCBTdHJpbmcgVmlld3BvcnRDb25maWd1cmF0aW9u OjpkZXNjcmlwdGlvbigpIGNvbnN0CiAgICAgdHMuZHVtcFByb3BlcnR5KCJpZ25vcmluZyBob3Jp em9udGFsIHNjYWxpbmcgY29uc3RyYWludHMiLCBzaG91bGRJZ25vcmVIb3Jpem9udGFsU2NhbGlu Z0NvbnN0cmFpbnRzKCkgPyAidHJ1ZSIgOiAiZmFsc2UiKTsKICAgICB0cy5kdW1wUHJvcGVydHko Imlnbm9yaW5nIHZlcnRpY2FsIHNjYWxpbmcgY29uc3RyYWludHMiLCBzaG91bGRJZ25vcmVWZXJ0 aWNhbFNjYWxpbmdDb25zdHJhaW50cygpID8gInRydWUiIDogImZhbHNlIik7CiAgICAgdHMuZHVt cFByb3BlcnR5KCJhdm9pZHMgdW5zYWZlIGFyZWEiLCBhdm9pZHNVbnNhZmVBcmVhKCkgPyAidHJ1 ZSIgOiAiZmFsc2UiKTsKLSAgICB0cy5kdW1wUHJvcGVydHkoIm1pbmltdW0gZWZmZWN0aXZlIGRl dmljZSB3aWR0aCIsIG1fbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoKTsKKyAgICB0cy5kdW1w UHJvcGVydHkoIm1pbmltdW0gZWZmZWN0aXZlIGRldmljZSB3aWR0aCAoZm9yIHZpZXcpIiwgbV9t aW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JWaWV3KTsKKyAgICB0cy5kdW1wUHJvcGVydHko Im1pbmltdW0gZWZmZWN0aXZlIGRldmljZSB3aWR0aCAoZm9yIHNocmluay10by1maXQpIiwgbV9t aW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdCk7CiAgICAgdHMuZHVtcFBy b3BlcnR5KCJrbm93biB0byBsYXkgb3V0IHdpZGVyIHRoYW4gdmlld3BvcnQiLCBtX2lzS25vd25U b0xheU91dFdpZGVyVGhhblZpZXdwb3J0ID8gInRydWUiIDogImZhbHNlIik7CiAgICAgCiAgICAg dHMuZW5kR3JvdXAoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVmlld3BvcnRD b25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1ZpZXdwb3J0Q29uZmlndXJhdGlv bi5oCmluZGV4IDE0NjM2MmM1MmFkMGRjMzFmODU4OGRkNGQzZTdhMzk4MWJkNTVjMjcuLjg4YzBi MzEwNTU0MTM0YTFiMjhiODNkNzc0NTNmN2RmM2YxZGM3YzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvVmlld3BvcnRDb25maWd1cmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9WaWV3cG9ydENvbmZpZ3VyYXRpb24uaApAQCAtODksMTggKzg5LDIxIEBAIHB1YmxpYzoK ICAgICBjb25zdGV4cHIgYm9vbCBjYW5JZ25vcmVTY2FsaW5nQ29uc3RyYWludHMoKSBjb25zdCB7 IHJldHVybiBtX2Nhbklnbm9yZVNjYWxpbmdDb25zdHJhaW50czsgfQogCiAgICAgV0VCQ09SRV9F WFBPUlQgYm9vbCBzZXRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhXaGVuSWdub3JpbmdTY2Fs aW5nQ29uc3RyYWludHMoZG91YmxlKTsKLSAgICBXRUJDT1JFX0VYUE9SVCBib29sIHNldE1pbmlt dW1FZmZlY3RpdmVEZXZpY2VXaWR0aChkb3VibGUpOworICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wg c2V0TWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yU2hyaW5rVG9GaXQoZG91YmxlKTsKICAg ICBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCgpIGNvbnN0CiAg ICAgewotICAgICAgICBpZiAoc2hvdWxkSWdub3JlTWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRo KCkpCi0gICAgICAgICAgICByZXR1cm4gMDsKLSAgICAgICAgcmV0dXJuIG1fY2FuSWdub3JlU2Nh bGluZ0NvbnN0cmFpbnRzID8gbV9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhXaGVuSWdub3Jp bmdTY2FsaW5nQ29uc3RyYWludHMgOiBtX21pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aDsKKyAg ICAgICAgZG91YmxlIG1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCA9IG1fbWluaW11bUVmZmVj dGl2ZURldmljZVdpZHRoRm9yVmlldzsKKworICAgICAgICBpZiAoIXNob3VsZElnbm9yZU1pbmlt dW1FZmZlY3RpdmVEZXZpY2VXaWR0aEZvclNocmlua1RvRml0KCkpCisgICAgICAgICAgICBtaW5p bXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggPSBzdGQ6Om1heChtaW5pbXVtRWZmZWN0aXZlRGV2aWNl V2lkdGgsIG1fY2FuSWdub3JlU2NhbGluZ0NvbnN0cmFpbnRzID8gbV9taW5pbXVtRWZmZWN0aXZl RGV2aWNlV2lkdGhXaGVuSWdub3JpbmdTY2FsaW5nQ29uc3RyYWludHMgOiBtX21pbmltdW1FZmZl Y3RpdmVEZXZpY2VXaWR0aEZvclNocmlua1RvRml0KTsKKworICAgICAgICByZXR1cm4gbWluaW11 bUVmZmVjdGl2ZURldmljZVdpZHRoOwogICAgIH0KIAogICAgIGNvbnN0ZXhwciBib29sIGlzS25v d25Ub0xheU91dFdpZGVyVGhhblZpZXdwb3J0KCkgY29uc3QgeyByZXR1cm4gbV9pc0tub3duVG9M YXlPdXRXaWRlclRoYW5WaWV3cG9ydDsgfQogICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgc2V0SXNL bm93blRvTGF5T3V0V2lkZXJUaGFuVmlld3BvcnQoYm9vbCB2YWx1ZSk7CiAKLSAgICBjb25zdGV4 cHIgYm9vbCBzaG91bGRJZ25vcmVNaW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGgoKSBjb25zdAor ICAgIGNvbnN0ZXhwciBib29sIHNob3VsZElnbm9yZU1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0 aEZvclNocmlua1RvRml0KCkgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChzaG91bGRTaHJpbmtU b0ZpdE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aFdoZW5JZ25vcmluZ1NjYWxpbmdDb25zdHJh aW50cygpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjAwLDcgKzIwMyw4IEBAIHBy aXZhdGU6CiAgICAgT3B0aW9uU2V0PERpc2FibGVkQWRhcHRhdGlvbnM+IG1fZGlzYWJsZWRBZGFw dGF0aW9uczsKIAogICAgIGRvdWJsZSBtX2xheW91dFNpemVTY2FsZUZhY3RvciB7IDEgfTsKLSAg ICBkb3VibGUgbV9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGggeyAwIH07CisgICAgZG91Ymxl IG1fbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yVmlldyB7IDAgfTsKKyAgICBkb3VibGUg bV9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhGb3JTaHJpbmtUb0ZpdCB7IDAgfTsKICAgICBk b3VibGUgbV9taW5pbXVtRWZmZWN0aXZlRGV2aWNlV2lkdGhXaGVuSWdub3JpbmdTY2FsaW5nQ29u c3RyYWludHMgeyAwIH07CiAgICAgYm9vbCBtX2Nhbklnbm9yZVNjYWxpbmdDb25zdHJhaW50czsK ICAgICBib29sIG1fZm9yY2VBbHdheXNVc2VyU2NhbGFibGU7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IDg1NDQzZmM2YTk3 MDU5NDgyMjJmMTA3NTFiMmMxMzhjZWYwNmMxYWYuLmFmNzY5ZmY0ZDk1Njk0NThkNjkzZmU1MWZm YjUwNTAxMjQ1MTdlYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0zNTQzLDkgKzM1NDMsMTEgQEAgdm9pZCBXZWJQYWdl OjpzZXRWaWV3cG9ydENvbmZpZ3VyYXRpb25WaWV3TGF5b3V0U2l6ZShjb25zdCBGbG9hdFNpemUm IHNpemUsIGRvdWIKIHsKICAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0g PDwgIldlYlBhZ2UgIiA8PCBtX2lkZW50aWZpZXIgPDwgIiBzZXRWaWV3cG9ydENvbmZpZ3VyYXRp b25WaWV3TGF5b3V0U2l6ZSAiIDw8IHNpemUgPDwgIiBzY2FsZUZhY3RvciAiIDw8IHNjYWxlRmFj dG9yIDw8ICIgbWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoICIgPDwgbWluaW11bUVmZmVjdGl2 ZURldmljZVdpZHRoKTsKIAorICAgIGlmICghbV92aWV3cG9ydENvbmZpZ3VyYXRpb24uaXNLbm93 blRvTGF5T3V0V2lkZXJUaGFuVmlld3BvcnQoKSkKKyAgICAgICAgbV92aWV3cG9ydENvbmZpZ3Vy YXRpb24uc2V0TWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoRm9yU2hyaW5rVG9GaXQoMCk7CisK ICAgICBhdXRvIHByZXZpb3VzTGF5b3V0U2l6ZVNjYWxlRmFjdG9yID0gbV92aWV3cG9ydENvbmZp Z3VyYXRpb24ubGF5b3V0U2l6ZVNjYWxlRmFjdG9yKCk7Ci0gICAgYXV0byBjbGFtcGVkTWluaW11 bUVmZmVjdGl2ZURldmljZSA9IG1fdmlld3BvcnRDb25maWd1cmF0aW9uLmlzS25vd25Ub0xheU91 dFdpZGVyVGhhblZpZXdwb3J0KCkgPyBzdGQ6Om51bGxvcHQgOiBzdGQ6Om9wdGlvbmFsPGRvdWJs ZT4obWluaW11bUVmZmVjdGl2ZURldmljZVdpZHRoKTsKLSAgICBpZiAoIW1fdmlld3BvcnRDb25m aWd1cmF0aW9uLnNldFZpZXdMYXlvdXRTaXplKHNpemUsIHNjYWxlRmFjdG9yLCBXVEZNb3ZlKGNs YW1wZWRNaW5pbXVtRWZmZWN0aXZlRGV2aWNlKSkpCisgICAgaWYgKCFtX3ZpZXdwb3J0Q29uZmln dXJhdGlvbi5zZXRWaWV3TGF5b3V0U2l6ZShzaXplLCBzY2FsZUZhY3RvciwgbWluaW11bUVmZmVj dGl2ZURldmljZVdpZHRoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byB6b29tVG9Jbml0 aWFsU2NhbGUgPSBab29tVG9Jbml0aWFsU2NhbGU6Ok5vOwpAQCAtMzg5Nyw3ICszODk5LDcgQEAg dm9pZCBXZWJQYWdlOjpzaHJpbmtUb0ZpdENvbnRlbnQoWm9vbVRvSW5pdGlhbFNjYWxlIHpvb21U b0luaXRpYWxTY2FsZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byBjaGFuZ2VNaW5pbXVt RWZmZWN0aXZlRGV2aWNlV2lkdGggPSBbdGhpcywgbWFpbkRvY3VtZW50XSAoaW50IHRhcmdldExh eW91dFdpZHRoKSAtPiBib29sIHsKLSAgICAgICAgaWYgKG1fdmlld3BvcnRDb25maWd1cmF0aW9u LnNldE1pbmltdW1FZmZlY3RpdmVEZXZpY2VXaWR0aCh0YXJnZXRMYXlvdXRXaWR0aCkpIHsKKyAg ICAgICAgaWYgKG1fdmlld3BvcnRDb25maWd1cmF0aW9uLnNldE1pbmltdW1FZmZlY3RpdmVEZXZp Y2VXaWR0aEZvclNocmlua1RvRml0KHRhcmdldExheW91dFdpZHRoKSkgewogICAgICAgICAgICAg dmlld3BvcnRDb25maWd1cmF0aW9uQ2hhbmdlZCgpOwogICAgICAgICAgICAgbWFpbkRvY3VtZW50 LT51cGRhdGVMYXlvdXQoKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC92aWV3cG9ydC9pb3Mvc2hyaW5rLXRvLWZpdC1jb250ZW50LXdpdGgt d2lkZXItbWluaW11bS1kZXZpY2Utd2lkdGgtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFz dC92aWV3cG9ydC9pb3Mvc2hyaW5rLXRvLWZpdC1jb250ZW50LXdpdGgtd2lkZXItbWluaW11bS1k ZXZpY2Utd2lkdGgtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ0MTdmNDA4YWE4NGIwMmI3NzE1 MzU1NDk4YjI2MjEzOTM2MTU5NjIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3ZpZXdwb3J0L2lvcy9zaHJpbmstdG8tZml0LWNvbnRlbnQtd2l0aC13aWRlci1taW5pbXVtLWRl dmljZS13aWR0aC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMSBAQAorVGhpcyB0ZXN0IHZlcmlm aWVzIHRoYXQgYSBwYWdlIHdpdGggYSBsYXJnZSBjbGllbnQtc2V0IG1pbmltdW0gZWZmZWN0aXZl IGRldmljZSB3aWR0aCwgbm8gdmlld3BvcnQsIGFuZCBjb250ZW50IGxhcmdlciB0aGFuIHRoZSBh Y3R1YWwgdmlldyB3aWR0aCBpcyBzY2FsZWQgdG8gZml0IHRoZSBjbGllbnQtc2V0IG1pbmltdW0g ZWZmZWN0aXZlIGRldmljZSB3aWR0aC4gVG8gdGVzdCBtYW51YWxseSwgbG9hZCB0aGUgcGFnZSBh bmQgdmVyaWZ5IHRoYXQgdGhlIGJhciBzcGFucyBoYWxmIHRoZSB3aWR0aCBvZiB0aGUgcGFnZS4K KworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywg Zm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgbWluU2NhbGUgaXMgZXhwZWN0 ZWRTY2FsZQorUEFTUyBpbm5lcldpZHRoIGJlY2FtZSAxNTAwCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC92aWV3cG9ydC9pb3Mvc2hyaW5rLXRvLWZpdC1jb250ZW50LXdpdGgtd2lkZXItbWluaW11 bS1kZXZpY2Utd2lkdGguaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvdmlld3BvcnQvaW9zL3Nocmlu ay10by1maXQtY29udGVudC13aXRoLXdpZGVyLW1pbmltdW0tZGV2aWNlLXdpZHRoLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMTkxMDYwMjk1Mzk1NmEwZTdiOGRjMTJmMGJjNGJkODQ2ZTk4YWI5OAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvdmlld3BvcnQvaW9zL3Nocmluay10by1maXQt Y29udGVudC13aXRoLXdpZGVyLW1pbmltdW0tZGV2aWNlLXdpZHRoLmh0bWwKQEAgLTAsMCArMSw0 NyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgU2hvdWxkSWdu b3JlTWV0YVZpZXdwb3J0PXRydWUgXSAtLT4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBuYW1lPSJ2 aWV3cG9ydCI+Cis8c3R5bGU+Citib2R5LCBodG1sIHsKKyAgICBtYXJnaW46IDA7CisgICAgd2lk dGg6IDEwMCU7CisgICAgaGVpZ2h0OiAxMDAlOworfQorCisjYmFyIHsKKyAgICB3aWR0aDogMTAw MHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgYmFja2dyb3VuZDogbGluZWFyLWdyYWRpZW50 KHRvIHJpZ2h0LCByZWQgMCUsIGdyZWVuIDUwJSwgYmx1ZSAxMDAlKTsKK30KKworI2Rlc2NyaXB0 aW9uIHsKKyAgICB3aWR0aDogMzAwcHg7CisgICAgb3ZlcmZsb3c6IHNjcm9sbDsKK30KKzwvc3R5 bGU+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0 PgorPHNjcmlwdD4KK2pzVGVzdElzQXN5bmMgPSB0cnVlOworCitkZXNjcmlwdGlvbigiVGhpcyB0 ZXN0IHZlcmlmaWVzIHRoYXQgYSBwYWdlIHdpdGggYSBsYXJnZSBjbGllbnQtc2V0IG1pbmltdW0g ZWZmZWN0aXZlIGRldmljZSB3aWR0aCwgbm8gdmlld3BvcnQsIGFuZCBjb250ZW50IGxhcmdlciB0 aGFuIHRoZSBhY3R1YWwgdmlldyB3aWR0aCBpcyBzY2FsZWQgdG8gZml0IHRoZSBjbGllbnQtc2V0 IG1pbmltdW0gZWZmZWN0aXZlIGRldmljZSB3aWR0aC4gVG8gdGVzdCBtYW51YWxseSwgbG9hZCB0 aGUgcGFnZSBhbmQgdmVyaWZ5IHRoYXQgdGhlIGJhciBzcGFucyBoYWxmIHRoZSB3aWR0aCBvZiB0 aGUgcGFnZS4iKTsKKworYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgpID0+IHsKKyAg ICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICByZXR1cm47CisKKyAgICBhd2FpdCBV SUhlbHBlci5zZXRNaW5pbXVtRWZmZWN0aXZlV2lkdGgoMTUwMCk7CisgICAgYXdhaXQgVUlIZWxw ZXIuZW5zdXJlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlKCk7CisgICAgbWluU2NhbGUgPSAoYXdh aXQgVUlIZWxwZXIubWluaW11bVpvb21TY2FsZSgpKS50b0ZpeGVkKDIpOworICAgIGV4cGVjdGVk U2NhbGUgPSAoc2NyZWVuLndpZHRoIC8gMTUwMCkudG9GaXhlZCgyKTsKKyAgICBzaG91bGRCZSgi bWluU2NhbGUiLCAiZXhwZWN0ZWRTY2FsZSIpOworICAgIHNob3VsZEJlY29tZUVxdWFsKCJpbm5l cldpZHRoIiwgIjE1MDAiLCBmaW5pc2hKU1Rlc3QpOworfSk7Cis8L3NjcmlwdD4KKzwvaGVhZD4K Kzxib2R5PgorPGRpdiBpZD0iYmFyIj48L2Rpdj4KKzxkaXYgaWQ9ImRlc2NyaXB0aW9uIj48L2Rp dj4KKzwvYm9keT4KKzwvaHRtbD4K