80798 2012-03-11 17:47:35 -0700 Web Inspector: WebKit1: update how the Web Inspector resources are loaded 2012-03-11 18:29:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy bweinstein joepeck timothy webkit.review.bot oldest_to_newest 575860 0 timothy 2012-03-11 17:47:35 -0700 We need to update how WebKit1 loads the Web Inspector resources. <rdar://problem/10359959> 575861 1 131263 timothy 2012-03-11 17:53:20 -0700 Created attachment 131263 Proposed Change 575863 2 131263 bweinstein 2012-03-11 17:58:28 -0700 Comment on attachment 131263 Proposed Change View in context: https://bugs.webkit.org/attachment.cgi?id=131263&action=review > Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm:166 > + ![[NSBundle bundleWithIdentifier:@"com.apple.WebInspector"] pathForResource:@"Main" ofType:@"html"]; Should we save this result into a static so we don't have to compute this each time? 575864 3 timothy 2012-03-11 18:01:29 -0700 Nah, it isn't hot code. 575870 4 131263 webkit.review.bot 2012-03-11 18:14:24 -0700 Comment on attachment 131263 Proposed Change Clearing flags on attachment: 131263 Committed r110403: <http://trac.webkit.org/changeset/110403> 575871 5 webkit.review.bot 2012-03-11 18:14:28 -0700 All reviewed patches have been landed. Closing bug. 575877 6 timothy 2012-03-11 18:29:45 -0700 Build fix landed in r110404. 131263 2012-03-11 17:53:20 -0700 2012-03-11 18:14:24 -0700 Proposed Change 0001-Update-how-the-Web-Inspector-resources-are-loaded.patch text/plain 9417 timothy RnJvbSBlZjFjOThhODBhYTRmOWRlMTcxNTYzNDNmZWUyOWRiNjE2ODEzNDI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGh5IEhhdGNoZXIgPHRpbW90aHlAYXBwbGUuY29tPgpE YXRlOiBTdW4sIDExIE1hciAyMDEyIDE3OjUxOjI2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gVXBk YXRlIGhvdyB0aGUgV2ViIEluc3BlY3RvciByZXNvdXJjZXMgYXJlIGxvYWRlZC4KCmh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDc5OApyZGFyOi8vcHJvYmxlbS8xMDM1 OTk1OQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpTb3VyY2UvV2ViS2l0OgoKKiBXZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajogQWRkIGEgZnJhbWV3b3JrLgoKU291cmNlL1dl YktpdC9tYWM6CgoqIFdlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbToKKHVzZVdl YktpdFdlYkluc3BlY3Rvcik6IFJldHVybiBpZiB3ZSBhcmUgdXNpbmcgdGhlIFdlYkNvcmUgcmVz b3VyY2VzIGZvciBjb21wYXRpYmlsaXR5CndpdGggbG9jYWwgYW5kIG5pZ2h0bHkgYnVpbGRzLgoo V2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmxvY2FsaXplZFN0cmluZ3NVUkwpOiBEZWNpZGUg d2hhdCBwYXRoIHRvIHVzZS4KKC1bV2ViSW5zcGVjdG9yV2luZG93Q29udHJvbGxlciBpbml0XSk6 IERpdHRvLgooLVtXZWJJbnNwZWN0b3JXaW5kb3dDb250cm9sbGVyIHdpbmRvd10pOiBEZWNpZGUg aWYgdGhlIHdpbmRvdyBpcyB0ZXh0dXJlZCBvciBub3QuCi0tLQogU291cmNlL1dlYktpdC9DaGFu Z2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDExICsrKysrKwogU291cmNlL1dl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiAgICAgfCAgICA0ICsrCiBTb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTYgKysr KysrKysrCiAuLi4vbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbSAgICAg ICB8ICAgMzQgKysrKysrKysrKysrKysrLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0 aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2NWI2YjYuLjk2ZWE0ODIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDMtMTEgIFRpbW90aHkgSGF0Y2hlciAgPHRp bW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBob3cgdGhlIFdlYiBJbnNwZWN0b3Ig cmVzb3VyY2VzIGFyZSBsb2FkZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgwNzk4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzEwMzU5OTU5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajogQWRkIGEgZnJhbWV3b3JrLgorCiAyMDEyLTAzLTA2 ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxrdWJvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAg IFtDTWFrZV0gTWFrZSB0aGUgcmVtb3ZhbCBvZiB0cmFuc2l0aXZlIGxpYnJhcnkgZGVwZW5kZW5j aWVzIHdvcmsgd2l0aCBDTWFrZSA8IDIuOC43LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYzhkZTc1NS4uYmM5OTNkOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC02Nyw2ICs2 Nyw3IEBACiAJCTFDN0IwQzY2MEVCMjQ2NEQwMEEyODUwMiAvKiBXZWJJbnNwZWN0b3JDbGllbnRD Ri5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQzdC MEM2NTBFQjI0NjREMDBBMjg1MDIgLyogV2ViSW5zcGVjdG9yQ2xpZW50Q0YuY3BwICovOyB9Owog CQkxQzhDQjA3QTBBRTk4MzBDMDBCMUY2RTkgLyogV2ViRWRpdGluZ0RlbGVnYXRlUHJpdmF0ZS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUM4Q0IwNzkw QUU5ODMwQzAwQjFGNkU5IC8qIFdlYkVkaXRpbmdEZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQ0NGRkQxMzBCMUY4MUYy MDAyRUU5MjYgLyogT2xkV2ViQXNzZXJ0aW9ucy5jIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUNDRkZEMTIwQjFGODFGMjAwMkVFOTI2IC8qIE9sZFdlYkFz c2VydGlvbnMuYyAqLzsgfTsKKwkJMUNFOTA3MjkxNTBENURGMDAwOEI0QUY3IC8qIFdlYkluc3Bl Y3Rvci5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQ0U5MDcyODE1MEQ1REYwMDA4QjRBRjcgLyogV2ViSW5zcGVjdG9yLmZyYW1ld29y ayAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChXZWFrLCApOyB9OyB9OwogCQkyMjQxMDBG MzA5MTgxOEQ5MDBEMkQyNjYgLyogV2ViUGx1Z2luc1ByaXZhdGUuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDIyNDEwMEYyMDkxODE4RDkwMEQyRDI2NiAv KiBXZWJQbHVnaW5zUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZh dGUsICk7IH07IH07CiAJCTIyNDEwMEY5MDkxODE5MDEwMEQyRDI2NiAvKiBXZWJQbHVnaW5zUHJp dmF0ZS5tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjI0 MTAwRjgwOTE4MTkwMTAwRDJEMjY2IC8qIFdlYlBsdWdpbnNQcml2YXRlLm0gKi87IH07CiAJCTIy NUY4ODE1MDlGOTdFOEEwMDQyM0E0MCAvKiBXZWJQbHVnaW5Qcml2YXRlLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyMjVGODgxNDA5Rjk3RThBMDA0MjNB NDAgLyogV2ViUGx1Z2luUHJpdmF0ZS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFBy aXZhdGUsICk7IH07IH07CkBAIC00NDgsNiArNDQ5LDcgQEAKIAkJMUM5MDRGRDQwQkE5REQwRjAw ODFFOUQwIC8qIERlYnVnUmVsZWFzZS54Y2NvbmZpZyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQueGNjb25maWc7 IHBhdGggPSBEZWJ1Z1JlbGVhc2UueGNjb25maWc7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTFDOTA0RkQ1MEJBOUREMEYwMDgxRTlEMCAvKiBCYXNlLnhjY29uZmlnICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g dGV4dC54Y2NvbmZpZzsgcGF0aCA9IEJhc2UueGNjb25maWc7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCTFDQ0ZGRDEyMEIxRjgxRjIwMDJFRTkyNiAvKiBPbGRXZWJBc3NlcnRpb25zLmMg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuYzsgcGF0aCA9IE9sZFdlYkFzc2VydGlvbnMuYzsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJMUNFOTA3MjgxNTBENURGMDAwOEI0QUY3IC8qIFdl Ykluc3BlY3Rvci5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtu b3duRmlsZVR5cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgcGF0aCA9IFdlYkluc3BlY3Rvci5mcmFt ZXdvcms7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTIyNDEwMEYyMDkx ODE4RDkwMEQyRDI2NiAvKiBXZWJQbHVnaW5zUHJpdmF0ZS5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGluZGVudFdpZHRoID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdlYlBsdWdpbnNQcml2YXRlLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IHRhYldpZHRoID0gODsgdXNlc1RhYnMgPSAwOyB9OwogCQkyMjQx MDBGODA5MTgxOTAxMDBEMkQyNjYgLyogV2ViUGx1Z2luc1ByaXZhdGUubSAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBpbmRlbnRXaWR0aCA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLm9iamM7IHBhdGggPSBXZWJQbHVnaW5zUHJpdmF0 ZS5tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB0YWJXaWR0aCA9IDg7IHVzZXNUYWJzID0gMDsg fTsKIAkJMjI1Rjg4MTQwOUY5N0U4QTAwNDIzQTQwIC8qIFdlYlBsdWdpblByaXZhdGUuaCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV2ViUGx1Z2luUHJpdmF0ZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwpAQCAtNzg1LDYgKzc4Nyw3IEBACiAJCQkJMUEyMEQwOEIwRUQz ODRGMjAwNDNGQTlGIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJ CQkJOTM5ODExMkYwODI0QkYwMTAwOERGMDM4IC8qIFNlY3VyaXR5LmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovLAogCQkJCTkzOTgxMTJDMDgyNEJGMDEwMDhERjAzOCAvKiBXZWJDb3JlLmZyYW1l d29yayBpbiBGcmFtZXdvcmtzICovLAorCQkJCTFDRTkwNzI5MTUwRDVERjAwMDhCNEFGNyAvKiBX ZWJJbnNwZWN0b3IuZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCiAJCQkpOwogCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07CkBAIC04NDAsNiArODQzLDcg QEAKIAkJCQkxQTIwRDA4QTBFRDM4NEYyMDA0M0ZBOUYgLyogUXVhcnR6Q29yZS5mcmFtZXdvcmsg Ki8sCiAJCQkJODMwRTgxRTAwNTg1M0FDMDAwQUQwODkxIC8qIFNlY3VyaXR5LmZyYW1ld29yayAq LywKIAkJCQlGNzM4QzlFQTAzRkFEM0RGMDMyMUZCRTAgLyogV2ViQ29yZS5mcmFtZXdvcmsgKi8s CisJCQkJMUNFOTA3MjgxNTBENURGMDAwOEI0QUY3IC8qIFdlYkluc3BlY3Rvci5mcmFtZXdvcmsg Ki8sCiAJCQkpOwogCQkJbmFtZSA9ICJGcmFtZXdvcmtzIGFuZCBMaWJyYXJpZXMiOwogCQkJc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCA3NjE5ZDFmLi5jZTE0OThj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMDMtMTEgIFRpbW90aHkg SGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBob3cgdGhlIFdl YiBJbnNwZWN0b3IgcmVzb3VyY2VzIGFyZSBsb2FkZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwNzk4CisgICAgICAgIHJkYXI6Ly9wcm9ibGVt LzEwMzU5OTU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisgICAgICAgICh1c2VX ZWJLaXRXZWJJbnNwZWN0b3IpOiBSZXR1cm4gaWYgd2UgYXJlIHVzaW5nIHRoZSBXZWJDb3JlIHJl c291cmNlcyBmb3IgY29tcGF0aWJpbGl0eQorICAgICAgICB3aXRoIGxvY2FsIGFuZCBuaWdodGx5 IGJ1aWxkcy4KKyAgICAgICAgKFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50Ojpsb2NhbGl6ZWRT dHJpbmdzVVJMKTogRGVjaWRlIHdoYXQgcGF0aCB0byB1c2UuCisgICAgICAgICgtW1dlYkluc3Bl Y3RvcldpbmRvd0NvbnRyb2xsZXIgaW5pdF0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViSW5zcGVj dG9yV2luZG93Q29udHJvbGxlciB3aW5kb3ddKTogRGVjaWRlIGlmIHRoZSB3aW5kb3cgaXMgdGV4 dHVyZWQgb3Igbm90LgorCiAyMDEyLTAzLTA5ICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4K IAogICAgICAgICBSZW5hbWUgTm90aWZpY2F0aW9uUHJlc2VudGVyIHRvIE5vdGlmaWNhdGlvbkNs aWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50Lm1tCmluZGV4IDE3NzVhMjYuLjA4MTNmMzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW0KQEAg LTE2MCwxMCArMTYwLDE3IEBAIHZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OmZyb250 ZW5kTG9hZGVkKCkKICAgICBzZXRBdHRhY2hlZFdpbmRvdyhhdHRhY2hlZCk7CiB9CiAKK3N0YXRp YyBib29sIHVzZVdlYktpdFdlYkluc3BlY3RvcigpCit7CisgICAgcmV0dXJuIFtbTlNVc2VyRGVm YXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGJvb2xGb3JLZXk6QCJVc2VXZWJLaXRXZWJJbnNw ZWN0b3IiXSB8fAorICAgICAgICAhW1tOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNv bS5hcHBsZS5XZWJJbnNwZWN0b3IiXSBwYXRoRm9yUmVzb3VyY2U6QCJNYWluIiBvZlR5cGU6QCJo dG1sIl07Cit9CisKIFN0cmluZyBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6bG9jYWxpemVk U3RyaW5nc1VSTCgpCiB7Ci0gICAgTlNTdHJpbmcgKnBhdGggPSBbW05TQnVuZGxlIGJ1bmRsZVdp dGhJZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYkNvcmUiXSBwYXRoRm9yUmVzb3VyY2U6QCJsb2Nh bGl6ZWRTdHJpbmdzIiBvZlR5cGU6QCJqcyJdOwotICAgIGlmIChwYXRoKQorICAgIE5TQnVuZGxl ICpidW5kbGUgPSB1c2VXZWJLaXRXZWJJbnNwZWN0b3IoKSA/IFtOU0J1bmRsZSBidW5kbGVXaXRo SWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl0gOiBbTlNCdW5kbGUgYnVuZGxlV2l0aElk ZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViSW5zcGVjdG9yIl07IAorICAgIE5TU3RyaW5nICpwYXRo ID0gW2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJsb2NhbGl6ZWRTdHJpbmdzIiBvZlR5cGU6QCJq cyJdOworICAgIGlmIChbcGF0aCBsZW5ndGhdKQogICAgICAgICByZXR1cm4gW1tOU1VSTCBmaWxl VVJMV2l0aFBhdGg6cGF0aF0gYWJzb2x1dGVTdHJpbmddOwogICAgIHJldHVybiBTdHJpbmcoKTsK IH0KQEAgLTI1OCw3ICsyNjUsMTQgQEAgLSAoaWQpaW5pdAogCiAgICAgW3ByZWZlcmVuY2VzIHJl bGVhc2VdOwogCi0gICAgTlNTdHJpbmcgKnBhdGggPSBbW05TQnVuZGxlIGJ1bmRsZVdpdGhJZGVu dGlmaWVyOkAiY29tLmFwcGxlLldlYkNvcmUiXSBwYXRoRm9yUmVzb3VyY2U6QCJpbnNwZWN0b3Ii IG9mVHlwZTpAImh0bWwiIGluRGlyZWN0b3J5OkAiaW5zcGVjdG9yIl07CisgICAgTlNTdHJpbmcg KnBhdGg7CisgICAgaWYgKHVzZVdlYktpdFdlYkluc3BlY3RvcigpKQorICAgICAgICBwYXRoID0g W1tOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl0gcGF0 aEZvclJlc291cmNlOkAiaW5zcGVjdG9yIiBvZlR5cGU6QCJodG1sIiBpbkRpcmVjdG9yeTpAImlu c3BlY3RvciJdOworICAgIGVsc2UKKyAgICAgICAgcGF0aCA9IFtbTlNCdW5kbGUgYnVuZGxlV2l0 aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViSW5zcGVjdG9yIl0gcGF0aEZvclJlc291cmNlOkAi TWFpbiIgb2ZUeXBlOkAiaHRtbCJdOworCisgICAgQVNTRVJUKFtwYXRoIGxlbmd0aF0pOworCiAg ICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW1tOU1VSTFJlcXVlc3QgYWxsb2NdIGluaXRXaXRo VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6cGF0aF1dOwogICAgIFtbX3dlYlZpZXcgbWFpbkZy YW1lXSBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKICAgICBbcmVxdWVzdCByZWxlYXNlXTsKQEAgLTI5 NSwxOCArMzA5LDIyIEBAIC0gKE5TV2luZG93ICopd2luZG93CiAgICAgaWYgKHdpbmRvdykKICAg ICAgICAgcmV0dXJuIHdpbmRvdzsKIAorICAgIGJvb2wgdXNlVGV4dHVyZWRXaW5kb3cgPSB1c2VX ZWJLaXRXZWJJbnNwZWN0b3IoKTsKKwogICAgIE5TVUludGVnZXIgc3R5bGVNYXNrID0gKE5TVGl0 bGVkV2luZG93TWFzayB8IE5TQ2xvc2FibGVXaW5kb3dNYXNrIHwgTlNNaW5pYXR1cml6YWJsZVdp bmRvd01hc2sgfCBOU1Jlc2l6YWJsZVdpbmRvd01hc2spOwogCi0gICAgc3R5bGVNYXNrIHw9IE5T VGV4dHVyZWRCYWNrZ3JvdW5kV2luZG93TWFzazsKKyAgICBpZiAodXNlVGV4dHVyZWRXaW5kb3cp CisgICAgICAgIHN0eWxlTWFzayB8PSBOU1RleHR1cmVkQmFja2dyb3VuZFdpbmRvd01hc2s7CiAK ICAgICB3aW5kb3cgPSBbW05TV2luZG93IGFsbG9jXSBpbml0V2l0aENvbnRlbnRSZWN0Ok5TTWFr ZVJlY3QoNjAuMCwgMjAwLjAsIDc1MC4wLCA2NTAuMCkgc3R5bGVNYXNrOnN0eWxlTWFzayBiYWNr aW5nOk5TQmFja2luZ1N0b3JlQnVmZmVyZWQgZGVmZXI6Tk9dOwogICAgIFt3aW5kb3cgc2V0RGVs ZWdhdGU6c2VsZl07CiAgICAgW3dpbmRvdyBzZXRNaW5TaXplOk5TTWFrZVNpemUoNDAwLjAsIDQw MC4wKV07CiAKLSAgICBbd2luZG93IHNldEF1dG9yZWNhbGN1bGF0ZXNDb250ZW50Qm9yZGVyVGhp Y2tuZXNzOk5PIGZvckVkZ2U6TlNNYXhZRWRnZV07Ci0gICAgW3dpbmRvdyBzZXRDb250ZW50Qm9y ZGVyVGhpY2tuZXNzOjU1LiBmb3JFZGdlOk5TTWF4WUVkZ2VdOwotCi0gICAgV0tOU1dpbmRvd01h a2VCb3R0b21Db3JuZXJzU3F1YXJlKHdpbmRvdyk7CisgICAgaWYgKHVzZVRleHR1cmVkV2luZG93 KSB7CisgICAgICAgIFt3aW5kb3cgc2V0QXV0b3JlY2FsY3VsYXRlc0NvbnRlbnRCb3JkZXJUaGlj a25lc3M6Tk8gZm9yRWRnZTpOU01heFlFZGdlXTsKKyAgICAgICAgW3dpbmRvdyBzZXRDb250ZW50 Qm9yZGVyVGhpY2tuZXNzOjU1LiBmb3JFZGdlOk5TTWF4WUVkZ2VdOworICAgICAgICBXS05TV2lu ZG93TWFrZUJvdHRvbUNvcm5lcnNTcXVhcmUod2luZG93KTsKKyAgICB9CiAKICAgICBbc2VsZiBz ZXRXaW5kb3c6d2luZG93XTsKICAgICBbd2luZG93IHJlbGVhc2VdOwotLSAKMS43LjcuNSAoQXBw bGUgR2l0LTI2KQoK