227178 2021-06-19 10:33:55 -0700 [watchOS] Automatically apply system minimum layout margins as scroll view content insets 2021-06-24 14:41:33 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1771101 0 wenson_hsieh 2021-06-19 10:33:55 -0700 rdar://76784095 1772388 1 432196 wenson_hsieh 2021-06-24 11:30:00 -0700 Created attachment 432196 Patch 1772444 2 432211 wenson_hsieh 2021-06-24 13:51:55 -0700 Created attachment 432211 Patch 1772446 3 432211 wenson_hsieh 2021-06-24 13:58:58 -0700 Comment on attachment 432211 Patch Thanks for the review! 1772461 4 ews-feeder 2021-06-24 14:41:32 -0700 Committed r279245 (239130@main): <https://commits.webkit.org/239130@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432211. 432196 2021-06-24 11:30:00 -0700 2021-06-24 13:51:53 -0700 Patch bug-227178-20210624113000.patch text/plain 11549 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YjdmZmUwMTAzZjUzMGQz YjcwYmFkMmJlN2Y2MzIyYjQ2MjlmZWMuLjViYmJkYzM0Yjc2Nzc2NGE5ZDNkZGYyOTA0NjgyM2M1 OTAzYzkxNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjQgQEAKKzIwMjEtMDYtMjQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW3dhdGNoT1NdIEF1dG9t YXRpY2FsbHkgYXBwbHkgc3lzdGVtIG1pbmltdW0gbGF5b3V0IG1hcmdpbnMgYXMgc2Nyb2xsIHZp ZXcgY29udGVudCBpbnNldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNzE3OAorICAgICAgICByZGFyOi8vNzY3ODQwOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0IGAtW1VJVmlld0NvbnRy b2xsZXIgc3lzdGVtTWluaW11bUxheW91dE1hcmdpbnNdYCBvbiB3YXRjaE9TIGJ5IHRyZWF0aW5n IHRoZW0gaW4gYSBzaW1pbGFyIHdheSBhcyBzYWZlCisgICAgICAgIGFyZWEgaW5zZXRzLCBzdWNo IHRoYXQgd2UgYXZvaWQgbGF5aW5nIG91dCBwYXJ0cyBvZiB0aGUgd2ViIHBhZ2Ugd2l0aGluIHRo ZXNlIG1hcmdpbnMgdW5sZXNzIHRoZSBwYWdlJ3MgbWV0YQorICAgICAgICB2aWV3cG9ydCBzcGVj aWZpZXMgYHZpZXdwb3J0LWZpdD1jb3ZlcmAuIE9uIGNlcnRhaW4gY29uZmlndXJhdGlvbnMgb2Yg d2F0Y2ggaGFyZHdhcmUsIGF2b2lkaW5nIHRoZXNlIGxheW91dAorICAgICAgICBtYXJnaW5zIGlz IGNydWNpYWwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06 CisgICAgICAgICgtW1dLV2ViVmlldyBfY29tcHV0ZWRPYnNjdXJlZEluc2V0Rm9yU2FmZUJyb3dz aW5nV2FybmluZ10pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2NvbnRlbnRJbnNldHNGcm9tU3lz dGVtTWluaW11bUxheW91dE1hcmdpbnNdKToKKworICAgICAgICBBZGQgYSBoZWxwZXIgbWV0aG9k IHRvIGNvbXB1dGUgdGhlIGFtb3VudCBvZiBhZGRpdGlvbmFsIGNvbnRlbnQgaW5zZXQgd2UgbmVl ZCB0byBhcHBseSB0byB0aGUgc2Nyb2xsIHZpZXcgaW4KKyAgICAgICAgb3JkZXIgZm9yIGNvbnRl bnQgdG8gZml0IHdpdGhpbiBXS1dlYlZpZXcncyB2aWV3IGNvbnRyb2xsZXIncyBgLXN5c3RlbU1p bmltdW1MYXlvdXRNYXJnaW5zYC4gTm90ZSB0aGF0IHRoaXMKKyAgICAgICAgYWNjb3VudHMgZm9y IGNhc2VzIHdoZXJlIHRoZSB3ZWIgdmlldydzIGZyYW1lIGlzIGFscmVhZHkgaW5zZXQgcmVsYXRp dmUgdG8gdGhlIHZpZXcgY29udHJvbGxlcidzIGNvbnRlbnQgdmlldy4KKworICAgICAgICAoLVtX S1dlYlZpZXcgX2NvbXB1dGVkT2JzY3VyZWRJbnNldF0pOgorICAgICAgICAoLVtXS1dlYlZpZXcg X2NvbXB1dGVkQ29udGVudEluc2V0XSk6CisKKyAgICAgICAgVW5jb25kaXRpb25hbGl6ZSBhIGZl dyBjb2RlcGF0aHMgdGhhdCBhcHBseSBvYnNjdXJlZCBhbmQgY29udGVudCBpbnNldHMgYnkgY29u c3VsdGluZworICAgICAgICBgLV9zY3JvbGxWaWV3U3lzdGVtQ29udGVudEluc2V0YC4KKworICAg ICAgICAoLVtXS1dlYlZpZXcgX2NvbXB1dGVkVW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRdKToKKwor ICAgICAgICBPbiB3YXRjaE9TLCB3ZSBhdWdtZW50IHNhZmUgYXJlYSBpbnNldHMsIHN1Y2ggdGhh dCB0aGV5IGluY2x1ZGUgYF9jb250ZW50SW5zZXRzRnJvbVN5c3RlbU1pbmltdW1MYXlvdXRNYXJn aW5zYAorICAgICAgICBhcyB3ZWxsLgorCisgICAgICAgICgtW1dLV2ViVmlldyBhY3RpdmVWaWV3 TGF5b3V0U2l6ZTpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVTY3JvbGxWaWV3Q29u dGVudEluc2V0c0lmTmVjZXNzYXJ5XSk6CisKKyAgICAgICAgQWRkIGEgaGVscGVyIG1ldGhvZCB0 aGF0IChvbiB3YXRjaE9TIG9ubHkpIHVwZGF0ZXMgV0tTY3JvbGxWaWV3J3MgY29udGVudCBzY3Jv bGwgaW5zZXRzIHN1Y2ggdGhhdCB0aGUgd2ViIHBhZ2UKKyAgICAgICAgZml0cyBpbnNpZGUgYC1z eXN0ZW1NaW5pbXVtTGF5b3V0TWFyZ2luc2AuIFNlZSBXS1Njcm9sbFZpZXcgY2hhbmdlcyBiZWxv dyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJs ZUNvbnRlbnRSZWN0c10pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3NldEF2b2lkc1Vuc2FmZUFy ZWE6XSk6CisKKyAgICAgICAgVXBkYXRlIHNjcm9sbCB2aWV3IGNvbnRlbnQgaW5zZXRzIG9uIHdh dGNoT1MgaWYgdGhlIGB2aWV3cG9ydC1maXRgIHN0YXRlIGNoYW5nZXMuIEFkZGl0aW9uYWxseSBt YWtlIHN1cmUgdGhhdCB3ZQorICAgICAgICBhbHNvIHVwZGF0ZSB0aGUgYWN0aXZlIGxheW91dCBz aXplIGlmIHRoZSBpbnNldHMgYWN0dWFsbHkgY2hhbmdlICh3aXRob3V0IHRoaXMgdHdlYWssIHdo ZW4gZHluYW1pY2FsbHkgYWRkaW5nCisgICAgICAgIGB2aWV3cG9ydC1maXQ9Y292ZXJgLCB3ZSds bCBlbmQgdXAgaW4gYSBzdGF0ZSB3aGVyZSB0aGUgY29udGVudCBzaXplIGlzIHN0aWxsIG5hcnJv dyB0byBhY2NvdW50IGZvciB0aGUgb2xkCisgICAgICAgIGNvbnRlbnQgc2Nyb2xsIGluc2V0cywg YnV0IHRoZSBuZXcgY29udGVudCBzY3JvbGwgaW5zZXRzIGFyZSBzZXQsIHNvIHRoZSB3ZWIgcGFn ZSBhcGVhcnMgbWlzYWxpZ25lZCByZWxhdGl2ZSB0bworICAgICAgICB0aGUgc2Nyb2xsIHZpZXcp LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3IF9z ZXRDb250ZW50U2Nyb2xsSW5zZXQ6XSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBfc2V0Q29u dGVudFNjcm9sbEluc2V0SW50ZXJuYWw6XSk6CisKKyAgICAgICAgQWRkIGFuIGludGVybmFsIG1l dGhvZCBmb3Igc2V0dGluZyBgLVtVSVNjcm9sbFZpZXcgX2NvbnRlbnRTY3JvbGxJbnNldF1gIHRo YXQgZGVmZXJzIHRvIHRoZSBlbWJlZGRpbmcgY2xpZW50LgorICAgICAgICBUaGlzIG1lYW5zIFdL V2ViVmlldyBjbGllbnRzIHRoYXQgdXNlIGB3ZWJWaWV3LnNjcm9sbFZpZXcuY29udGVudFNjcm9s bEluc2V0ID0gbXlJbnNldDtgIHdpbGwgb3ZlcnJpZGUgdGhlIGFib3ZlCisgICAgICAgIGJlaGF2 aW9yIGluIGAtX3VwZGF0ZVNjcm9sbFZpZXdDb250ZW50SW5zZXRzSWZOZWNlc3NhcnlgLCBidXQg b3RoZXJ3aXNlLCB0aGUgY29udGVudCBzY3JvbGwgaW5zZXRzIHdpbGwgYmUKKyAgICAgICAgYXV0 b21hdGljYWxseSBjb21wdXRlZCBhbmQgc2V0IGluIG9yZGVyIHRvIGF2b2lkIG1pbmltdW0gbGF5 b3V0IG1hcmdpbnMgaWYgbmVlZGVkLgorCisgICAgICAgIE5vdGUgdGhhdCB0aGlzIGFsc28gcmV0 dXJucyBhIGBCT09MYCBpbmRpY2F0aW5nIHdoZXRoZXIgdGhlIGluc2V0IHdhcyB1cGRhdGVkLgor CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBfdXBkYXRlQ29udGVudFNjcm9sbEluc2V0XSk6CisK IDIwMjEtMDYtMjMgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAg ICAgICAgQWRkIGEgZGVsZWdhdGUgU1BJIHRvIGFsbG93IGFyYml0cmFyeSBnZXN0dXJlcyB0byBp Z25vcmUgcHJldmVudERlZmF1bHQoKSB3aXRoIGFjdGl2ZSB0b3VjaCBldmVudHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KaW5kZXggYjhkZjEz NzU5MWJlYzU1YmU4MTRiYTY1YzliYjIyZmYyZTBiMDNkYS4uNWMxOGUxYzBiNDQ2YmNiMTlmNWE2 NTJhYjU2N2Q3Zjk0ZDdiYjYwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTU4MCwxMSArNTgwLDMzIEBAIC0gKFVJRWRnZUluc2V0 cylfY29tcHV0ZWRPYnNjdXJlZEluc2V0Rm9yU2FmZUJyb3dzaW5nV2FybmluZwogICAgIGlmIChf aGF2ZVNldE9ic2N1cmVkSW5zZXRzKQogICAgICAgICByZXR1cm4gX29ic2N1cmVkSW5zZXRzOwog Ci0jaWYgUExBVEZPUk0oSU9TKQogICAgIHJldHVybiBVSUVkZ2VJbnNldHNBZGQoVUlFZGdlSW5z ZXRzWmVybywgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJbnNldCwgc2VsZi5fZWZmZWN0 aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNhZmVBcmVhKTsKLSNlbHNlCit9CisKKy0g KFVJRWRnZUluc2V0cylfY29udGVudEluc2V0c0Zyb21TeXN0ZW1NaW5pbXVtTGF5b3V0TWFyZ2lu cworeworICAgIGlmIChhdXRvIGNvbnRyb2xsZXIgPSBbVUlWaWV3Q29udHJvbGxlciBfdmlld0Nv bnRyb2xsZXJGb3JGdWxsU2NyZWVuUHJlc2VudGF0aW9uRnJvbVZpZXc6c2VsZl0pIHsKKyAgICAg ICAgYXV0byBtYXJnaW5zID0gY29udHJvbGxlci5zeXN0ZW1NaW5pbXVtTGF5b3V0TWFyZ2luczsK KyAgICAgICAgYXV0byBpbnNldHMgPSBVSUVkZ2VJbnNldHNNYWtlKG1hcmdpbnMudG9wLCBtYXJn aW5zLmxlYWRpbmcsIG1hcmdpbnMuYm90dG9tLCBtYXJnaW5zLnRyYWlsaW5nKTsKKyAgICAgICAg aWYgKF9wYWdlICYmIF9wYWdlLT51c2VySW50ZXJmYWNlTGF5b3V0RGlyZWN0aW9uKCkgPT0gV2Vi Q29yZTo6VXNlckludGVyZmFjZUxheW91dERpcmVjdGlvbjo6UlRMKQorICAgICAgICAgICAgc3Rk Ojpzd2FwKGluc2V0cy5sZWZ0LCBpbnNldHMucmlnaHQpOworCisgICAgICAgIGlmIChhdXRvIHZp ZXcgPSBjb250cm9sbGVyLnZpZXdJZkxvYWRlZCkgeworICAgICAgICAgICAgYXV0byBhZGp1c3RJ bnNldEVkZ2UgPSBbXShDR0Zsb2F0JiBpbnNldEVkZ2UsIENHRmxvYXQgZGlzdGFuY2VGcm9tRWRn ZSkgeworICAgICAgICAgICAgICAgIGluc2V0RWRnZSAtPSBzdGQ6Om1heDxDR0Zsb2F0PigwLCBk aXN0YW5jZUZyb21FZGdlKTsKKyAgICAgICAgICAgICAgICBpbnNldEVkZ2UgPSBzdGQ6Om1heDxD R0Zsb2F0PigwLCBpbnNldEVkZ2UpOworICAgICAgICAgICAgfTsKKworICAgICAgICAgICAgYXV0 byB2aWV3Qm91bmRzID0gdmlldy5ib3VuZHM7CisgICAgICAgICAgICBhdXRvIHdlYlZpZXdCb3Vu ZHNJblZpZXcgPSBbc2VsZiBjb252ZXJ0UmVjdDpzZWxmLmJvdW5kcyB0b1ZpZXc6dmlld107Cisg ICAgICAgICAgICBhZGp1c3RJbnNldEVkZ2UoaW5zZXRzLnRvcCwgQ0dSZWN0R2V0TWluWSh3ZWJW aWV3Qm91bmRzSW5WaWV3KSAtIENHUmVjdEdldE1pblkodmlld0JvdW5kcykpOworICAgICAgICAg ICAgYWRqdXN0SW5zZXRFZGdlKGluc2V0cy5sZWZ0LCBDR1JlY3RHZXRNaW5YKHdlYlZpZXdCb3Vu ZHNJblZpZXcpIC0gQ0dSZWN0R2V0TWluWCh2aWV3Qm91bmRzKSk7CisgICAgICAgICAgICBhZGp1 c3RJbnNldEVkZ2UoaW5zZXRzLmJvdHRvbSwgQ0dSZWN0R2V0TWF4WSh2aWV3Qm91bmRzKSAtIENH UmVjdEdldE1heFkod2ViVmlld0JvdW5kc0luVmlldykpOworICAgICAgICAgICAgYWRqdXN0SW5z ZXRFZGdlKGluc2V0cy5yaWdodCwgQ0dSZWN0R2V0TWF4WCh2aWV3Qm91bmRzKSAtIENHUmVjdEdl dE1heFgod2ViVmlld0JvdW5kc0luVmlldykpOworICAgICAgICB9CisgICAgICAgIHJldHVybiBp bnNldHM7CisgICAgfQogICAgIHJldHVybiBVSUVkZ2VJbnNldHNaZXJvOwotI2VuZGlmCiB9CiAK IC0gKFVJRWRnZUluc2V0cylfY29tcHV0ZWRPYnNjdXJlZEluc2V0CkBAIC01OTgsMTAgKzYyMCw4 IEBAIC0gKFVJRWRnZUluc2V0cylfY29tcHV0ZWRPYnNjdXJlZEluc2V0CiAgICAgaWYgKF9oYXZl U2V0T2JzY3VyZWRJbnNldHMpCiAgICAgICAgIHJldHVybiBfb2JzY3VyZWRJbnNldHM7CiAKLSNp ZiBQTEFURk9STShJT1MpCiAgICAgaWYgKHNlbGYuX3NhZmVBcmVhU2hvdWxkQWZmZWN0T2JzY3Vy ZWRJbnNldHMpCiAgICAgICAgIHJldHVybiBVSUVkZ2VJbnNldHNBZGQoVUlFZGdlSW5zZXRzWmVy bywgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJbnNldCwgc2VsZi5fZWZmZWN0aXZlT2Jz Y3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNhZmVBcmVhKTsKLSNlbmRpZgogCiAgICAgcmV0dXJu IFVJRWRnZUluc2V0c1plcm87CiB9CkBAIC02MTMsMTAgKzYzMyw4IEBAIC0gKFVJRWRnZUluc2V0 cylfY29tcHV0ZWRDb250ZW50SW5zZXQKIAogICAgIFVJRWRnZUluc2V0cyBpbnNldHMgPSBbX3Nj cm9sbFZpZXcgY29udGVudEluc2V0XTsKIAotI2lmIFBMQVRGT1JNKElPUykKICAgICBpZiAoc2Vs Zi5fc2FmZUFyZWFTaG91bGRBZmZlY3RPYnNjdXJlZEluc2V0cykKICAgICAgICAgaW5zZXRzID0g VUlFZGdlSW5zZXRzQWRkKGluc2V0cywgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJbnNl dCwgc2VsZi5fZWZmZWN0aXZlT2JzY3VyZWRJbnNldEVkZ2VzQWZmZWN0ZWRCeVNhZmVBcmVhKTsK LSNlbmRpZgogCiAgICAgcmV0dXJuIGluc2V0czsKIH0KQEAgLTYyNiwxMCArNjQ0LDEzIEBAIC0g KFVJRWRnZUluc2V0cylfY29tcHV0ZWRVbm9ic2N1cmVkU2FmZUFyZWFJbnNldAogICAgIGlmIChf aGF2ZVNldFVub2JzY3VyZWRTYWZlQXJlYUluc2V0cykKICAgICAgICAgcmV0dXJuIF91bm9ic2N1 cmVkU2FmZUFyZWFJbnNldHM7CiAKLSNpZiBQTEFURk9STShJT1MpCi0gICAgaWYgKCFzZWxmLl9z YWZlQXJlYVNob3VsZEFmZmVjdE9ic2N1cmVkSW5zZXRzKQotICAgICAgICByZXR1cm4gc2VsZi5z YWZlQXJlYUluc2V0czsKKyAgICBpZiAoIXNlbGYuX3NhZmVBcmVhU2hvdWxkQWZmZWN0T2JzY3Vy ZWRJbnNldHMpIHsKKyAgICAgICAgYXV0byBzYWZlQXJlYUluc2V0cyA9IHNlbGYuc2FmZUFyZWFJ bnNldHM7CisjaWYgUExBVEZPUk0oV0FUQ0hPUykKKyAgICAgICAgc2FmZUFyZWFJbnNldHMgPSBV SUVkZ2VJbnNldHNBZGQoc2FmZUFyZWFJbnNldHMsIHNlbGYuX2NvbnRlbnRJbnNldHNGcm9tU3lz dGVtTWluaW11bUxheW91dE1hcmdpbnMsIHNlbGYuX2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRFZGdl c0FmZmVjdGVkQnlTYWZlQXJlYSk7CiAjZW5kaWYKKyAgICAgICAgcmV0dXJuIHNhZmVBcmVhSW5z ZXRzOworICAgIH0KIAogICAgIHJldHVybiBVSUVkZ2VJbnNldHNaZXJvOwogfQpAQCAtMTgwNywx MiArMTgyOCw3IEBAIC0gKFdlYkNvcmU6OkZsb2F0U2l6ZSlhY3RpdmVWaWV3TGF5b3V0U2l6ZToo Y29uc3QgQ0dSZWN0Jilib3VuZHMKICAgICBpZiAoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUpCiAg ICAgICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUoX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUu dmFsdWUoKSk7CiAKLS8vIEZJWE1FOiBMaWtlbHkgd2UgY2FuIHJlbW92ZSB0aGlzIHNwZWNpYWwg Y2FzZSBmb3Igd2F0Y2hPUyBhbmQgdHZPUy4KLSNpZiAhUExBVEZPUk0oV0FUQ0hPUykgJiYgIVBM QVRGT1JNKEFQUExFVFYpCiAgICAgcmV0dXJuIFdlYkNvcmU6OkZsb2F0U2l6ZShVSUVkZ2VJbnNl dHNJbnNldFJlY3QoQ0dSZWN0TWFrZSgwLCAwLCBib3VuZHMuc2l6ZS53aWR0aCwgYm91bmRzLnNp emUuaGVpZ2h0KSwgc2VsZi5fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJbnNldCkuc2l6ZSk7Ci0j ZWxzZQotICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUgeyBib3VuZHMuc2l6ZSB9OwotI2Vu ZGlmCiB9CiAKIC0gKHZvaWQpX2Rpc3BhdGNoU2V0Vmlld0xheW91dFNpemU6KFdlYkNvcmU6OkZs b2F0U2l6ZSl2aWV3TGF5b3V0U2l6ZQpAQCAtMTg0Myw2ICsxODU5LDE1IEBAIC0gKHZvaWQpX2Rp c3BhdGNoU2V0RGV2aWNlT3JpZW50YXRpb246KGludDMyX3QpZGV2aWNlT3JpZW50YXRpb24KICAg ICBfbGFzdFNlbnREZXZpY2VPcmllbnRhdGlvbiA9IGRldmljZU9yaWVudGF0aW9uOwogfQogCist IChCT09MKV91cGRhdGVTY3JvbGxWaWV3Q29udGVudEluc2V0c0lmTmVjZXNzYXJ5Cit7CisjaWYg UExBVEZPUk0oV0FUQ0hPUykKKyAgICByZXR1cm4gW19zY3JvbGxWaWV3IF9zZXRDb250ZW50U2Ny b2xsSW5zZXRJbnRlcm5hbDpzZWxmLl9zYWZlQXJlYVNob3VsZEFmZmVjdE9ic2N1cmVkSW5zZXRz ID8gc2VsZi5fY29udGVudEluc2V0c0Zyb21TeXN0ZW1NaW5pbXVtTGF5b3V0TWFyZ2lucyA6IFVJ RWRnZUluc2V0c1plcm9dOworI2Vsc2UKKyAgICByZXR1cm4gTk87CisjZW5kaWYKK30KKwogLSAo dm9pZClfZnJhbWVPckJvdW5kc0NoYW5nZWQKIHsKICAgICBDR1JlY3QgYm91bmRzID0gc2VsZi5i b3VuZHM7CkBAIC0yMTA3LDYgKzIxMzIsOCBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzCiAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvclVuc3RhYmxl U2Nyb2xsVmlldyA9IE5POwogICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNG b3JBbnlSZWFzb24gPSBOTzsKIAorICAgIFtzZWxmIF91cGRhdGVTY3JvbGxWaWV3Q29udGVudElu c2V0c0lmTmVjZXNzYXJ5XTsKKwogICAgIENHUmVjdCB2aXNpYmxlUmVjdEluQ29udGVudENvb3Jk aW5hdGVzID0gW3NlbGYgX3Zpc2libGVDb250ZW50UmVjdF07CiAKICAgICBVSUVkZ2VJbnNldHMg Y29tcHV0ZWRDb250ZW50SW5zZXRVbmFkanVzdGVkRm9yS2V5Ym9hcmQgPSBbc2VsZiBfY29tcHV0 ZWRPYnNjdXJlZEluc2V0XTsKQEAgLTI0NzEsNiArMjQ5OCw5IEBAIC0gKHZvaWQpX3NldEF2b2lk c1Vuc2FmZUFyZWE6KEJPT0wpYXZvaWRzVW5zYWZlQXJlYQogCiAgICAgX2F2b2lkc1Vuc2FmZUFy ZWEgPSBhdm9pZHNVbnNhZmVBcmVhOwogCisgICAgaWYgKFtzZWxmIF91cGRhdGVTY3JvbGxWaWV3 Q29udGVudEluc2V0c0lmTmVjZXNzYXJ5XSAmJiBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9 PSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nICYmICFfdmll d0xheW91dFNpemVPdmVycmlkZSkKKyAgICAgICAgW3NlbGYgX2Rpc3BhdGNoU2V0Vmlld0xheW91 dFNpemU6W3NlbGYgYWN0aXZlVmlld0xheW91dFNpemU6c2VsZi5ib3VuZHNdXTsKKwogICAgIFtz ZWxmIF91cGRhdGVTY3JvbGxWaWV3SW5zZXRBZGp1c3RtZW50QmVoYXZpb3JdOwogICAgIFtzZWxm IF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0ZV07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaAppbmRleCBlZTE2OTBiMTlmOTViMTYzMjY0Nzk4OGIx Yjk4ODg1NWI1NWExYTA4Li43M2E1ZTZlMjM1MDk4NTllZjFmYTM2MGEyMmMyZTBhZGVkODhjNzU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3LmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5oCkBAIC0zNiw2 ICszNiw3IEBACiAtICh2b2lkKV9zZXRDb250ZW50U2l6ZVByZXNlcnZpbmdDb250ZW50T2Zmc2V0 RHVyaW5nUnViYmVyYmFuZDooQ0dTaXplKWNvbnRlbnRTaXplOwogLSAodm9pZClfc2V0U2Nyb2xs RW5hYmxlZEludGVybmFsOihCT09MKWVuYWJsZWQ7CiAtICh2b2lkKV9zZXRab29tRW5hYmxlZElu dGVybmFsOihCT09MKWVuYWJsZWQ7CistIChCT09MKV9zZXRDb250ZW50U2Nyb2xsSW5zZXRJbnRl cm5hbDooVUlFZGdlSW5zZXRzKWluc2V0czsKIAogLy8gRklYTUU6IExpa2VseSB3ZSBjYW4gcmVt b3ZlIHRoaXMgc3BlY2lhbCBjYXNlIGZvciB3YXRjaE9TIGFuZCB0dk9TLgogI2lmICFQTEFURk9S TShXQVRDSE9TKSAmJiAhUExBVEZPUk0oQVBQTEVUVikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tTY3JvbGxWaWV3Lm1tCmluZGV4IDAzMWVmZjcwN2ZhMjc3ZjA0MTg2ZDZjNTFiZjVj M2JiMTE1ZmRjYjEuLmI1MmJjMGU0YzU0NDU1YzY4Y2MyZjEyYTljM2U1NDg2ZjRjNDA1YzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbQpAQCAtMTM2LDYg KzEzNiw4IEBAIEBpbXBsZW1lbnRhdGlvbiBXS1Njcm9sbFZpZXcgewogICAgIEJPT0wgX3Njcm9s bEVuYWJsZWRJbnRlcm5hbDsKICAgICBCT09MIF96b29tRW5hYmxlZEJ5Q2xpZW50OwogICAgIEJP T0wgX3pvb21FbmFibGVkSW50ZXJuYWw7CisgICAgc3RkOjpvcHRpb25hbDxVSUVkZ2VJbnNldHM+ IF9jb250ZW50U2Nyb2xsSW5zZXRGcm9tQ2xpZW50OworICAgIHN0ZDo6b3B0aW9uYWw8VUlFZGdl SW5zZXRzPiBfY29udGVudFNjcm9sbEluc2V0SW50ZXJuYWw7CiB9CiAKIC0gKGlkKWluaXRXaXRo RnJhbWU6KENHUmVjdClmcmFtZQpAQCAtNDIzLDYgKzQyNSwzNSBAQCAtICh2b2lkKWFkZEdlc3R1 cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKIAog I2VuZGlmIC8vIFBMQVRGT1JNKFdBVENIT1MpCiAKKy0gKHZvaWQpX3NldENvbnRlbnRTY3JvbGxJ bnNldDooVUlFZGdlSW5zZXRzKWluc2V0cworeworICAgIF9jb250ZW50U2Nyb2xsSW5zZXRGcm9t Q2xpZW50ID0gaW5zZXRzOworICAgIFtzZWxmIF91cGRhdGVDb250ZW50U2Nyb2xsSW5zZXRdOwor fQorCistIChCT09MKV9zZXRDb250ZW50U2Nyb2xsSW5zZXRJbnRlcm5hbDooVUlFZGdlSW5zZXRz KWluc2V0cworeworICAgIGlmIChfY29udGVudFNjcm9sbEluc2V0RnJvbUNsaWVudCkKKyAgICAg ICAgcmV0dXJuIE5POworCisgICAgaWYgKF9jb250ZW50U2Nyb2xsSW5zZXRJbnRlcm5hbCAmJiBV SUVkZ2VJbnNldHNFcXVhbFRvRWRnZUluc2V0cygqX2NvbnRlbnRTY3JvbGxJbnNldEludGVybmFs LCBpbnNldHMpKQorICAgICAgICByZXR1cm4gTk87CisKKyAgICBfY29udGVudFNjcm9sbEluc2V0 SW50ZXJuYWwgPSBpbnNldHM7CisgICAgW3NlbGYgX3VwZGF0ZUNvbnRlbnRTY3JvbGxJbnNldF07 CisgICAgcmV0dXJuIFlFUzsKK30KKworLSAodm9pZClfdXBkYXRlQ29udGVudFNjcm9sbEluc2V0 Cit7CisgICAgaWYgKGF1dG8gaW5zZXRzID0gX2NvbnRlbnRTY3JvbGxJbnNldEZyb21DbGllbnQp CisgICAgICAgIHN1cGVyLmNvbnRlbnRTY3JvbGxJbnNldCA9ICppbnNldHM7CisgICAgZWxzZSBp ZiAoYXV0byBpbnNldHMgPSBfY29udGVudFNjcm9sbEluc2V0SW50ZXJuYWwpCisgICAgICAgIHN1 cGVyLmNvbnRlbnRTY3JvbGxJbnNldCA9ICppbnNldHM7CisgICAgZWxzZQorICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKK30KKwogI2lmIEhBVkUoUEVQUEVSX1VJX0NPUkUpCiAKIC0gKHZv aWQpX2NvbmZpZ3VyZURpZ2l0YWxDcm93blNjcm9sbGluZwo= 432211 2021-06-24 13:51:55 -0700 2021-06-24 14:41:32 -0700 Patch bug-227178-20210624135154.patch text/plain 11505 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YjdmZmUwMTAzZjUzMGQz YjcwYmFkMmJlN2Y2MzIyYjQ2MjlmZWMuLmJjMGFkNzZiYTkyYTBhM2NhZDk1ZGI1YzM2ZmVjOWJl YmI4N2JhMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjMgQEAKKzIwMjEtMDYtMjQgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW3dhdGNoT1NdIEF1dG9t YXRpY2FsbHkgYXBwbHkgc3lzdGVtIG1pbmltdW0gbGF5b3V0IG1hcmdpbnMgYXMgc2Nyb2xsIHZp ZXcgY29udGVudCBpbnNldHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyNzE3OAorICAgICAgICByZGFyOi8vNzY3ODQwOTUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXNwZWN0IGAtW1VJVmlld0NvbnRy b2xsZXIgc3lzdGVtTWluaW11bUxheW91dE1hcmdpbnNdYCBvbiB3YXRjaE9TIGJ5IHRyZWF0aW5n IHRoZW0gaW4gYSBzaW1pbGFyIHdheSBhcyBzYWZlCisgICAgICAgIGFyZWEgaW5zZXRzLCBzdWNo IHRoYXQgd2UgYXZvaWQgbGF5aW5nIG91dCBwYXJ0cyBvZiB0aGUgd2ViIHBhZ2Ugd2l0aGluIHRo ZXNlIG1hcmdpbnMgdW5sZXNzIHRoZSBwYWdlJ3MgbWV0YQorICAgICAgICB2aWV3cG9ydCBzcGVj aWZpZXMgYHZpZXdwb3J0LWZpdD1jb3ZlcmAuIE9uIHdhdGNoLCBhdm9pZGluZyB0aGVzZSBsYXlv dXQgbWFyZ2lucyBpcyBjcnVjaWFsLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tX ZWJWaWV3SU9TLm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2NvbXB1dGVkT2JzY3VyZWRJbnNl dEZvclNhZmVCcm93c2luZ1dhcm5pbmddKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb250ZW50 SW5zZXRzRnJvbVN5c3RlbU1pbmltdW1MYXlvdXRNYXJnaW5zXSk6CisKKyAgICAgICAgQWRkIGEg aGVscGVyIG1ldGhvZCB0byBjb21wdXRlIHRoZSBhbW91bnQgb2YgYWRkaXRpb25hbCBjb250ZW50 IGluc2V0IHdlIG5lZWQgdG8gYXBwbHkgdG8gdGhlIHNjcm9sbCB2aWV3IGluCisgICAgICAgIG9y ZGVyIGZvciBjb250ZW50IHRvIGZpdCB3aXRoaW4gV0tXZWJWaWV3J3MgdmlldyBjb250cm9sbGVy J3MgYC1zeXN0ZW1NaW5pbXVtTGF5b3V0TWFyZ2luc2AuIE5vdGUgdGhhdCB0aGlzCisgICAgICAg IGFjY291bnRzIGZvciBjYXNlcyB3aGVyZSB0aGUgd2ViIHZpZXcncyBmcmFtZSBpcyBhbHJlYWR5 IGluc2V0IHJlbGF0aXZlIHRvIHRoZSB2aWV3IGNvbnRyb2xsZXIncyBjb250ZW50IHZpZXcuCisK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb21wdXRlZE9ic2N1cmVkSW5zZXRdKToKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9jb21wdXRlZENvbnRlbnRJbnNldF0pOgorCisgICAgICAgIFVuY29uZGl0 aW9uYWxpemUgYSBmZXcgY29kZXBhdGhzIHRoYXQgYXBwbHkgb2JzY3VyZWQgYW5kIGNvbnRlbnQg aW5zZXRzIGJ5IGNvbnN1bHRpbmcKKyAgICAgICAgYC1fc2Nyb2xsVmlld1N5c3RlbUNvbnRlbnRJ bnNldGAuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb21wdXRlZFVub2JzY3VyZWRTYWZlQXJl YUluc2V0XSk6CisKKyAgICAgICAgT24gd2F0Y2hPUywgd2UgYXVnbWVudCBzYWZlIGFyZWEgaW5z ZXRzLCBzdWNoIHRoYXQgdGhleSBpbmNsdWRlIGBfY29udGVudEluc2V0c0Zyb21TeXN0ZW1NaW5p bXVtTGF5b3V0TWFyZ2luc2AKKyAgICAgICAgYXMgd2VsbC4KKworICAgICAgICAoLVtXS1dlYlZp ZXcgYWN0aXZlVmlld0xheW91dFNpemU6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfdXBkYXRl U2Nyb2xsVmlld0NvbnRlbnRJbnNldHNJZk5lY2Vzc2FyeV0pOgorCisgICAgICAgIEFkZCBhIGhl bHBlciBtZXRob2QgdGhhdCAob24gd2F0Y2hPUyBvbmx5KSB1cGRhdGVzIFdLU2Nyb2xsVmlldydz IGNvbnRlbnQgc2Nyb2xsIGluc2V0cyBzdWNoIHRoYXQgdGhlIHdlYiBwYWdlCisgICAgICAgIGZp dHMgaW5zaWRlIGAtc3lzdGVtTWluaW11bUxheW91dE1hcmdpbnNgLiBTZWUgV0tTY3JvbGxWaWV3 IGNoYW5nZXMgYmVsb3cgZm9yIG1vcmUgZGV0YWlscy4KKworICAgICAgICAoLVtXS1dlYlZpZXcg X3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9zZXRB dm9pZHNVbnNhZmVBcmVhOl0pOgorCisgICAgICAgIFVwZGF0ZSBzY3JvbGwgdmlldyBjb250ZW50 IGluc2V0cyBvbiB3YXRjaE9TIGlmIHRoZSBgdmlld3BvcnQtZml0YCBzdGF0ZSBjaGFuZ2VzLiBB ZGRpdGlvbmFsbHkgbWFrZSBzdXJlIHRoYXQgd2UKKyAgICAgICAgYWxzbyB1cGRhdGUgdGhlIGFj dGl2ZSBsYXlvdXQgc2l6ZSBpZiB0aGUgaW5zZXRzIGFjdHVhbGx5IGNoYW5nZSAod2l0aG91dCB0 aGlzIHR3ZWFrLCB3aGVuIGR5bmFtaWNhbGx5IGFkZGluZworICAgICAgICBgdmlld3BvcnQtZml0 PWNvdmVyYCwgd2UnbGwgZW5kIHVwIGluIGEgc3RhdGUgd2hlcmUgdGhlIGNvbnRlbnQgc2l6ZSBp cyBzdGlsbCBuYXJyb3cgdG8gYWNjb3VudCBmb3IgdGhlIG9sZAorICAgICAgICBjb250ZW50IHNj cm9sbCBpbnNldHMsIGJ1dCB0aGUgbmV3IGNvbnRlbnQgc2Nyb2xsIGluc2V0cyBhcmUgc2V0LCBz byB0aGUgd2ViIHBhZ2UgYXBlYXJzIG1pc2FsaWduZWQgcmVsYXRpdmUgdG8KKyAgICAgICAgdGhl IHNjcm9sbCB2aWV3KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW06CisgICAgICAgICgtW1dL U2Nyb2xsVmlldyBfc2V0Q29udGVudFNjcm9sbEluc2V0Ol0pOgorICAgICAgICAoLVtXS1Njcm9s bFZpZXcgX3NldENvbnRlbnRTY3JvbGxJbnNldEludGVybmFsOl0pOgorCisgICAgICAgIEFkZCBh biBpbnRlcm5hbCBtZXRob2QgZm9yIHNldHRpbmcgYC1bVUlTY3JvbGxWaWV3IF9jb250ZW50U2Ny b2xsSW5zZXRdYCB0aGF0IGRlZmVycyB0byB0aGUgZW1iZWRkaW5nIGNsaWVudC4KKyAgICAgICAg VGhpcyBtZWFucyBXS1dlYlZpZXcgY2xpZW50cyB0aGF0IHVzZSBgd2ViVmlldy5zY3JvbGxWaWV3 LmNvbnRlbnRTY3JvbGxJbnNldCA9IG15SW5zZXQ7YCB3aWxsIG92ZXJyaWRlIHRoZSBhYm92ZQor ICAgICAgICBiZWhhdmlvciBpbiBgLV91cGRhdGVTY3JvbGxWaWV3Q29udGVudEluc2V0c0lmTmVj ZXNzYXJ5YCwgYnV0IG90aGVyd2lzZSwgdGhlIGNvbnRlbnQgc2Nyb2xsIGluc2V0cyB3aWxsIGJl CisgICAgICAgIGF1dG9tYXRpY2FsbHkgY29tcHV0ZWQgYW5kIHNldCBpbiBvcmRlciB0byBhdm9p ZCBtaW5pbXVtIGxheW91dCBtYXJnaW5zIGlmIG5lZWRlZC4KKworICAgICAgICBOb3RlIHRoYXQg dGhpcyBhbHNvIHJldHVybnMgYSBgQk9PTGAgaW5kaWNhdGluZyB3aGV0aGVyIHRoZSBpbnNldCB3 YXMgdXBkYXRlZC4KKworICAgICAgICAoLVtXS1Njcm9sbFZpZXcgX3VwZGF0ZUNvbnRlbnRTY3Jv bGxJbnNldF0pOgorCiAyMDIxLTA2LTIzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCBhIGRlbGVnYXRlIFNQSSB0byBhbGxvdyBhcmJpdHJhcnkg Z2VzdHVyZXMgdG8gaWdub3JlIHByZXZlbnREZWZhdWx0KCkgd2l0aCBhY3RpdmUgdG91Y2ggZXZl bnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmll d0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t CmluZGV4IGI4ZGYxMzc1OTFiZWM1NWJlODE0YmE2NWM5YmIyMmZmMmUwYjAzZGEuLjVjMThlMWMw YjQ0NmJjYjE5ZjVhNjUyYWI1NjdkN2Y5NGQ3YmI2MDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCkBAIC01ODAsMTEgKzU4MCwzMyBAQCAt IChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkT2JzY3VyZWRJbnNldEZvclNhZmVCcm93c2luZ1dhcm5p bmcKICAgICBpZiAoX2hhdmVTZXRPYnNjdXJlZEluc2V0cykKICAgICAgICAgcmV0dXJuIF9vYnNj dXJlZEluc2V0czsKIAotI2lmIFBMQVRGT1JNKElPUykKICAgICByZXR1cm4gVUlFZGdlSW5zZXRz QWRkKFVJRWRnZUluc2V0c1plcm8sIHNlbGYuX3Njcm9sbFZpZXdTeXN0ZW1Db250ZW50SW5zZXQs IHNlbGYuX2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRFZGdlc0FmZmVjdGVkQnlTYWZlQXJlYSk7Ci0j ZWxzZQorfQorCistIChVSUVkZ2VJbnNldHMpX2NvbnRlbnRJbnNldHNGcm9tU3lzdGVtTWluaW11 bUxheW91dE1hcmdpbnMKK3sKKyAgICBpZiAoYXV0byBjb250cm9sbGVyID0gW1VJVmlld0NvbnRy b2xsZXIgX3ZpZXdDb250cm9sbGVyRm9yRnVsbFNjcmVlblByZXNlbnRhdGlvbkZyb21WaWV3OnNl bGZdKSB7CisgICAgICAgIGF1dG8gbWFyZ2lucyA9IGNvbnRyb2xsZXIuc3lzdGVtTWluaW11bUxh eW91dE1hcmdpbnM7CisgICAgICAgIGF1dG8gaW5zZXRzID0gVUlFZGdlSW5zZXRzTWFrZShtYXJn aW5zLnRvcCwgbWFyZ2lucy5sZWFkaW5nLCBtYXJnaW5zLmJvdHRvbSwgbWFyZ2lucy50cmFpbGlu Zyk7CisgICAgICAgIGlmIChfcGFnZSAmJiBfcGFnZS0+dXNlckludGVyZmFjZUxheW91dERpcmVj dGlvbigpID09IFdlYkNvcmU6OlVzZXJJbnRlcmZhY2VMYXlvdXREaXJlY3Rpb246OlJUTCkKKyAg ICAgICAgICAgIHN0ZDo6c3dhcChpbnNldHMubGVmdCwgaW5zZXRzLnJpZ2h0KTsKKworICAgICAg ICBpZiAoYXV0byB2aWV3ID0gY29udHJvbGxlci52aWV3SWZMb2FkZWQpIHsKKyAgICAgICAgICAg IGF1dG8gYWRqdXN0SW5zZXRFZGdlID0gW10oQ0dGbG9hdCYgaW5zZXRFZGdlLCBDR0Zsb2F0IGRp c3RhbmNlRnJvbUVkZ2UpIHsKKyAgICAgICAgICAgICAgICBpbnNldEVkZ2UgLT0gc3RkOjptYXg8 Q0dGbG9hdD4oMCwgZGlzdGFuY2VGcm9tRWRnZSk7CisgICAgICAgICAgICAgICAgaW5zZXRFZGdl ID0gc3RkOjptYXg8Q0dGbG9hdD4oMCwgaW5zZXRFZGdlKTsKKyAgICAgICAgICAgIH07CisKKyAg ICAgICAgICAgIGF1dG8gdmlld0JvdW5kcyA9IHZpZXcuYm91bmRzOworICAgICAgICAgICAgYXV0 byB3ZWJWaWV3Qm91bmRzSW5WaWV3ID0gW3NlbGYgY29udmVydFJlY3Q6c2VsZi5ib3VuZHMgdG9W aWV3OnZpZXddOworICAgICAgICAgICAgYWRqdXN0SW5zZXRFZGdlKGluc2V0cy50b3AsIENHUmVj dEdldE1pblkod2ViVmlld0JvdW5kc0luVmlldykgLSBDR1JlY3RHZXRNaW5ZKHZpZXdCb3VuZHMp KTsKKyAgICAgICAgICAgIGFkanVzdEluc2V0RWRnZShpbnNldHMubGVmdCwgQ0dSZWN0R2V0TWlu WCh3ZWJWaWV3Qm91bmRzSW5WaWV3KSAtIENHUmVjdEdldE1pblgodmlld0JvdW5kcykpOworICAg ICAgICAgICAgYWRqdXN0SW5zZXRFZGdlKGluc2V0cy5ib3R0b20sIENHUmVjdEdldE1heFkodmll d0JvdW5kcykgLSBDR1JlY3RHZXRNYXhZKHdlYlZpZXdCb3VuZHNJblZpZXcpKTsKKyAgICAgICAg ICAgIGFkanVzdEluc2V0RWRnZShpbnNldHMucmlnaHQsIENHUmVjdEdldE1heFgodmlld0JvdW5k cykgLSBDR1JlY3RHZXRNYXhYKHdlYlZpZXdCb3VuZHNJblZpZXcpKTsKKyAgICAgICAgfQorICAg ICAgICByZXR1cm4gaW5zZXRzOworICAgIH0KICAgICByZXR1cm4gVUlFZGdlSW5zZXRzWmVybzsK LSNlbmRpZgogfQogCiAtIChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkT2JzY3VyZWRJbnNldApAQCAt NTk4LDEwICs2MjAsOCBAQCAtIChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkT2JzY3VyZWRJbnNldAog ICAgIGlmIChfaGF2ZVNldE9ic2N1cmVkSW5zZXRzKQogICAgICAgICByZXR1cm4gX29ic2N1cmVk SW5zZXRzOwogCi0jaWYgUExBVEZPUk0oSU9TKQogICAgIGlmIChzZWxmLl9zYWZlQXJlYVNob3Vs ZEFmZmVjdE9ic2N1cmVkSW5zZXRzKQogICAgICAgICByZXR1cm4gVUlFZGdlSW5zZXRzQWRkKFVJ RWRnZUluc2V0c1plcm8sIHNlbGYuX3Njcm9sbFZpZXdTeXN0ZW1Db250ZW50SW5zZXQsIHNlbGYu X2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRFZGdlc0FmZmVjdGVkQnlTYWZlQXJlYSk7Ci0jZW5kaWYK IAogICAgIHJldHVybiBVSUVkZ2VJbnNldHNaZXJvOwogfQpAQCAtNjEzLDEwICs2MzMsOCBAQCAt IChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkQ29udGVudEluc2V0CiAKICAgICBVSUVkZ2VJbnNldHMg aW5zZXRzID0gW19zY3JvbGxWaWV3IGNvbnRlbnRJbnNldF07CiAKLSNpZiBQTEFURk9STShJT1Mp CiAgICAgaWYgKHNlbGYuX3NhZmVBcmVhU2hvdWxkQWZmZWN0T2JzY3VyZWRJbnNldHMpCiAgICAg ICAgIGluc2V0cyA9IFVJRWRnZUluc2V0c0FkZChpbnNldHMsIHNlbGYuX3Njcm9sbFZpZXdTeXN0 ZW1Db250ZW50SW5zZXQsIHNlbGYuX2VmZmVjdGl2ZU9ic2N1cmVkSW5zZXRFZGdlc0FmZmVjdGVk QnlTYWZlQXJlYSk7Ci0jZW5kaWYKIAogICAgIHJldHVybiBpbnNldHM7CiB9CkBAIC02MjYsMTAg KzY0NCwxMyBAQCAtIChVSUVkZ2VJbnNldHMpX2NvbXB1dGVkVW5vYnNjdXJlZFNhZmVBcmVhSW5z ZXQKICAgICBpZiAoX2hhdmVTZXRVbm9ic2N1cmVkU2FmZUFyZWFJbnNldHMpCiAgICAgICAgIHJl dHVybiBfdW5vYnNjdXJlZFNhZmVBcmVhSW5zZXRzOwogCi0jaWYgUExBVEZPUk0oSU9TKQotICAg IGlmICghc2VsZi5fc2FmZUFyZWFTaG91bGRBZmZlY3RPYnNjdXJlZEluc2V0cykKLSAgICAgICAg cmV0dXJuIHNlbGYuc2FmZUFyZWFJbnNldHM7CisgICAgaWYgKCFzZWxmLl9zYWZlQXJlYVNob3Vs ZEFmZmVjdE9ic2N1cmVkSW5zZXRzKSB7CisgICAgICAgIGF1dG8gc2FmZUFyZWFJbnNldHMgPSBz ZWxmLnNhZmVBcmVhSW5zZXRzOworI2lmIFBMQVRGT1JNKFdBVENIT1MpCisgICAgICAgIHNhZmVB cmVhSW5zZXRzID0gVUlFZGdlSW5zZXRzQWRkKHNhZmVBcmVhSW5zZXRzLCBzZWxmLl9jb250ZW50 SW5zZXRzRnJvbVN5c3RlbU1pbmltdW1MYXlvdXRNYXJnaW5zLCBzZWxmLl9lZmZlY3RpdmVPYnNj dXJlZEluc2V0RWRnZXNBZmZlY3RlZEJ5U2FmZUFyZWEpOwogI2VuZGlmCisgICAgICAgIHJldHVy biBzYWZlQXJlYUluc2V0czsKKyAgICB9CiAKICAgICByZXR1cm4gVUlFZGdlSW5zZXRzWmVybzsK IH0KQEAgLTE4MDcsMTIgKzE4MjgsNyBAQCAtIChXZWJDb3JlOjpGbG9hdFNpemUpYWN0aXZlVmll d0xheW91dFNpemU6KGNvbnN0IENHUmVjdCYpYm91bmRzCiAgICAgaWYgKF92aWV3TGF5b3V0U2l6 ZU92ZXJyaWRlKQogICAgICAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKF92aWV3TGF5b3V0 U2l6ZU92ZXJyaWRlLnZhbHVlKCkpOwogCi0vLyBGSVhNRTogTGlrZWx5IHdlIGNhbiByZW1vdmUg dGhpcyBzcGVjaWFsIGNhc2UgZm9yIHdhdGNoT1MgYW5kIHR2T1MuCi0jaWYgIVBMQVRGT1JNKFdB VENIT1MpICYmICFQTEFURk9STShBUFBMRVRWKQogICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNp emUoVUlFZGdlSW5zZXRzSW5zZXRSZWN0KENHUmVjdE1ha2UoMCwgMCwgYm91bmRzLnNpemUud2lk dGgsIGJvdW5kcy5zaXplLmhlaWdodCksIHNlbGYuX3Njcm9sbFZpZXdTeXN0ZW1Db250ZW50SW5z ZXQpLnNpemUpOwotI2Vsc2UKLSAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplIHsgYm91bmRz LnNpemUgfTsKLSNlbmRpZgogfQogCiAtICh2b2lkKV9kaXNwYXRjaFNldFZpZXdMYXlvdXRTaXpl OihXZWJDb3JlOjpGbG9hdFNpemUpdmlld0xheW91dFNpemUKQEAgLTE4NDMsNiArMTg1OSwxNSBA QCAtICh2b2lkKV9kaXNwYXRjaFNldERldmljZU9yaWVudGF0aW9uOihpbnQzMl90KWRldmljZU9y aWVudGF0aW9uCiAgICAgX2xhc3RTZW50RGV2aWNlT3JpZW50YXRpb24gPSBkZXZpY2VPcmllbnRh dGlvbjsKIH0KIAorLSAoQk9PTClfdXBkYXRlU2Nyb2xsVmlld0NvbnRlbnRJbnNldHNJZk5lY2Vz c2FyeQoreworI2lmIFBMQVRGT1JNKFdBVENIT1MpCisgICAgcmV0dXJuIFtfc2Nyb2xsVmlldyBf c2V0Q29udGVudFNjcm9sbEluc2V0SW50ZXJuYWw6c2VsZi5fc2FmZUFyZWFTaG91bGRBZmZlY3RP YnNjdXJlZEluc2V0cyA/IHNlbGYuX2NvbnRlbnRJbnNldHNGcm9tU3lzdGVtTWluaW11bUxheW91 dE1hcmdpbnMgOiBVSUVkZ2VJbnNldHNaZXJvXTsKKyNlbHNlCisgICAgcmV0dXJuIE5POworI2Vu ZGlmCit9CisKIC0gKHZvaWQpX2ZyYW1lT3JCb3VuZHNDaGFuZ2VkCiB7CiAgICAgQ0dSZWN0IGJv dW5kcyA9IHNlbGYuYm91bmRzOwpAQCAtMjEwNyw2ICsyMTMyLDggQEAgLSAodm9pZClfdXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0cwogICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVj dHNGb3JVbnN0YWJsZVNjcm9sbFZpZXcgPSBOTzsKICAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxl Q29udGVudFJlY3RzRm9yQW55UmVhc29uID0gTk87CiAKKyAgICBbc2VsZiBfdXBkYXRlU2Nyb2xs Vmlld0NvbnRlbnRJbnNldHNJZk5lY2Vzc2FyeV07CisKICAgICBDR1JlY3QgdmlzaWJsZVJlY3RJ bkNvbnRlbnRDb29yZGluYXRlcyA9IFtzZWxmIF92aXNpYmxlQ29udGVudFJlY3RdOwogCiAgICAg VUlFZGdlSW5zZXRzIGNvbXB1dGVkQ29udGVudEluc2V0VW5hZGp1c3RlZEZvcktleWJvYXJkID0g W3NlbGYgX2NvbXB1dGVkT2JzY3VyZWRJbnNldF07CkBAIC0yNDcxLDYgKzI0OTgsOSBAQCAtICh2 b2lkKV9zZXRBdm9pZHNVbnNhZmVBcmVhOihCT09MKWF2b2lkc1Vuc2FmZUFyZWEKIAogICAgIF9h dm9pZHNVbnNhZmVBcmVhID0gYXZvaWRzVW5zYWZlQXJlYTsKIAorICAgIGlmIChbc2VsZiBfdXBk YXRlU2Nyb2xsVmlld0NvbnRlbnRJbnNldHNJZk5lY2Vzc2FyeV0gJiYgX2R5bmFtaWNWaWV3cG9y dFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5hbWljVmlld3BvcnRVcGRhdGVNb2RlOjpOb3RSZXNp emluZyAmJiAhX3ZpZXdMYXlvdXRTaXplT3ZlcnJpZGUpCisgICAgICAgIFtzZWxmIF9kaXNwYXRj aFNldFZpZXdMYXlvdXRTaXplOltzZWxmIGFjdGl2ZVZpZXdMYXlvdXRTaXplOnNlbGYuYm91bmRz XV07CisKICAgICBbc2VsZiBfdXBkYXRlU2Nyb2xsVmlld0luc2V0QWRqdXN0bWVudEJlaGF2aW9y XTsKICAgICBbc2VsZiBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3LmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3LmgKaW5kZXggZWUxNjkwYjE5Zjk1 YjE2MzI2NDc5ODhiMWI5ODg4NTViNTVhMWEwOC4uNzNhNWU2ZTIzNTA5ODU5ZWYxZmEzNjBhMjJj MmUwYWRlZDg4Yzc1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL U2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZp ZXcuaApAQCAtMzYsNiArMzYsNyBAQAogLSAodm9pZClfc2V0Q29udGVudFNpemVQcmVzZXJ2aW5n Q29udGVudE9mZnNldER1cmluZ1J1YmJlcmJhbmQ6KENHU2l6ZSljb250ZW50U2l6ZTsKIC0gKHZv aWQpX3NldFNjcm9sbEVuYWJsZWRJbnRlcm5hbDooQk9PTCllbmFibGVkOwogLSAodm9pZClfc2V0 Wm9vbUVuYWJsZWRJbnRlcm5hbDooQk9PTCllbmFibGVkOworLSAoQk9PTClfc2V0Q29udGVudFNj cm9sbEluc2V0SW50ZXJuYWw6KFVJRWRnZUluc2V0cylpbnNldHM7CiAKIC8vIEZJWE1FOiBMaWtl bHkgd2UgY2FuIHJlbW92ZSB0aGlzIHNwZWNpYWwgY2FzZSBmb3Igd2F0Y2hPUyBhbmQgdHZPUy4K ICNpZiAhUExBVEZPUk0oV0FUQ0hPUykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbQppbmRleCAwMzFlZmY3MDdmYTI3N2Yw NDE4NmQ2YzUxYmY1YzNiYjExNWZkY2IxLi5iNTJiYzBlNGM1NDQ1NWM2OGNjMmYxMmE5YzNlNTQ4 NmY0YzQwNWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3Jv bGxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcu bW0KQEAgLTEzNiw2ICsxMzYsOCBAQCBAaW1wbGVtZW50YXRpb24gV0tTY3JvbGxWaWV3IHsKICAg ICBCT09MIF9zY3JvbGxFbmFibGVkSW50ZXJuYWw7CiAgICAgQk9PTCBfem9vbUVuYWJsZWRCeUNs aWVudDsKICAgICBCT09MIF96b29tRW5hYmxlZEludGVybmFsOworICAgIHN0ZDo6b3B0aW9uYWw8 VUlFZGdlSW5zZXRzPiBfY29udGVudFNjcm9sbEluc2V0RnJvbUNsaWVudDsKKyAgICBzdGQ6Om9w dGlvbmFsPFVJRWRnZUluc2V0cz4gX2NvbnRlbnRTY3JvbGxJbnNldEludGVybmFsOwogfQogCiAt IChpZClpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJhbWUKQEAgLTQyMyw2ICs0MjUsMzUgQEAgLSAo dm9pZClhZGRHZXN0dXJlUmVjb2duaXplcjooVUlHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVS ZWNvZ25pemVyCiAKICNlbmRpZiAvLyBQTEFURk9STShXQVRDSE9TKQogCistICh2b2lkKV9zZXRD b250ZW50U2Nyb2xsSW5zZXQ6KFVJRWRnZUluc2V0cylpbnNldHMKK3sKKyAgICBfY29udGVudFNj cm9sbEluc2V0RnJvbUNsaWVudCA9IGluc2V0czsKKyAgICBbc2VsZiBfdXBkYXRlQ29udGVudFNj cm9sbEluc2V0XTsKK30KKworLSAoQk9PTClfc2V0Q29udGVudFNjcm9sbEluc2V0SW50ZXJuYWw6 KFVJRWRnZUluc2V0cylpbnNldHMKK3sKKyAgICBpZiAoX2NvbnRlbnRTY3JvbGxJbnNldEZyb21D bGllbnQpCisgICAgICAgIHJldHVybiBOTzsKKworICAgIGlmIChfY29udGVudFNjcm9sbEluc2V0 SW50ZXJuYWwgJiYgVUlFZGdlSW5zZXRzRXF1YWxUb0VkZ2VJbnNldHMoKl9jb250ZW50U2Nyb2xs SW5zZXRJbnRlcm5hbCwgaW5zZXRzKSkKKyAgICAgICAgcmV0dXJuIE5POworCisgICAgX2NvbnRl bnRTY3JvbGxJbnNldEludGVybmFsID0gaW5zZXRzOworICAgIFtzZWxmIF91cGRhdGVDb250ZW50 U2Nyb2xsSW5zZXRdOworICAgIHJldHVybiBZRVM7Cit9CisKKy0gKHZvaWQpX3VwZGF0ZUNvbnRl bnRTY3JvbGxJbnNldAoreworICAgIGlmIChhdXRvIGluc2V0cyA9IF9jb250ZW50U2Nyb2xsSW5z ZXRGcm9tQ2xpZW50KQorICAgICAgICBzdXBlci5jb250ZW50U2Nyb2xsSW5zZXQgPSAqaW5zZXRz OworICAgIGVsc2UgaWYgKGF1dG8gaW5zZXRzID0gX2NvbnRlbnRTY3JvbGxJbnNldEludGVybmFs KQorICAgICAgICBzdXBlci5jb250ZW50U2Nyb2xsSW5zZXQgPSAqaW5zZXRzOworICAgIGVsc2UK KyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cit9CisKICNpZiBIQVZFKFBFUFBFUl9VSV9D T1JFKQogCiAtICh2b2lkKV9jb25maWd1cmVEaWdpdGFsQ3Jvd25TY3JvbGxpbmcK