233059 2021-11-12 12:48:01 -0800 Demote WKWebpagePreferences.captivePortalModeEnabled API to SPI 2021-11-12 13:25:21 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen bfulgham ggaren kkinnunen thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1814565 0 cdumez 2021-11-12 12:48:01 -0800 Demote WKWebpagePreferences.captivePortalModeEnabled API to SPI until we reach agreement on a suitable API name. 1814566 1 444089 cdumez 2021-11-12 12:49:39 -0800 Created attachment 444089 Patch 1814568 2 444089 ggaren 2021-11-12 12:54:22 -0800 Comment on attachment 444089 Patch r=me 1814598 3 ews-feeder 2021-11-12 13:24:07 -0800 Committed r285739 (244198@main): <https://commits.webkit.org/244198@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444089. 1814601 4 webkit-bug-importer 2021-11-12 13:25:21 -0800 <rdar://problem/85355353> 444089 2021-11-12 12:49:39 -0800 2021-11-12 13:24:09 -0800 Patch bug-233059-20211112124938.patch text/plain 8412 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NzM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhkNjI2Y2EzMzNhODMwNzk1 NTI0MDg2YzRmNWVmZmQwY2E0ZmE0ZDcuLjUyNmNhNWQ0MmEyMDA3OTg5MTNhN2Y4Y2M4YmY0N2Vi ZWVkNGFjZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjEtMTEtMTIgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZW1vdGUgV0tXZWJwYWdlUHJlZmVy ZW5jZXMuY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkIEFQSSB0byBTUEkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzA1OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERlbW90ZSBXS1dlYnBhZ2VQcmVmZXJl bmNlcy5jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQgQVBJIHRvIFNQSSB1bnRpbCB3ZSByZWFjaAor ICAgICAgICBhZ3JlZW1lbnQgb24gYSBzdWl0YWJsZSBBUEkgbmFtZS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXMuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2VicGFnZVByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXS1dl YnBhZ2VQcmVmZXJlbmNlcyBfc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOl0pOgorICAgICAg ICAoLVtXS1dlYnBhZ2VQcmVmZXJlbmNlcyBfY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkXSk6Cisg ICAgICAgICgtW1dLV2VicGFnZVByZWZlcmVuY2VzIHNldENhcHRpdmVQb3J0YWxNb2RlRW5hYmxl ZDpdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tXZWJwYWdlUHJlZmVyZW5jZXMgY2FwdGl2ZVBv cnRhbE1vZGVFbmFibGVkXSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnBhZ2VQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKwogMjAyMS0xMS0xMiAgQnJlbnQgRnVs Z2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjg1Njk4 KTogQnVpbGQgY29ycmVjdGlvbiBhZnRlciByZWZhY3RvcmluZyBpZCBoYW5kbGluZwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2VicGFnZVByZWZlcmVu Y2VzLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVy ZW5jZXMuaAppbmRleCBkYTg5MWZjNmE5MWVlYTE4MWFkNDQ2ODc3N2ZkZGE3MjdmNDUxMDZiLi40 YTIzNmRhN2Q3NThhYjk2ZDZiNzU2ZDc1ZmNhZDJhMWMzYjczZDBhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXMuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXMu aApAQCAtNzEsOSArNzEsNCBAQCBXS19DTEFTU19BVkFJTEFCTEUobWFjb3MoMTAuMTUpLCBpb3Mo MTMuMCkpCiAqLwogQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgYWxsb3dzQ29udGVudEphdmFT Y3JpcHQgV0tfQVBJX0FWQUlMQUJMRShtYWNvcygxMS4wKSwgaW9zKDE0LjApKTsKIAotLyohIEBh YnN0cmFjdCBBIGJvb2xlYW4gaW5kaWNhdGluZyB3aGV0aGVyIENhcHRpdmUgUG9ydGFsIG1vZGUg aXMgZW5hYmxlZC4KLSBAZGlzY3Vzc2lvbiBUaGUgZGVmYXVsdCB2YWx1ZSBpcyBOTyBvbiBtYWNP Uy4gT24gaU9TLCB0aGUgZGVmYXVsdCB2YWx1ZSBkZXBlbmRzIG9uIHRoZSBzeXN0ZW0gc2V0dGlu Zy4KLSAqLwotQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgY2FwdGl2ZVBvcnRhbE1vZGVFbmFi bGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7 Ci0KIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYnBhZ2VQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnBhZ2VQcmVmZXJlbmNlcy5tbQppbmRleCAxN2RiOWVjZmViMjUzMmQxMzIzN2YwZjZk MTgxMDNkMDEwMmQ1YWI4Li40ZmYxOWY2ZTFhMTU1NmM4Njk4OTcwMGE3N2VkMWYzYjExMzNmNmVi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdl UHJlZmVyZW5jZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2VicGFnZVByZWZlcmVuY2VzLm1tCkBAIC0zOTEsNyArMzkxLDcgQEAgLSAoQk9PTClhbGxvd3ND b250ZW50SmF2YVNjcmlwdAogICAgIH0KIH0KIAotLSAodm9pZClzZXRDYXB0aXZlUG9ydGFsTW9k ZUVuYWJsZWQ6KEJPT0wpY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkCistICh2b2lkKV9zZXRDYXB0 aXZlUG9ydGFsTW9kZUVuYWJsZWQ6KEJPT0wpY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkCiB7CiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBpZiAoIVdURjo6cHJvY2Vzc0hhc0VudGl0bGVt ZW50KCJjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyIikpCkBAIC00MDAsNyArNDAwLDcg QEAgLSAodm9pZClzZXRDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ6KEJPT0wpY2FwdGl2ZVBvcnRh bE1vZGVFbmFibGVkCiAgICAgX3dlYnNpdGVQb2xpY2llcy0+c2V0Q2FwdGl2ZVBvcnRhbE1vZGVF bmFibGVkKCEhY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKIH0KIAotLSAoQk9PTCljYXB0aXZl UG9ydGFsTW9kZUVuYWJsZWQKKy0gKEJPT0wpX2NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZAogewog ICAgIHJldHVybiBfd2Vic2l0ZVBvbGljaWVzLT5jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQoKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnBh Z2VQcmVmZXJlbmNlc1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnBhZ2VQcmVmZXJlbmNlc1ByaXZhdGUuaAppbmRleCA0NzdmZGMxMWYzMmY5ZGZiOWVi MGQxOGI5M2Y0YjI0NzBkNDdiNDQ5Li41ZjhmNzRiNWVjZjEzMzY2ZmEwNmMzZGJhZjM2ZjRjMGYy YWVjMDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJwYWdlUHJlZmVyZW5jZXNQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2VicGFnZVByZWZlcmVuY2VzUHJpdmF0ZS5oCkBAIC04NSw0ICs4NSw2IEBA IHR5cGVkZWYgTlNfT1BUSU9OUyhOU1VJbnRlZ2VyLCBfV0tXZWJzaXRlTW91c2VFdmVudFBvbGlj eSkgewogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgc2V0dGVyPV9zZXRNb3VzZUV2ZW50UG9saWN5 OikgX1dLV2Vic2l0ZU1vdXNlRXZlbnRQb2xpY3kgX21vdXNlRXZlbnRQb2xpY3kgV0tfQVBJX0FW QUlMQUJMRShtYWNvcygxMS4wKSwgaW9zKDE0LjApKTsKIAorQHByb3BlcnR5IChub25hdG9taWMs IHNldHRlcj1fc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOikgQk9PTCBfY2FwdGl2ZVBvcnRh bE1vZGVFbmFibGVkIFdLX0FQSV9BVkFJTEFCTEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19J T1NfVEJBKSk7CisKIEBlbmQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCA2OWU3YzRjNzdjNTUxODM3MmNmOGIwMWIzZTgzNWZlOTU2MDYxMTA2Li5m Mzg1NTU0Nzg3ZDBmZTEyMDU0Yjk2MmFmMGZhODMyN2FjMGU4MDZjIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEt MTEtMTIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZW1vdGUg V0tXZWJwYWdlUHJlZmVyZW5jZXMuY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkIEFQSSB0byBTUEkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzA1OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSBB UEkgdGVzdCBhY2NvcmRpbmdseS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW06CisKIDIwMjEtMTEtMDUgIEpvbmF0 aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFtnaXQtd2Via2l0XSBP cGVuIGNsb3NlZCBwdWxsLXJlcXVlc3Qgd2hlbiBydW5uaW5nIHByCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9u Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9u TmF2aWdhdGlvbi5tbQppbmRleCAwY2M2ZmVjYjFhNGYyNjE0NGMxMDVkOWZiZTEzZWYxNDI4NmYw MmU2Li43Mzg1MjE3ZjBmN2RmOTg1M2M3MzdmNDgyY2MwZmMwOGY3NzU2M2ZiIDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZp Z2F0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJv Y2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KQEAgLTQ1LDYgKzQ1LDcgQEAKICNpbXBvcnQgPFdlYktp dC9XS1dlYlZpZXdDb25maWd1cmF0aW9uUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2Vi Vmlld1ByaXZhdGVGb3JUZXN0aW5nLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJwYWdlUHJlZmVy ZW5jZXMuaD4KKyNpbXBvcnQgPFdlYktpdC9XS1dlYnBhZ2VQcmVmZXJlbmNlc1ByaXZhdGUuaD4K ICNpbXBvcnQgPFdlYktpdC9XS1dlYnNpdGVEYXRhU3RvcmVQcml2YXRlLmg+CiAjaW1wb3J0IDxX ZWJLaXQvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViS2l0Lmg+ CkBAIC03Njc5LDcgKzc2ODAsNyBAQCBzdGF0aWMgdm9pZCBjaGVja1NldHRpbmdzQ29udHJvbGxl ZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUoV0tXZWJWaWV3ICp3ZWJWaWV3LCBTaG91bAogVEVTVChQcm9j ZXNzU3dhcCwgTmF2aWdhdGluZ1RvQ2FwdGl2ZVBvcnRhbE1vZGUpCiB7CiAgICAgYXV0byB3ZWJW aWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7 Ci0gICAgRVhQRUNUX0ZBTFNFKHdlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLmRlZmF1bHRXZWJw YWdlUHJlZmVyZW5jZXMuY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKKyAgICBFWFBFQ1RfRkFM U0Uod2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkuZGVmYXVsdFdlYnBhZ2VQcmVmZXJlbmNlcy5f Y2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKICAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0 KCkucHJlZmVyZW5jZXMgX3NldE1lZGlhRGV2aWNlc0VuYWJsZWQ6WUVTXTsKICAgICB3ZWJWaWV3 Q29uZmlndXJhdGlvbi5nZXQoKS5wcmVmZXJlbmNlcy5fbWVkaWFDYXB0dXJlUmVxdWlyZXNTZWN1 cmVDb25uZWN0aW9uID0gTk87CiAKQEAgLTc3MDYsOCArNzcwNyw4IEBAIFRFU1QoUHJvY2Vzc1N3 YXAsIE5hdmlnYXRpbmdUb0NhcHRpdmVQb3J0YWxNb2RlKQogICAgIGNoZWNrU2V0dGluZ3NDb250 cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6 Olllcyk7CiAKICAgICBkZWxlZ2F0ZS5nZXQoKS5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0 aW9uV2l0aFByZWZlcmVuY2VzID0gXihXS05hdmlnYXRpb25BY3Rpb24gKmFjdGlvbiwgV0tXZWJw YWdlUHJlZmVyZW5jZXMgKnByZWZlcmVuY2VzLCB2b2lkICheY29tcGxldGlvbkhhbmRsZXIpKFdL TmF2aWdhdGlvbkFjdGlvblBvbGljeSwgV0tXZWJwYWdlUHJlZmVyZW5jZXMgKikpIHsKLSAgICAg ICAgRVhQRUNUX0ZBTFNFKHByZWZlcmVuY2VzLmNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCk7Ci0g ICAgICAgIHByZWZlcmVuY2VzLmNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCA9IFlFUzsKKyAgICAg ICAgRVhQRUNUX0ZBTFNFKHByZWZlcmVuY2VzLl9jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwor ICAgICAgICBbcHJlZmVyZW5jZXMgX3NldENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDpZRVNdOwog ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdywg cHJlZmVyZW5jZXMpOwogICAgIH07CiAKQEAgLTc3MjUsOCArNzcyNiw4IEBAIFRFU1QoUHJvY2Vz c1N3YXAsIE5hdmlnYXRpbmdUb0NhcHRpdmVQb3J0YWxNb2RlKQogVEVTVChQcm9jZXNzU3dhcCwg Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkQnlEZWZhdWx0VGhlbk9wdE91dCkKIHsKICAgICBhdXRv IHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBu ZXddKTsKLSAgICBFWFBFQ1RfRkFMU0Uod2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkuZGVmYXVs dFdlYnBhZ2VQcmVmZXJlbmNlcy5jYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwotICAgIHdlYlZp ZXdDb25maWd1cmF0aW9uLmdldCgpLmRlZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMuY2FwdGl2ZVBv cnRhbE1vZGVFbmFibGVkID0gWUVTOworICAgIEVYUEVDVF9GQUxTRSh3ZWJWaWV3Q29uZmlndXJh dGlvbi5nZXQoKS5kZWZhdWx0V2VicGFnZVByZWZlcmVuY2VzLl9jYXB0aXZlUG9ydGFsTW9kZUVu YWJsZWQpOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKS5kZWZhdWx0V2VicGFnZVBy ZWZlcmVuY2VzIF9zZXRDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQ6WUVTXTsKICAgICBbd2ViVmll d0NvbmZpZ3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMgX3NldE1lZGlhRGV2aWNlc0VuYWJsZWQ6 WUVTXTsKICAgICB3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKS5wcmVmZXJlbmNlcy5fbWVkaWFD YXB0dXJlUmVxdWlyZXNTZWN1cmVDb25uZWN0aW9uID0gTk87CiAKQEAgLTc3NDQsNyArNzc0NSw3 IEBAIFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVmYXVsdFRo ZW5PcHRPdXQpCiAgICAgfTsKIAogICAgIGRlbGVnYXRlLmdldCgpLmRlY2lkZVBvbGljeUZvck5h dmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXMgPSBeKFdLTmF2aWdhdGlvbkFjdGlvbiAqYWN0 aW9uLCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMsIHZvaWQgKF5jb21wbGV0aW9u SGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAq KSkgewotICAgICAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlcy5jYXB0aXZlUG9ydGFsTW9kZUVu YWJsZWQpOworICAgICAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlcy5fY2FwdGl2ZVBvcnRhbE1v ZGVFbmFibGVkKTsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9u UG9saWN5QWxsb3csIHByZWZlcmVuY2VzKTsKICAgICB9OwogCkBAIC03NzY2LDggKzc3NjcsOCBA QCBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWRCeURlZmF1bHRUaGVu T3B0T3V0KQogICAgIGNoZWNrU2V0dGluZ3NDb250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3 ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6Ok5vKTsKIAogICAgIGRlbGVnYXRlLmdldCgp LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXMgPSBeKFdLTmF2 aWdhdGlvbkFjdGlvbiAqYWN0aW9uLCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMs IHZvaWQgKF5jb21wbGV0aW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBXS1dl YnBhZ2VQcmVmZXJlbmNlcyAqKSkgewotICAgICAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlcy5j YXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwotICAgICAgICBwcmVmZXJlbmNlcy5jYXB0aXZlUG9y dGFsTW9kZUVuYWJsZWQgPSBOTzsgLy8gT3B0IG91dCBvZiBjYXB0aXZlIHBvcnRhbCBtb2RlIGZv ciB0aGlzIGxvYWQuCisgICAgICAgIEVYUEVDVF9UUlVFKHByZWZlcmVuY2VzLl9jYXB0aXZlUG9y dGFsTW9kZUVuYWJsZWQpOworICAgICAgICBbcHJlZmVyZW5jZXMgX3NldENhcHRpdmVQb3J0YWxN b2RlRW5hYmxlZDpOT107IC8vIE9wdCBvdXQgb2YgY2FwdGl2ZSBwb3J0YWwgbW9kZSBmb3IgdGhp cyBsb2FkLgogICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXS05hdmlnYXRpb25BY3Rpb25Qb2xp Y3lBbGxvdywgcHJlZmVyZW5jZXMpOwogICAgIH07CiAK