224571 2021-04-14 12:40:23 -0700 Promote `-[WKWebView _themeColor]` SPI to API 2021-04-14 18:26:31 -0700 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bdakin ggaren hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1750290 0 hi 2021-04-14 12:40:23 -0700 . 1750291 1 hi 2021-04-14 12:40:39 -0700 <rdar://problem/75231602> 1750297 2 426036 hi 2021-04-14 12:50:35 -0700 Created attachment 426036 Patch 1750299 3 426036 ggaren 2021-04-14 12:56:19 -0700 Comment on attachment 426036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426036&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:-2985 > -- (CocoaColor *)_themeColor Don't we still need to keep around the _themeColor variant, to avoid breaking existing binaries that use it? Two separate but similar concerns here: (1) We don't want anything that uses _themeColor to break at the moment this lands in a build; (2) We may want to A/B test new WebKit with old { Insert App Here } when doing perf or correctness bisecting. 1750329 4 426045 hi 2021-04-14 14:15:57 -0700 Created attachment 426045 Patch 1750331 5 426045 ggaren 2021-04-14 14:22:05 -0700 Comment on attachment 426045 Patch r=me 1750434 6 ews-feeder 2021-04-14 18:26:29 -0700 Committed r275984 (236536@main): <https://commits.webkit.org/236536@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426045. 426036 2021-04-14 12:50:35 -0700 2021-04-14 14:15:55 -0700 Patch bug-224571-20210414135034.patch text/plain 13784 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMDUwMzZjZTRlNjg0Mzg1MGY2YjhmNWY5OWY1ZTllYzdmZjMxZTQyMS4uYWJk N2RiZmM5NGFjNDFlOGMzOGU2ZDEzOTlhYzk1YmUwNTRiY2ZiYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMCBAQAorMjAyMS0wNC0xNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgUHJvbW90ZSBgLVtXS1dlYlZpZXcgX3RoZW1lQ29sb3JdYCBTUEkgdG8gQVBJCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1NzEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc1MjMxNjAyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IHRoZW1lQ29sb3JdKTogQWRkZWQuCisgICAgICAgICgtW1dLV2ViVmlldyBf dGhlbWVDb2xvcl0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3UHJpdmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1w bENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbENvY29hOjp0aGVtZUNv bG9yV2lsbENoYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsQ29jb2E6OnRo ZW1lQ29sb3JEaWRDaGFuZ2UpOgorCiAyMDIxLTA0LTE0ICBLYXRlIENoZW5leSAgPGthdGhlcmlu ZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2Ugd29ya2VyIHNvZnQtdXBkYXRl IGxvYWRzIG5vdCBiZWluZyBtYXJrZWQgYXBwLWJvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmgKaW5kZXggMTkxNDQ2NDIyM2Y3NDExMWUwMmU0MTc3 NGQxZTBmMWRhODQ5NjljMS4uNDk4OWNiYWViOTY1MDRkODE3YzU5MjJlZjRkNzgyNDcwNDFmNTVi MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaApA QCAtNTU5LDYgKzU1OSwyMiBAQCBUaGUgdW5pZm9ybSB0eXBlIGlkZW50aWZpZXIga1VUVHlwZVdl YkFyY2hpdmUgY2FuIGJlIHVzZWQgZ2V0IHRoZSByZWxhdGVkIHBhc3RlYgogKi8KIC0gKE5TUHJp bnRPcGVyYXRpb24gKilwcmludE9wZXJhdGlvbldpdGhQcmludEluZm86KE5TUHJpbnRJbmZvICop cHJpbnRJbmZvIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTEuMCkpOwogI2VuZGlmCisKKy8qISBA YWJzdHJhY3QgVGhlIHRoZW1lIGNvbG9yIG9mIHRoZSBhY3RpdmUgcGFnZS4KKyBAZGlzY3Vzc2lv biBUaGlzIGlzIHRoZSBDU1MgY29sb3IgcGFyc2VkIHZhbHVlIG9mIHRoZSBgY29udGVudHNgCisg YXR0cmlidXRlIG9mIHRoZSBmaXJzdCB2YWxpZAorIEB0ZXh0YmxvY2sKKyAgICA8bWV0YSBuYW1l PSJ0aGVtZS1jb2xvciIgY29udGVudHM9Ii4uLiI+CisgQC90ZXh0YmxvY2sKKyBlbGVtZW50IGlu IHRoZSBjdXJyZW50IG1haW4gZG9jdW1lbnQuCisgQGxpbmsgV0tXZWJWaWV3IEAvbGluayBpcyBr ZXktdmFsdWUgb2JzZXJ2aW5nIChLVk8pIGNvbXBsaWFudCBmb3IgdGhpcworIHByb3BlcnR5Lgor ICovCisjaWYgVEFSR0VUX09TX0lQSE9ORQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5 LCBudWxsYWJsZSkgVUlDb2xvciAqdGhlbWVDb2xvciBBUElfQVZBSUxBQkxFKGlvcyhXS19NQUNf VEJBKSk7CisjZWxzZQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBudWxsYWJsZSkg TlNDb2xvciAqdGhlbWVDb2xvciBBUElfQVZBSUxBQkxFKG1hY29zKFdLX0lPU19UQkEpKTsKKyNl bmRpZgogQGVuZAogCiAjaWYgIVRBUkdFVF9PU19JUEhPTkUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IDdkM2RhYWQ5ODNiYjhjZDE5OWYy ZTQxYTI4MjVjMDg1ZTg1N2I4MTIuLmVhNjA1MTY4NmYyMmYwN2NjZjdhZTVlMDMzOWFjZDJjMTEy ZWE0MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmll dy5tbQpAQCAtMjk4Miw3ICsyOTgyLDcgQEAgLSAodm9pZClfc2V0Q2FuVXNlQ3JlZGVudGlhbFN0 b3JhZ2U6KEJPT0wpY2FuVXNlQ3JlZGVudGlhbFN0b3JhZ2UKICAgICBfcGFnZS0+c2V0Q2FuVXNl Q3JlZGVudGlhbFN0b3JhZ2UoY2FuVXNlQ3JlZGVudGlhbFN0b3JhZ2UpOwogfQogCi0tIChDb2Nv YUNvbG9yICopX3RoZW1lQ29sb3IKKy0gKENvY29hQ29sb3IgKil0aGVtZUNvbG9yCiB7CiAgICAg YXV0byB0aGVtZUNvbG9yID0gX3BhZ2UtPnRoZW1lQ29sb3IoKTsKICAgICBpZiAoIXRoZW1lQ29s b3IuaXNWYWxpZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlld1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXdQcml2YXRlLmgKaW5kZXggNDc0ZWYxOGFiMWY4OWU4ZGUwMWExMTA4YWYwNWI5 OTMwMDk2NWEyYi4uYzRjZGZiYjhlMDQ4NTVhYzVhNTdjZmEzY2E1ZmE2NmUyM2YzZDE1MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld1ByaXZh dGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJp dmF0ZS5oCkBAIC0zNzAsMjEgKzM3MCw2IEBAIGZvciB0aGlzIHByb3BlcnR5LgogLSAodm9pZClf cmVzdG9yZUFwcEhpZ2hsaWdodHM6KE5TQXJyYXk8TlNEYXRhICo+ICopZGF0YSBXS19BUElfQVZB SUxBQkxFKG1hY29zKFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogLSAodm9pZClfYWRk QXBwSGlnaGxpZ2h0IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19J T1NfVEJBKSk7CiAKLS8qISBAYWJzdHJhY3QgVGhlIHRoZW1lIGNvbG9yIG9mIHRoZSBhY3RpdmUg cGFnZS4KLSBAZGlzY3Vzc2lvbiBUaGlzIGlzIHRoZSB2YWx1ZSBvZiB0aGUgbW9zdCByZWNlbnRs eSBjcmVhdGVkIG9yIG1vZGlmaWVkCi0gQHRleHRibG9jawotICAgIDxtZXRhIG5hbWU9InRoZW1l LWNvbG9yIiBjb250ZW50cz0iLi4uIj4KLSBAL3RleHRibG9jawotIGluIHRoZSBjdXJyZW50IHBh Z2UuCi0gQGxpbmsgV0tXZWJWaWV3IEAvbGluayBpcyBrZXktdmFsdWUgb2JzZXJ2aW5nIChLVk8p IGNvbXBsaWFudCBmb3IgdGhpcwotIHByb3BlcnR5LgotICovCi0jaWYgVEFSR0VUX09TX0lQSE9O RQotQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUNvbG9yICpfdGhlbWVDb2xvciBX S19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7Ci0jZWxzZQotQHByb3BlcnR5IChub25h dG9taWMsIHJlYWRvbmx5KSBOU0NvbG9yICpfdGhlbWVDb2xvciBXS19BUElfQVZBSUxBQkxFKG1h Y29zKFdLX01BQ19UQkEpKTsKLSNlbmRpZgotCiAjaWYgVEFSR0VUX09TX0lQSE9ORQogQHByb3Bl cnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUNvbG9yICpfcGFnZUV4dGVuZGVkQmFja2dyb3Vu ZENvbG9yIFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKICNlbHNlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1wbENvY29hLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvUGFnZUNsaWVudEltcGxDb2NvYS5tbQpp bmRleCA3ZDUwN2JlOTA4NDUxNWIxYWEyOTU4MjRkOGIyNDIwNmU0NGUyYTg3Li4zODAzNTcwYzU2 YTg0ZWQzOWQ0MDc3NzRlODVkMWI1YTA5YTRjNmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1wbENvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0NvY29hL1BhZ2VDbGllbnRJbXBsQ29jb2EubW0KQEAgLTQ2LDEyICs0Niwx MiBAQCBQYWdlQ2xpZW50SW1wbENvY29hOjp+UGFnZUNsaWVudEltcGxDb2NvYSgpID0gZGVmYXVs dDsKIAogdm9pZCBQYWdlQ2xpZW50SW1wbENvY29hOjp0aGVtZUNvbG9yV2lsbENoYW5nZSgpCiB7 Ci0gICAgW21fd2ViVmlldyB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6QCJfdGhlbWVDb2xvciJdOwor ICAgIFttX3dlYlZpZXcgd2lsbENoYW5nZVZhbHVlRm9yS2V5OkAidGhlbWVDb2xvciJdOwogfQog CiB2b2lkIFBhZ2VDbGllbnRJbXBsQ29jb2E6OnRoZW1lQ29sb3JEaWRDaGFuZ2UoKQogewotICAg IFttX3dlYlZpZXcgZGlkQ2hhbmdlVmFsdWVGb3JLZXk6QCJfdGhlbWVDb2xvciJdOworICAgIFtt X3dlYlZpZXcgZGlkQ2hhbmdlVmFsdWVGb3JLZXk6QCJ0aGVtZUNvbG9yIl07CiB9CiAKIHZvaWQg UGFnZUNsaWVudEltcGxDb2NvYTo6cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yV2lsbENoYW5n ZSgpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg YTQxYWUzNzAwM2JjNTVjY2NkZjE2ZmM2MDhkMzg1NTFiNzdkMjNiZC4uYTZkMTFkZTcxNDFmNjQw ZDhiYTA0ZTA4YjMxODdmMWVlNjAwYTk2NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTE0ICBEZXZpbiBS b3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBQcm9tb3RlIGAtW1dLV2ViVmll dyBfdGhlbWVDb2xvcl1gIFNQSSB0byBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyNDU3MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzUyMzE2 MDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBU ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hUTUxNZXRhVGhlbWVDb2xvci5tbToKKyAg ICAgICAgKFRFU1QuSFRNTE1ldGFUaGVtZUNvbG9yLk9uTG9hZCk6CisgICAgICAgIChURVNULkhU TUxNZXRhVGhlbWVDb2xvci5NdWx0aXBsZVRhZ3MpOgorICAgICAgICAoLVtXS1dlYlZpZXdUaGVt ZUNvbG9yT2JzZXJ2ZXIgaW5pdFdpdGhXZWJWaWV3Ol0pOgorICAgICAgICAoVEVTVC5IVE1MTWV0 YVRoZW1lQ29sb3IuS1ZPKToKKyAgICAgICAgKFRFU1QuSFRNTE1ldGFUaGVtZUNvbG9yLkV4cGVy aW1lbnRhbFVzZVRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yKToKKwogMjAy MS0wNC0xNCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAg W3Jlc3VsdHMud2Via2l0Lm9yZ10gRG9jdW1lbnQgcmVmIEFQSSBhcmd1bWVudApkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9IVE1MTWV0YVRoZW1lQ29s b3IubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hUTUxNZXRhVGhl bWVDb2xvci5tbQppbmRleCAyNmIyZWI1MzQ0NjZmODkzNTQ5OGJlNDA1OTdlOTA4N2RiMjliZTk0 Li44YjBiY2NjYTViNzYwMjc2MTNhYmRkYzMwNTlkOWRjNjE1MjFjZjc2IDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hUTUxNZXRhVGhlbWVDb2xvci5t bQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hUTUxNZXRhVGhl bWVDb2xvci5tbQpAQCAtNDMsMjkgKzQzLDI5IEBAIGNvbnN0ZXhwciBDR0Zsb2F0IGJsdWVDb2xv ckNvbXBvbmVudHNbNF0gPSB7IDAsIDAsIDEsIDEgfTsKIFRFU1QoSFRNTE1ldGFUaGVtZUNvbG9y LCBPbkxvYWQpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKLSAgICBF WFBFQ1RfVFJVRSghW3dlYlZpZXcgX3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dl YlZpZXcgdGhlbWVDb2xvcl0pOwogCiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1M U3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRlQ2hpbGRGcmFtZXNQYWludDpAIjxtZXRhIG5h bWU9J3RoZW1lLWNvbG9yJyBjb250ZW50PSdyZWQnPiJdOwogCiAgICAgYXV0byBzUkdCQ29sb3JT cGFjZSA9IGFkb3B0Q0YoQ0dDb2xvclNwYWNlQ3JlYXRlV2l0aE5hbWUoa0NHQ29sb3JTcGFjZVNS R0IpKTsKICAgICBhdXRvIHJlZENvbG9yID0gYWRvcHRDRihDR0NvbG9yQ3JlYXRlKHNSR0JDb2xv clNwYWNlLmdldCgpLCByZWRDb2xvckNvbXBvbmVudHMpKTsKLSAgICBFWFBFQ1RfVFJVRShDR0Nv bG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IF90aGVtZUNvbG9yXS5DR0NvbG9yLCByZWRDb2xvci5n ZXQoKSkpOworICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgdGhl bWVDb2xvcl0uQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkpKTsKIAogICAgIFt3ZWJWaWV3IHN5bmNo cm9ub3VzbHlMb2FkSFRNTFN0cmluZ0FuZFdhaXRVbnRpbEFsbEltbWVkaWF0ZUNoaWxkRnJhbWVz UGFpbnQ6QCI8bWV0YSBuYW1lPSdub3QtdGhlbWUtY29sb3InIGNvbnRlbnQ9J3JlZCc+Il07CiAK LSAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXcgX3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJV RSghW3dlYlZpZXcgdGhlbWVDb2xvcl0pOwogfQogCiBURVNUKEhUTUxNZXRhVGhlbWVDb2xvciwg TXVsdGlwbGVUYWdzKQogewogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApXSk7Ci0g ICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3IF90aGVtZUNvbG9yXSk7CisgICAgRVhQRUNUX1RSVUUo IVt3ZWJWaWV3IHRoZW1lQ29sb3JdKTsKIAogICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2Fk SFRNTFN0cmluZ0FuZFdhaXRVbnRpbEFsbEltbWVkaWF0ZUNoaWxkRnJhbWVzUGFpbnQ6QCI8bWV0 YSBuYW1lPSd0aGVtZS1jb2xvcicgY29udGVudD0ncmVkJz48bWV0YSBuYW1lPSd0aGVtZS1jb2xv cicgY29udGVudD0nYmx1ZSc+Il07CiAKICAgICBhdXRvIHNSR0JDb2xvclNwYWNlID0gYWRvcHRD RihDR0NvbG9yU3BhY2VDcmVhdGVXaXRoTmFtZShrQ0dDb2xvclNwYWNlU1JHQikpOwogICAgIGF1 dG8gYmx1ZUNvbG9yID0gYWRvcHRDRihDR0NvbG9yQ3JlYXRlKHNSR0JDb2xvclNwYWNlLmdldCgp LCBibHVlQ29sb3JDb21wb25lbnRzKSk7Ci0gICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9D b2xvcihbd2ViVmlldyBfdGhlbWVDb2xvcl0uQ0dDb2xvciwgYmx1ZUNvbG9yLmdldCgpKSk7Cisg ICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyB0aGVtZUNvbG9yXS5D R0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKIH0KIAogQGludGVyZmFjZSBXS1dlYlZpZXdUaGVt ZUNvbG9yT2JzZXJ2ZXIgOiBOU09iamVjdApAQCAtODcsNyArODcsNyBAQCAtIChpbnN0YW5jZXR5 cGUpaW5pdFdpdGhXZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3CiAgICAgX3N0YXRlID0gQCJi ZWZvcmUtaW5pdCI7CiAKICAgICBfd2ViVmlldyA9IHdlYlZpZXc7Ci0gICAgW193ZWJWaWV3IGFk ZE9ic2VydmVyOnNlbGYgZm9yS2V5UGF0aDpAIl90aGVtZUNvbG9yIiBvcHRpb25zOk5TS2V5VmFs dWVPYnNlcnZpbmdPcHRpb25Jbml0aWFsIGNvbnRleHQ6bmlsXTsKKyAgICBbX3dlYlZpZXcgYWRk T2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAidGhlbWVDb2xvciIgb3B0aW9uczpOU0tleVZhbHVl T2JzZXJ2aW5nT3B0aW9uSW5pdGlhbCBjb250ZXh0Om5pbF07CiAKICAgICByZXR1cm4gc2VsZjsK IH0KQEAgLTEzOCwzNiArMTM4LDM2IEBAIFRFU1QoSFRNTE1ldGFUaGVtZUNvbG9yLCBLVk8pCiAg ICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRo RnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKICAgICBhdXRvIHRoZW1lQ29sb3JP YnNlcnZlciA9IGFkb3B0TlMoW1tXS1dlYlZpZXdUaGVtZUNvbG9yT2JzZXJ2ZXIgYWxsb2NdIGlu aXRXaXRoV2ViVmlldzp3ZWJWaWV3LmdldCgpXSk7CiAgICAgRVhQRUNUX05TU1RSSU5HX0VRKCJh ZnRlci1pbml0IiwgW3RoZW1lQ29sb3JPYnNlcnZlciBzdGF0ZV0pOwotICAgIEVYUEVDVF9UUlVF KCFbd2ViVmlldyBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9UUlVFKCFbd2ViVmlldyB0aGVt ZUNvbG9yXSk7CiAKICAgICBbdGhlbWVDb2xvck9ic2VydmVyIHNldFN0YXRlOkAiYmVmb3JlLWxv YWQiXTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmdBbmRXYWl0VW50 aWxBbGxJbW1lZGlhdGVDaGlsZEZyYW1lc1BhaW50OkAiPG1ldGEgbmFtZT0ndGhlbWUtY29sb3In IGNvbnRlbnQ9J3JlZCc+Il07CiAgICAgRVhQRUNUX05TU1RSSU5HX0VRKCJhZnRlci1sb2FkIiwg W3RoZW1lQ29sb3JPYnNlcnZlciBzdGF0ZV0pOwotICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVh bFRvQ29sb3IoW3dlYlZpZXcgX3RoZW1lQ29sb3JdLkNHQ29sb3IsIHJlZENvbG9yLmdldCgpKSk7 CisgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyB0aGVtZUNvbG9y XS5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOwogCiAgICAgW3RoZW1lQ29sb3JPYnNlcnZlciBz ZXRTdGF0ZTpAImJlZm9yZS1jb250ZW50LWNoYW5nZSJdOwogICAgIFt3ZWJWaWV3IG9iamVjdEJ5 RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdtZXRhJykuc2V0 QXR0cmlidXRlKCdjb250ZW50JywgJ2JsdWUnKSJdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0 UHJlc2VudGF0aW9uVXBkYXRlXTsKICAgICBFWFBFQ1RfTlNTVFJJTkdfRVEoImFmdGVyLWNvbnRl bnQtY2hhbmdlIiwgW3RoZW1lQ29sb3JPYnNlcnZlciBzdGF0ZV0pOwotICAgIEVYUEVDVF9UUlVF KENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgX3RoZW1lQ29sb3JdLkNHQ29sb3IsIGJsdWVD b2xvci5nZXQoKSkpOworICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZp ZXcgdGhlbWVDb2xvcl0uQ0dDb2xvciwgYmx1ZUNvbG9yLmdldCgpKSk7CiAKICAgICBbdGhlbWVD b2xvck9ic2VydmVyIHNldFN0YXRlOkAiYmVmb3JlLW5hbWUtY2hhbmdlLW5vdC10aGVtZS1jb2xv ciJdOwogICAgIFt3ZWJWaWV3IG9iamVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVu dC5xdWVyeVNlbGVjdG9yKCdtZXRhJykuc2V0QXR0cmlidXRlKCduYW1lJywgJ25vdC10aGVtZS1j b2xvcicpIl07CiAgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOwog ICAgIEVYUEVDVF9OU1NUUklOR19FUSgiYWZ0ZXItbmFtZS1jaGFuZ2Utbm90LXRoZW1lLWNvbG9y IiwgW3RoZW1lQ29sb3JPYnNlcnZlciBzdGF0ZV0pOwotICAgIEVYUEVDVF9UUlVFKCFbd2ViVmll dyBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9UUlVFKCFbd2ViVmlldyB0aGVtZUNvbG9yXSk7 CiAKICAgICBbdGhlbWVDb2xvck9ic2VydmVyIHNldFN0YXRlOkAiYmVmb3JlLW5hbWUtY2hhbmdl LXRoZW1lLWNvbG9yIl07CiAgICAgW3dlYlZpZXcgb2JqZWN0QnlFdmFsdWF0aW5nSmF2YVNjcmlw dDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ21ldGEnKS5zZXRBdHRyaWJ1dGUoJ25hbWUnLCAn dGhlbWUtY29sb3InKSJdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBk YXRlXTsKICAgICBFWFBFQ1RfTlNTVFJJTkdfRVEoImFmdGVyLW5hbWUtY2hhbmdlLXRoZW1lLWNv bG9yIiwgW3RoZW1lQ29sb3JPYnNlcnZlciBzdGF0ZV0pOwotICAgIEVYUEVDVF9UUlVFKENHQ29s b3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgX3RoZW1lQ29sb3JdLkNHQ29sb3IsIGJsdWVDb2xvci5n ZXQoKSkpOworICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgdGhl bWVDb2xvcl0uQ0dDb2xvciwgYmx1ZUNvbG9yLmdldCgpKSk7CiAKICAgICBbdGhlbWVDb2xvck9i c2VydmVyIHNldFN0YXRlOkAiYmVmb3JlLW5vZGUtcmVtb3ZlZCJdOwogICAgIFt3ZWJWaWV3IG9i amVjdEJ5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdtZXRh JykucmVtb3ZlKCkiXTsKICAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0 ZV07CiAgICAgRVhQRUNUX05TU1RSSU5HX0VRKCJhZnRlci1ub2RlLXJlbW92ZWQiLCBbdGhlbWVD b2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3IF90aGVtZUNv bG9yXSk7CisgICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3IHRoZW1lQ29sb3JdKTsKIH0KIAogI2lm IFBMQVRGT1JNKElPU19GQU1JTFkpCkBAIC0xOTUsMjUgKzE5NSwyNSBAQCBURVNUKEhUTUxNZXRh VGhlbWVDb2xvciwgRXhwZXJpbWVudGFsVXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3IpCiAgICAgYXV0byBibHVlQ29sb3IgPSBhZG9wdENGKENHQ29sb3JDcmVhdGUoc1JH QkNvbG9yU3BhY2UuZ2V0KCksIGJsdWVDb2xvckNvbXBvbmVudHMpKTsKIAogICAgIGF1dG8gd2Vi Vmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciA9IGNyZWF0 ZVdlYlZpZXcoVXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3I6Ok5vKTsK LSAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFC YWNrZ3JvdW5kQ29sb3IgX3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXdX aXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xvcl0p OwogCiAgICAgW3dlYlZpZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5k Q29sb3Igc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRl Q2hpbGRGcmFtZXNQYWludDpAIjxib2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiBibHVlJz4i XTsKLSAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFy ZWFCYWNrZ3JvdW5kQ29sb3IgX3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dlYlZp ZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xv cl0pOwogICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXdXaXRob3V0 VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Igc2Nyb2xsVmlld10uYmFja2dy b3VuZENvbG9yLkNHQ29sb3IsIGJsdWVDb2xvci5nZXQoKSkpOwogCiAgICAgW3dlYlZpZXdXaXRo b3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Igc3luY2hyb25vdXNseUxv YWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRlQ2hpbGRGcmFtZXNQYWludDpAIjxt ZXRhIG5hbWU9J3RoZW1lLWNvbG9yJyBjb250ZW50PSdyZWQnPjxib2R5IHN0eWxlPSdiYWNrZ3Jv dW5kLWNvbG9yOiBibHVlJz4iXTsKLSAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9y KFt3ZWJWaWV3V2l0aG91dFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIF90 aGVtZUNvbG9yXS5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOworICAgIEVYUEVDVF9UUlVFKENH Q29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFC YWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xvcl0uQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkpKTsKICAg ICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3V2l0aG91dFRoZW1lQ29s b3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIHNjcm9sbFZpZXddLmJhY2tncm91bmRDb2xv ci5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKIAogICAgIGF1dG8gd2ViVmlld1dpdGhUaGVt ZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciA9IGNyZWF0ZVdlYlZpZXcoVXNlVGhl bWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3I6Olllcyk7Ci0gICAgRVhQRUNUX1RS VUUoIVt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIF90 aGVtZUNvbG9yXSk7CisgICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JT Y3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIHRoZW1lQ29sb3JdKTsKIAogICAgIFt3ZWJWaWV3V2l0 aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIHN5bmNocm9ub3VzbHlMb2Fk SFRNTFN0cmluZ0FuZFdhaXRVbnRpbEFsbEltbWVkaWF0ZUNoaWxkRnJhbWVzUGFpbnQ6QCI8Ym9k eSBzdHlsZT0nYmFja2dyb3VuZC1jb2xvcjogYmx1ZSc+Il07Ci0gICAgRVhQRUNUX1RSVUUoIVt3 ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIF90aGVtZUNv bG9yXSk7CisgICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxB cmVhQmFja2dyb3VuZENvbG9yIHRoZW1lQ29sb3JdKTsKICAgICBFWFBFQ1RfVFJVRShDR0NvbG9y RXF1YWxUb0NvbG9yKFt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3Vu ZENvbG9yIHNjcm9sbFZpZXddLmJhY2tncm91bmRDb2xvci5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0 KCkpKTsKIAogICAgIFt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3Vu ZENvbG9yIHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZ0FuZFdhaXRVbnRpbEFsbEltbWVkaWF0 ZUNoaWxkRnJhbWVzUGFpbnQ6QCI8bWV0YSBuYW1lPSd0aGVtZS1jb2xvcicgY29udGVudD0ncmVk Jz48Ym9keSBzdHlsZT0nYmFja2dyb3VuZC1jb2xvcjogYmx1ZSc+Il07Ci0gICAgRVhQRUNUX1RS VUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlld1dpdGhUaGVtZUNvbG9yRm9yU2Nyb2xsQXJl YUJhY2tncm91bmRDb2xvciBfdGhlbWVDb2xvcl0uQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkpKTsK KyAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3V2l0aFRoZW1lQ29s b3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIHRoZW1lQ29sb3JdLkNHQ29sb3IsIHJlZENv bG9yLmdldCgpKSk7CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmll d1dpdGhUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciBzY3JvbGxWaWV3XS5i YWNrZ3JvdW5kQ29sb3IuQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkpKTsKIH0KIAo= 426045 2021-04-14 14:15:57 -0700 2021-04-14 18:26:30 -0700 Patch bug-224571-20210414151556.patch text/plain 14242 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMDUwMzZjZTRlNjg0Mzg1MGY2YjhmNWY5OWY1ZTllYzdmZjMxZTQyMS4uODEx ZGQ0NGM0MTgyNjUyZWYyMjY5YWM3ZmFhOWJkNzQ5M2JkYTI5MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMCBAQAorMjAyMS0wNC0xNCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisK KyAgICAgICAgUHJvbW90ZSBgLVtXS1dlYlZpZXcgX3RoZW1lQ29sb3JdYCBTUEkgdG8gQVBJCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ1NzEKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc1MjMxNjAyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAg KC1bV0tXZWJWaWV3IHRoZW1lQ29sb3JdKTogQWRkZWQuCisgICAgICAgICgtW1dLV2ViVmlldyBf dGhlbWVDb2xvcl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1wbENvY29hLm1t OgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbENvY29hOjp0aGVtZUNvbG9yV2lsbENo YW5nZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsQ29jb2E6OnRoZW1lQ29sb3JE aWRDaGFuZ2UpOgorCiAyMDIxLTA0LTE0ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA YXBwbGUuY29tPgogCiAgICAgICAgIFNlcnZpY2Ugd29ya2VyIHNvZnQtdXBkYXRlIGxvYWRzIG5v dCBiZWluZyBtYXJrZWQgYXBwLWJvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3LmgKaW5kZXggMTkxNDQ2NDIyM2Y3NDExMWUwMmU0MTc3NGQxZTBmMWRh ODQ5NjljMS4uOGY5NTQzYTM3ZDZjNzlmZDZlOWJkYTczZWJiZmFlNTA0Njg4NDAyMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcuaApAQCAtNTU5LDYg KzU1OSwyMyBAQCBUaGUgdW5pZm9ybSB0eXBlIGlkZW50aWZpZXIga1VUVHlwZVdlYkFyY2hpdmUg Y2FuIGJlIHVzZWQgZ2V0IHRoZSByZWxhdGVkIHBhc3RlYgogKi8KIC0gKE5TUHJpbnRPcGVyYXRp b24gKilwcmludE9wZXJhdGlvbldpdGhQcmludEluZm86KE5TUHJpbnRJbmZvICopcHJpbnRJbmZv IFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoMTEuMCkpOwogI2VuZGlmCisKKy8qISBAYWJzdHJhY3Qg VGhlIHRoZW1lIGNvbG9yIG9mIHRoZSBhY3RpdmUgcGFnZS4KKyBAZGlzY3Vzc2lvbiBUaGlzIGlz IHRoZSBDU1MgY29sb3IgcGFyc2VkIHZhbHVlIG9mIHRoZSBgY29udGVudHNgCisgYXR0cmlidXRl IG9mIHRoZSBmaXJzdCB2YWxpZAorIEB0ZXh0YmxvY2sKKyAgICA8bWV0YSBuYW1lPSJ0aGVtZS1j b2xvciIgY29udGVudHM9Ii4uLiI+CisgQC90ZXh0YmxvY2sKKyBlbGVtZW50IGluIHRoZSBjdXJy ZW50IG1haW4gZG9jdW1lbnQuCisgQGxpbmsgV0tXZWJWaWV3IEAvbGluayBpcyBrZXktdmFsdWUg b2JzZXJ2aW5nIChLVk8pIGNvbXBsaWFudCBmb3IgdGhpcworIHByb3BlcnR5LgorICovCisjaWYg VEFSR0VUX09TX0lQSE9ORQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBudWxsYWJs ZSkgVUlDb2xvciAqdGhlbWVDb2xvciBXS19BUElfQVZBSUxBQkxFKGlvcyhXS19JT1NfVEJBKSk7 CisjZWxzZQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBudWxsYWJsZSkgTlNDb2xv ciAqdGhlbWVDb2xvciBXS19BUElfQVZBSUxBQkxFKG1hY29zKFdLX01BQ19UQkEpKTsKKyNlbmRp ZgorCiBAZW5kCiAKICNpZiAhVEFSR0VUX09TX0lQSE9ORQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggN2QzZGFhZDk4M2JiOGNkMTk5ZjJl NDFhMjgyNWMwODVlODU3YjgxMi4uNDgwMTBlNDQ0N2RiZDZjNjVmYjE3NzdkMDhkY2JhMDAwNmZh YmZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3 Lm1tCkBAIC0yOTgyLDcgKzI5ODIsNyBAQCAtICh2b2lkKV9zZXRDYW5Vc2VDcmVkZW50aWFsU3Rv cmFnZTooQk9PTCljYW5Vc2VDcmVkZW50aWFsU3RvcmFnZQogICAgIF9wYWdlLT5zZXRDYW5Vc2VD cmVkZW50aWFsU3RvcmFnZShjYW5Vc2VDcmVkZW50aWFsU3RvcmFnZSk7CiB9CiAKLS0gKENvY29h Q29sb3IgKilfdGhlbWVDb2xvcgorLSAoQ29jb2FDb2xvciAqKXRoZW1lQ29sb3IKIHsKICAgICBh dXRvIHRoZW1lQ29sb3IgPSBfcGFnZS0+dGhlbWVDb2xvcigpOwogICAgIGlmICghdGhlbWVDb2xv ci5pc1ZhbGlkKCkpCkBAIC0yOTkwLDYgKzI5OTAsMTEgQEAgLSAoQ29jb2FDb2xvciAqKV90aGVt ZUNvbG9yCiAgICAgcmV0dXJuIFdlYkNvcmU6OnBsYXRmb3JtQ29sb3IodGhlbWVDb2xvcik7CiB9 CiAKKy0gKENvY29hQ29sb3IgKilfdGhlbWVDb2xvcgoreworICAgIHJldHVybiBbc2VsZiB0aGVt ZUNvbG9yXTsKK30KKwogLSAoQ29jb2FDb2xvciAqKV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29s b3IKIHsKICAgICBhdXRvIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciA9IF9wYWdlLT5wYWdl RXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3UHJpdmF0ZS5oCmluZGV4IDQ3NGVmMThhYjFmODllOGRl MDFhMTEwOGFmMDViOTkzMDA5NjVhMmIuLjc0MGUwNmNiMjM1MGQwNmY5MWMyMTNjZWZkNjc5YWQ2 ZjA3ZDU5ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXdQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlld1ByaXZhdGUuaApAQCAtMzcwLDE5ICszNzAsMTEgQEAgZm9yIHRoaXMgcHJvcGVy dHkuCiAtICh2b2lkKV9yZXN0b3JlQXBwSGlnaGxpZ2h0czooTlNBcnJheTxOU0RhdGEgKj4gKilk YXRhIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7 CiAtICh2b2lkKV9hZGRBcHBIaWdobGlnaHQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcyhXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIAotLyohIEBhYnN0cmFjdCBUaGUgdGhlbWUgY29sb3Ig b2YgdGhlIGFjdGl2ZSBwYWdlLgotIEBkaXNjdXNzaW9uIFRoaXMgaXMgdGhlIHZhbHVlIG9mIHRo ZSBtb3N0IHJlY2VudGx5IGNyZWF0ZWQgb3IgbW9kaWZpZWQKLSBAdGV4dGJsb2NrCi0gICAgPG1l dGEgbmFtZT0idGhlbWUtY29sb3IiIGNvbnRlbnRzPSIuLi4iPgotIEAvdGV4dGJsb2NrCi0gaW4g dGhlIGN1cnJlbnQgcGFnZS4KLSBAbGluayBXS1dlYlZpZXcgQC9saW5rIGlzIGtleS12YWx1ZSBv YnNlcnZpbmcgKEtWTykgY29tcGxpYW50IGZvciB0aGlzCi0gcHJvcGVydHkuCi0gKi8KKy8vIEZJ WE1FOiBSZW1vdmUgb2xkIGAtW1dLV2ViVmlldyBfdGhlbWVDb2xvcl1gIFNQSSA8cmRhcjovLzc2 NjYyNjQ0PgogI2lmIFRBUkdFVF9PU19JUEhPTkUKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFk b25seSkgVUlDb2xvciAqX3RoZW1lQ29sb3IgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RC QSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUNvbG9yICpfdGhlbWVDb2xv ciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJ0aGVtZUNvbG9yIiwgaW9zKFdL X0lPU19UQkEsIFdLX0lPU19UQkEpKTsKICNlbHNlCi1AcHJvcGVydHkgKG5vbmF0b21pYywgcmVh ZG9ubHkpIE5TQ29sb3IgKl90aGVtZUNvbG9yIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFD X1RCQSkpOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU0NvbG9yICpfdGhlbWVD b2xvciBXS19BUElfREVQUkVDQVRFRF9XSVRIX1JFUExBQ0VNRU5UKCJ0aGVtZUNvbG9yIiwgbWFj b3MoV0tfTUFDX1RCQSwgV0tfTUFDX1RCQSkpOwogI2VuZGlmCiAKICNpZiBUQVJHRVRfT1NfSVBI T05FCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50 SW1wbENvY29hLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvUGFnZUNsaWVudElt cGxDb2NvYS5tbQppbmRleCA3ZDUwN2JlOTA4NDUxNWIxYWEyOTU4MjRkOGIyNDIwNmU0NGUyYTg3 Li5hYWUyOTBiNjQ1MDQ3ZDc5ODM0MGY2MTY3YjQzMDg3NGU2NTZmZWFlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9QYWdlQ2xpZW50SW1wbENvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1BhZ2VDbGllbnRJbXBsQ29jb2EubW0KQEAg LTQ2LDExICs0NiwxMyBAQCBQYWdlQ2xpZW50SW1wbENvY29hOjp+UGFnZUNsaWVudEltcGxDb2Nv YSgpID0gZGVmYXVsdDsKIAogdm9pZCBQYWdlQ2xpZW50SW1wbENvY29hOjp0aGVtZUNvbG9yV2ls bENoYW5nZSgpCiB7CisgICAgW21fd2ViVmlldyB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6QCJ0aGVt ZUNvbG9yIl07CiAgICAgW21fd2ViVmlldyB3aWxsQ2hhbmdlVmFsdWVGb3JLZXk6QCJfdGhlbWVD b2xvciJdOwogfQogCiB2b2lkIFBhZ2VDbGllbnRJbXBsQ29jb2E6OnRoZW1lQ29sb3JEaWRDaGFu Z2UoKQogeworICAgIFttX3dlYlZpZXcgZGlkQ2hhbmdlVmFsdWVGb3JLZXk6QCJ0aGVtZUNvbG9y Il07CiAgICAgW21fd2ViVmlldyBkaWRDaGFuZ2VWYWx1ZUZvcktleTpAIl90aGVtZUNvbG9yIl07 CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCBhNDFhZTM3MDAzYmM1NWNjY2RmMTZmYzYwOGQzODU1MWI3N2QyM2JkLi5hNmQxMWRlNzE0MWY2 NDBkOGJhMDRlMDhiMzE4N2YxZWU2MDBhOTY3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjEtMDQtMTQgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFByb21vdGUgYC1bV0tXZWJW aWV3IF90aGVtZUNvbG9yXWAgU1BJIHRvIEFQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTcxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NTIz MTYwMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSFRNTE1ldGFUaGVtZUNvbG9yLm1tOgor ICAgICAgICAoVEVTVC5IVE1MTWV0YVRoZW1lQ29sb3IuT25Mb2FkKToKKyAgICAgICAgKFRFU1Qu SFRNTE1ldGFUaGVtZUNvbG9yLk11bHRpcGxlVGFncyk6CisgICAgICAgICgtW1dLV2ViVmlld1Ro ZW1lQ29sb3JPYnNlcnZlciBpbml0V2l0aFdlYlZpZXc6XSk6CisgICAgICAgIChURVNULkhUTUxN ZXRhVGhlbWVDb2xvci5LVk8pOgorICAgICAgICAoVEVTVC5IVE1MTWV0YVRoZW1lQ29sb3IuRXhw ZXJpbWVudGFsVXNlVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IpOgorCiAy MDIxLTA0LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAg ICBbcmVzdWx0cy53ZWJraXQub3JnXSBEb2N1bWVudCByZWYgQVBJIGFyZ3VtZW50CmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0hUTUxNZXRhVGhlbWVD b2xvci5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSFRNTE1ldGFU aGVtZUNvbG9yLm1tCmluZGV4IDI2YjJlYjUzNDQ2NmY4OTM1NDk4YmU0MDU5N2U5MDg3ZGIyOWJl OTQuLjhiMGJjY2NhNWI3NjAyNzYxM2FiZGRjMzA1OWQ5ZGM2MTUyMWNmNzYgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSFRNTE1ldGFUaGVtZUNvbG9y Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSFRNTE1ldGFU aGVtZUNvbG9yLm1tCkBAIC00MywyOSArNDMsMjkgQEAgY29uc3RleHByIENHRmxvYXQgYmx1ZUNv bG9yQ29tcG9uZW50c1s0XSA9IHsgMCwgMCwgMSwgMSB9OwogVEVTVChIVE1MTWV0YVRoZW1lQ29s b3IsIE9uTG9hZCkKIHsKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOwotICAg IEVYUEVDVF9UUlVFKCFbd2ViVmlldyBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9UUlVFKCFb d2ViVmlldyB0aGVtZUNvbG9yXSk7CiAKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhU TUxTdHJpbmdBbmRXYWl0VW50aWxBbGxJbW1lZGlhdGVDaGlsZEZyYW1lc1BhaW50OkAiPG1ldGEg bmFtZT0ndGhlbWUtY29sb3InIGNvbnRlbnQ9J3JlZCc+Il07CiAKICAgICBhdXRvIHNSR0JDb2xv clNwYWNlID0gYWRvcHRDRihDR0NvbG9yU3BhY2VDcmVhdGVXaXRoTmFtZShrQ0dDb2xvclNwYWNl U1JHQikpOwogICAgIGF1dG8gcmVkQ29sb3IgPSBhZG9wdENGKENHQ29sb3JDcmVhdGUoc1JHQkNv bG9yU3BhY2UuZ2V0KCksIHJlZENvbG9yQ29tcG9uZW50cykpOwotICAgIEVYUEVDVF9UUlVFKENH Q29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXcgX3RoZW1lQ29sb3JdLkNHQ29sb3IsIHJlZENvbG9y LmdldCgpKSk7CisgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyB0 aGVtZUNvbG9yXS5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOwogCiAgICAgW3dlYlZpZXcgc3lu Y2hyb25vdXNseUxvYWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRlQ2hpbGRGcmFt ZXNQYWludDpAIjxtZXRhIG5hbWU9J25vdC10aGVtZS1jb2xvcicgY29udGVudD0ncmVkJz4iXTsK IAotICAgIEVYUEVDVF9UUlVFKCFbd2ViVmlldyBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9U UlVFKCFbd2ViVmlldyB0aGVtZUNvbG9yXSk7CiB9CiAKIFRFU1QoSFRNTE1ldGFUaGVtZUNvbG9y LCBNdWx0aXBsZVRhZ3MpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dl YlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsK LSAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXcgX3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJV RSghW3dlYlZpZXcgdGhlbWVDb2xvcl0pOwogCiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxv YWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRlQ2hpbGRGcmFtZXNQYWludDpAIjxt ZXRhIG5hbWU9J3RoZW1lLWNvbG9yJyBjb250ZW50PSdyZWQnPjxtZXRhIG5hbWU9J3RoZW1lLWNv bG9yJyBjb250ZW50PSdibHVlJz4iXTsKIAogICAgIGF1dG8gc1JHQkNvbG9yU3BhY2UgPSBhZG9w dENGKENHQ29sb3JTcGFjZUNyZWF0ZVdpdGhOYW1lKGtDR0NvbG9yU3BhY2VTUkdCKSk7CiAgICAg YXV0byBibHVlQ29sb3IgPSBhZG9wdENGKENHQ29sb3JDcmVhdGUoc1JHQkNvbG9yU3BhY2UuZ2V0 KCksIGJsdWVDb2xvckNvbXBvbmVudHMpKTsKLSAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxU b0NvbG9yKFt3ZWJWaWV3IF90aGVtZUNvbG9yXS5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsK KyAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IHRoZW1lQ29sb3Jd LkNHQ29sb3IsIGJsdWVDb2xvci5nZXQoKSkpOwogfQogCiBAaW50ZXJmYWNlIFdLV2ViVmlld1Ro ZW1lQ29sb3JPYnNlcnZlciA6IE5TT2JqZWN0CkBAIC04Nyw3ICs4Nyw3IEBAIC0gKGluc3RhbmNl dHlwZSlpbml0V2l0aFdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcKICAgICBfc3RhdGUgPSBA ImJlZm9yZS1pbml0IjsKIAogICAgIF93ZWJWaWV3ID0gd2ViVmlldzsKLSAgICBbX3dlYlZpZXcg YWRkT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAiX3RoZW1lQ29sb3IiIG9wdGlvbnM6TlNLZXlW YWx1ZU9ic2VydmluZ09wdGlvbkluaXRpYWwgY29udGV4dDpuaWxdOworICAgIFtfd2ViVmlldyBh ZGRPYnNlcnZlcjpzZWxmIGZvcktleVBhdGg6QCJ0aGVtZUNvbG9yIiBvcHRpb25zOk5TS2V5VmFs dWVPYnNlcnZpbmdPcHRpb25Jbml0aWFsIGNvbnRleHQ6bmlsXTsKIAogICAgIHJldHVybiBzZWxm OwogfQpAQCAtMTM4LDM2ICsxMzgsMzYgQEAgVEVTVChIVE1MTWV0YVRoZW1lQ29sb3IsIEtWTykK ICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdp dGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKV0pOwogICAgIGF1dG8gdGhlbWVDb2xv ck9ic2VydmVyID0gYWRvcHROUyhbW1dLV2ViVmlld1RoZW1lQ29sb3JPYnNlcnZlciBhbGxvY10g aW5pdFdpdGhXZWJWaWV3OndlYlZpZXcuZ2V0KCldKTsKICAgICBFWFBFQ1RfTlNTVFJJTkdfRVEo ImFmdGVyLWluaXQiLCBbdGhlbWVDb2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RS VUUoIVt3ZWJWaWV3IF90aGVtZUNvbG9yXSk7CisgICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3IHRo ZW1lQ29sb3JdKTsKIAogICAgIFt0aGVtZUNvbG9yT2JzZXJ2ZXIgc2V0U3RhdGU6QCJiZWZvcmUt bG9hZCJdOwogICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZ0FuZFdhaXRV bnRpbEFsbEltbWVkaWF0ZUNoaWxkRnJhbWVzUGFpbnQ6QCI8bWV0YSBuYW1lPSd0aGVtZS1jb2xv cicgY29udGVudD0ncmVkJz4iXTsKICAgICBFWFBFQ1RfTlNTVFJJTkdfRVEoImFmdGVyLWxvYWQi LCBbdGhlbWVDb2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVx dWFsVG9Db2xvcihbd2ViVmlldyBfdGhlbWVDb2xvcl0uQ0dDb2xvciwgcmVkQ29sb3IuZ2V0KCkp KTsKKyAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3IHRoZW1lQ29s b3JdLkNHQ29sb3IsIHJlZENvbG9yLmdldCgpKSk7CiAKICAgICBbdGhlbWVDb2xvck9ic2VydmVy IHNldFN0YXRlOkAiYmVmb3JlLWNvbnRlbnQtY2hhbmdlIl07CiAgICAgW3dlYlZpZXcgb2JqZWN0 QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ21ldGEnKS5z ZXRBdHRyaWJ1dGUoJ2NvbnRlbnQnLCAnYmx1ZScpIl07CiAgICAgW3dlYlZpZXcgd2FpdEZvck5l eHRQcmVzZW50YXRpb25VcGRhdGVdOwogICAgIEVYUEVDVF9OU1NUUklOR19FUSgiYWZ0ZXItY29u dGVudC1jaGFuZ2UiLCBbdGhlbWVDb2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RS VUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyBfdGhlbWVDb2xvcl0uQ0dDb2xvciwgYmx1 ZUNvbG9yLmdldCgpKSk7CisgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2Vi VmlldyB0aGVtZUNvbG9yXS5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKIAogICAgIFt0aGVt ZUNvbG9yT2JzZXJ2ZXIgc2V0U3RhdGU6QCJiZWZvcmUtbmFtZS1jaGFuZ2Utbm90LXRoZW1lLWNv bG9yIl07CiAgICAgW3dlYlZpZXcgb2JqZWN0QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3Vt ZW50LnF1ZXJ5U2VsZWN0b3IoJ21ldGEnKS5zZXRBdHRyaWJ1dGUoJ25hbWUnLCAnbm90LXRoZW1l LWNvbG9yJykiXTsKICAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07 CiAgICAgRVhQRUNUX05TU1RSSU5HX0VRKCJhZnRlci1uYW1lLWNoYW5nZS1ub3QtdGhlbWUtY29s b3IiLCBbdGhlbWVDb2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RSVUUoIVt3ZWJW aWV3IF90aGVtZUNvbG9yXSk7CisgICAgRVhQRUNUX1RSVUUoIVt3ZWJWaWV3IHRoZW1lQ29sb3Jd KTsKIAogICAgIFt0aGVtZUNvbG9yT2JzZXJ2ZXIgc2V0U3RhdGU6QCJiZWZvcmUtbmFtZS1jaGFu Z2UtdGhlbWUtY29sb3IiXTsKICAgICBbd2ViVmlldyBvYmplY3RCeUV2YWx1YXRpbmdKYXZhU2Ny aXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcignbWV0YScpLnNldEF0dHJpYnV0ZSgnbmFtZScs ICd0aGVtZS1jb2xvcicpIl07CiAgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25V cGRhdGVdOwogICAgIEVYUEVDVF9OU1NUUklOR19FUSgiYWZ0ZXItbmFtZS1jaGFuZ2UtdGhlbWUt Y29sb3IiLCBbdGhlbWVDb2xvck9ic2VydmVyIHN0YXRlXSk7Ci0gICAgRVhQRUNUX1RSVUUoQ0dD b2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyBfdGhlbWVDb2xvcl0uQ0dDb2xvciwgYmx1ZUNvbG9y LmdldCgpKSk7CisgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlldyB0 aGVtZUNvbG9yXS5DR0NvbG9yLCBibHVlQ29sb3IuZ2V0KCkpKTsKIAogICAgIFt0aGVtZUNvbG9y T2JzZXJ2ZXIgc2V0U3RhdGU6QCJiZWZvcmUtbm9kZS1yZW1vdmVkIl07CiAgICAgW3dlYlZpZXcg b2JqZWN0QnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJ21l dGEnKS5yZW1vdmUoKSJdOwogICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBk YXRlXTsKICAgICBFWFBFQ1RfTlNTVFJJTkdfRVEoImFmdGVyLW5vZGUtcmVtb3ZlZCIsIFt0aGVt ZUNvbG9yT2JzZXJ2ZXIgc3RhdGVdKTsKLSAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXcgX3RoZW1l Q29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXcgdGhlbWVDb2xvcl0pOwogfQogCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKQEAgLTE5NSwyNSArMTk1LDI1IEBAIFRFU1QoSFRNTE1l dGFUaGVtZUNvbG9yLCBFeHBlcmltZW50YWxVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tn cm91bmRDb2xvcikKICAgICBhdXRvIGJsdWVDb2xvciA9IGFkb3B0Q0YoQ0dDb2xvckNyZWF0ZShz UkdCQ29sb3JTcGFjZS5nZXQoKSwgYmx1ZUNvbG9yQ29tcG9uZW50cykpOwogCiAgICAgYXV0byB3 ZWJWaWV3V2l0aG91dFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yID0gY3Jl YXRlV2ViVmlldyhVc2VUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjo6Tm8p OwotICAgIEVYUEVDVF9UUlVFKCFbd2ViVmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJl YUJhY2tncm91bmRDb2xvciBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9UUlVFKCFbd2ViVmll d1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciB0aGVtZUNvbG9y XSk7CiAKICAgICBbd2ViVmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91 bmRDb2xvciBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmdBbmRXYWl0VW50aWxBbGxJbW1lZGlh dGVDaGlsZEZyYW1lc1BhaW50OkAiPGJvZHkgc3R5bGU9J2JhY2tncm91bmQtY29sb3I6IGJsdWUn PiJdOwotICAgIEVYUEVDVF9UUlVFKCFbd2ViVmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xs QXJlYUJhY2tncm91bmRDb2xvciBfdGhlbWVDb2xvcl0pOworICAgIEVYUEVDVF9UUlVFKCFbd2Vi Vmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciB0aGVtZUNv bG9yXSk7CiAgICAgRVhQRUNUX1RSVUUoQ0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlld1dpdGhv dXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciBzY3JvbGxWaWV3XS5iYWNr Z3JvdW5kQ29sb3IuQ0dDb2xvciwgYmx1ZUNvbG9yLmdldCgpKSk7CiAKICAgICBbd2ViVmlld1dp dGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvciBzeW5jaHJvbm91c2x5 TG9hZEhUTUxTdHJpbmdBbmRXYWl0VW50aWxBbGxJbW1lZGlhdGVDaGlsZEZyYW1lc1BhaW50OkAi PG1ldGEgbmFtZT0ndGhlbWUtY29sb3InIGNvbnRlbnQ9J3JlZCc+PGJvZHkgc3R5bGU9J2JhY2tn cm91bmQtY29sb3I6IGJsdWUnPiJdOwotICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29s b3IoW3dlYlZpZXdXaXRob3V0VGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Ig X3RoZW1lQ29sb3JdLkNHQ29sb3IsIHJlZENvbG9yLmdldCgpKSk7CisgICAgRVhQRUNUX1RSVUUo Q0dDb2xvckVxdWFsVG9Db2xvcihbd2ViVmlld1dpdGhvdXRUaGVtZUNvbG9yRm9yU2Nyb2xsQXJl YUJhY2tncm91bmRDb2xvciB0aGVtZUNvbG9yXS5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOwog ICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXdXaXRob3V0VGhlbWVD b2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Igc2Nyb2xsVmlld10uYmFja2dyb3VuZENv bG9yLkNHQ29sb3IsIGJsdWVDb2xvci5nZXQoKSkpOwogCiAgICAgYXV0byB3ZWJWaWV3V2l0aFRo ZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yID0gY3JlYXRlV2ViVmlldyhVc2VU aGVtZUNvbG9yRm9yU2Nyb2xsQXJlYUJhY2tncm91bmRDb2xvcjo6WWVzKTsKLSAgICBFWFBFQ1Rf VFJVRSghW3dlYlZpZXdXaXRoVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Ig X3RoZW1lQ29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXdXaXRoVGhlbWVDb2xvckZv clNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xvcl0pOwogCiAgICAgW3dlYlZpZXdX aXRoVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3Igc3luY2hyb25vdXNseUxv YWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRpYXRlQ2hpbGRGcmFtZXNQYWludDpAIjxi b2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiBibHVlJz4iXTsKLSAgICBFWFBFQ1RfVFJVRSgh W3dlYlZpZXdXaXRoVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IgX3RoZW1l Q29sb3JdKTsKKyAgICBFWFBFQ1RfVFJVRSghW3dlYlZpZXdXaXRoVGhlbWVDb2xvckZvclNjcm9s bEFyZWFCYWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xvcl0pOwogICAgIEVYUEVDVF9UUlVFKENHQ29s b3JFcXVhbFRvQ29sb3IoW3dlYlZpZXdXaXRoVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3Igc2Nyb2xsVmlld10uYmFja2dyb3VuZENvbG9yLkNHQ29sb3IsIGJsdWVDb2xvci5n ZXQoKSkpOwogCiAgICAgW3dlYlZpZXdXaXRoVGhlbWVDb2xvckZvclNjcm9sbEFyZWFCYWNrZ3Jv dW5kQ29sb3Igc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nQW5kV2FpdFVudGlsQWxsSW1tZWRp YXRlQ2hpbGRGcmFtZXNQYWludDpAIjxtZXRhIG5hbWU9J3RoZW1lLWNvbG9yJyBjb250ZW50PSdy ZWQnPjxib2R5IHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9yOiBibHVlJz4iXTsKLSAgICBFWFBFQ1Rf VFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJWaWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxB cmVhQmFja2dyb3VuZENvbG9yIF90aGVtZUNvbG9yXS5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkp OworICAgIEVYUEVDVF9UUlVFKENHQ29sb3JFcXVhbFRvQ29sb3IoW3dlYlZpZXdXaXRoVGhlbWVD b2xvckZvclNjcm9sbEFyZWFCYWNrZ3JvdW5kQ29sb3IgdGhlbWVDb2xvcl0uQ0dDb2xvciwgcmVk Q29sb3IuZ2V0KCkpKTsKICAgICBFWFBFQ1RfVFJVRShDR0NvbG9yRXF1YWxUb0NvbG9yKFt3ZWJW aWV3V2l0aFRoZW1lQ29sb3JGb3JTY3JvbGxBcmVhQmFja2dyb3VuZENvbG9yIHNjcm9sbFZpZXdd LmJhY2tncm91bmRDb2xvci5DR0NvbG9yLCByZWRDb2xvci5nZXQoKSkpOwogfQogCg==