73554 2011-12-01 05:18:01 -0800 Web Inspector: restore WebKit2 Safari menu items after capabilities refactoring regression. 2011-12-01 05:34:25 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 512705 0 pfeldman 2011-12-01 05:18:01 -0800 Patch to follow. 512706 1 117402 pfeldman 2011-12-01 05:19:54 -0800 Created attachment 117402 Patch 512708 2 pfeldman 2011-12-01 05:34:25 -0800 Committed r101661: <http://trac.webkit.org/changeset/101661> 117402 2011-12-01 05:19:54 -0800 2011-12-01 05:31:37 -0800 Patch bug-73554-20111201171951.patch text/plain 12844 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAxNjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzAwNWJiYTBlNDliOGFh NTJhNGFkOTI3YzlkNTNjY2MxMjMwNTQ0NS4uYjc5ZTY2MTNmOTMzNDdkZjM5YjIyMjM2NTczZGEw MzM3N2E5MjU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDExLTEyLTAxICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlc3RvcmUgV2ViS2l0MiBTYWZhcmkgbWVudSBpdGVtcyBhZnRlciBjYXBhYmlsaXRpZXMg cmVmYWN0b3JpbmcgcmVncmVzc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTczNTU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpmcm9u dGVuZExvYWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExv Y2FsOjppc0RlYnVnZ2luZ0VuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbDo6c2V0RGVidWdnaW5nRW5hYmxlZCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjppc1RpbWVsaW5lUHJvZmlsaW5nRW5hYmxl ZCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzZXRU aW1lbGluZVByb2ZpbGluZ0VuYWJsZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbDo6aXNQcm9maWxpbmdKYXZhU2NyaXB0KToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OnN0YXJ0UHJvZmlsaW5nSmF2YVNjcmlw dCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpzdG9w UHJvZmlsaW5nSmF2YVNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVu ZENsaWVudExvY2FsOjpzaG93Q29uc29sZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JG cm9udGVuZENsaWVudExvY2FsOjpldmFsdWF0ZU9uTG9hZCk6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0luc3BlY3RvckZyb250ZW5kQVBJLmpzOgorICAgICAgICAoSW5zcGVjdG9yRnJvbnRl bmRBUEkuX3BlbmRpbmdDb21tYW5kcy5pc0RlYnVnZ2luZ0VuYWJsZWQpOgorICAgICAgICAoSW5z cGVjdG9yRnJvbnRlbmRBUEkuc2V0RGVidWdnaW5nRW5hYmxlZCk6CisgICAgICAgIChJbnNwZWN0 b3JGcm9udGVuZEFQSS5pc1RpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZCk6CisgICAgICAgIChJbnNw ZWN0b3JGcm9udGVuZEFQSS5zZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQpOgorICAgICAgICAo SW5zcGVjdG9yRnJvbnRlbmRBUEkuaXNQcm9maWxpbmdKYXZhU2NyaXB0KToKKyAgICAgICAgKElu c3BlY3RvckZyb250ZW5kQVBJLnN0YXJ0UHJvZmlsaW5nSmF2YVNjcmlwdCk6CisgICAgICAgIChJ bnNwZWN0b3JGcm9udGVuZEFQSS5zdG9wUHJvZmlsaW5nSmF2YVNjcmlwdCk6CisgICAgICAgIChJ bnNwZWN0b3JGcm9udGVuZEFQSS5zZXRBdHRhY2hlZFdpbmRvdyk6CisgICAgICAgIChJbnNwZWN0 b3JGcm9udGVuZEFQSS5zaG93Q29uc29sZSk6CisgICAgICAgIChJbnNwZWN0b3JGcm9udGVuZEFQ SS5kaXNwYXRjaCk6CisgICAgICAgIChJbnNwZWN0b3JGcm9udGVuZEFQSS5sb2FkQ29tcGxldGVk KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAxMS0x Mi0wMSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2Vi IEluc3BlY3RvcjogcXVlcnkgYmFja2VuZCBmb3IgY2FwYWJpbGl0aWVzIGV4cGxpY2l0bHkuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggOTUzZTIzYWY0ZWIwMzMxMGJhYWE0N2Y4MzU0M2FkZjc5MmRkMTFjOS4uNGM5 MTNmODMwOTdkM2JlNTA0YTAxZmY0ZjZkMTc3M2RlYjQwZjYzMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDExLTEyLTAxICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0u b3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlc3RvcmUgV2ViS2l0MiBTYWZhcmkgbWVu dSBpdGVtcyBhZnRlciBjYXBhYmlsaXRpZXMgcmVmYWN0b3JpbmcgcmVncmVzc2lvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczNTU0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi SW5zcGVjdG9yUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6 ZGlkQ2xvc2UpOgorCiAyMDExLTExLTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW92ZSBhbiB1bm5lZWRlZCBhcmd1bWVudCBmcm9tIEZyYW1lTG9h ZGVyQ2xpZW50Ojpkb3dubG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuY3BwCmluZGV4IGI3NjYxZjE0NThmZTA0 NjgwOGYwMjk4YWE1NjdmYTdkYzFjZGI4YmYuLjFjZThhYWMyNDk5ODU0MDZlZTdkZTQ1OTgwNTBk MDVjYWMzZjY4MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZENsaWVudExvY2FsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5jcHAKQEAgLTEzNCw4ICsxMzQsOSBAQCB2b2lk IEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmZyb250ZW5kTG9hZGVkKCkKIHsKICAgICBi cmluZ1RvRnJvbnQoKTsKICAgICBtX2Zyb250ZW5kTG9hZGVkID0gdHJ1ZTsKLSAgICBpZiAoIW1f ZXZhbHVhdGVPbkxvYWQuaXNFbXB0eSgpKQotICAgICAgICBldmFsdWF0ZU9uTG9hZChtX2V2YWx1 YXRlT25Mb2FkKTsKKyAgICBmb3IgKFZlY3RvcjxTdHJpbmc+OjppdGVyYXRvciBpdCA9IG1fZXZh bHVhdGVPbkxvYWQuYmVnaW4oKTsgaXQgIT0gbV9ldmFsdWF0ZU9uTG9hZC5lbmQoKTsgKytpdCkK KyAgICAgICAgZXZhbHVhdGVPbkxvYWQoKml0KTsKKyAgICBtX2V2YWx1YXRlT25Mb2FkLmNsZWFy KCk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6cmVxdWVzdEF0dGFj aFdpbmRvdygpCkBAIC0xOTUsNDcgKzE5Niw0NyBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xp ZW50TG9jYWw6OnJlc3RvcmVBdHRhY2hlZFdpbmRvd0hlaWdodCgpCiBib29sIEluc3BlY3RvckZy b250ZW5kQ2xpZW50TG9jYWw6OmlzRGVidWdnaW5nRW5hYmxlZCgpCiB7CiAgICAgaWYgKG1fZnJv bnRlbmRMb2FkZWQpCi0gICAgICAgIHJldHVybiBldmFsdWF0ZUFzQm9vbGVhbigiSW5zcGVjdG9y RnJvbnRlbmRBUEkuaXNEZWJ1Z2dpbmdFbmFibGVkKCkiKTsKKyAgICAgICAgcmV0dXJuIGV2YWx1 YXRlQXNCb29sZWFuKCJbXCJpc0RlYnVnZ2luZ0VuYWJsZWRcIl0iKTsKICAgICByZXR1cm4gZmFs c2U7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6c2V0RGVidWdnaW5n RW5hYmxlZChib29sIGVuYWJsZWQpCiB7Ci0gICAgZXZhbHVhdGVPbkxvYWQoU3RyaW5nOjpmb3Jt YXQoIkluc3BlY3RvckZyb250ZW5kQVBJLnNldERlYnVnZ2luZ0VuYWJsZWQoJXMpIiwgZW5hYmxl ZCA/ICJ0cnVlIiA6ICJmYWxzZSIpKTsKKyAgICBldmFsdWF0ZU9uTG9hZChTdHJpbmc6OmZvcm1h dCgiW1wic2V0RGVidWdnaW5nRW5hYmxlZFwiLCAlc10iLCBlbmFibGVkID8gInRydWUiIDogImZh bHNlIikpOwogfQogCiBib29sIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmlzVGltZWxp bmVQcm9maWxpbmdFbmFibGVkKCkKIHsKICAgICBpZiAobV9mcm9udGVuZExvYWRlZCkKLSAgICAg ICAgcmV0dXJuIGV2YWx1YXRlQXNCb29sZWFuKCJJbnNwZWN0b3JGcm9udGVuZEFQSS5pc1RpbWVs aW5lUHJvZmlsaW5nRW5hYmxlZCgpIik7CisgICAgICAgIHJldHVybiBldmFsdWF0ZUFzQm9vbGVh bigiW1wiaXNUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWRcIl0iKTsKICAgICByZXR1cm4gZmFsc2U7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6c2V0VGltZWxpbmVQcm9m aWxpbmdFbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKLSAgICBldmFsdWF0ZU9uTG9hZChTdHJpbmc6 OmZvcm1hdCgiSW5zcGVjdG9yRnJvbnRlbmRBUEkuc2V0VGltZWxpbmVQcm9maWxpbmdFbmFibGVk KCVzKSIsIGVuYWJsZWQgPyAidHJ1ZSIgOiAiZmFsc2UiKSk7CisgICAgZXZhbHVhdGVPbkxvYWQo U3RyaW5nOjpmb3JtYXQoIltcInNldFRpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZFwiLCAlc10iLCBl bmFibGVkID8gInRydWUiIDogImZhbHNlIikpOwogfQogCiBib29sIEluc3BlY3RvckZyb250ZW5k Q2xpZW50TG9jYWw6OmlzUHJvZmlsaW5nSmF2YVNjcmlwdCgpCiB7CiAgICAgaWYgKG1fZnJvbnRl bmRMb2FkZWQpCi0gICAgICAgIHJldHVybiBldmFsdWF0ZUFzQm9vbGVhbigiSW5zcGVjdG9yRnJv bnRlbmRBUEkuaXNQcm9maWxpbmdKYXZhU2NyaXB0KCkiKTsKKyAgICAgICAgcmV0dXJuIGV2YWx1 YXRlQXNCb29sZWFuKCJbXCJpc1Byb2ZpbGluZ0phdmFTY3JpcHRcIl0iKTsKICAgICByZXR1cm4g ZmFsc2U7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6c3RhcnRQcm9m aWxpbmdKYXZhU2NyaXB0KCkKIHsKLSAgICBldmFsdWF0ZU9uTG9hZCgiSW5zcGVjdG9yRnJvbnRl bmRBUEkuc3RhcnRQcm9maWxpbmdKYXZhU2NyaXB0KCkiKTsKKyAgICBldmFsdWF0ZU9uTG9hZCgi W1wic3RhcnRQcm9maWxpbmdKYXZhU2NyaXB0XCJdIik7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbDo6c3RvcFByb2ZpbGluZ0phdmFTY3JpcHQoKQogewotICAgIGV2YWx1 YXRlT25Mb2FkKCJJbnNwZWN0b3JGcm9udGVuZEFQSS5zdG9wUHJvZmlsaW5nSmF2YVNjcmlwdCgp Iik7CisgICAgZXZhbHVhdGVPbkxvYWQoIltcInN0b3BQcm9maWxpbmdKYXZhU2NyaXB0XCJdIik7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6c2hvd0NvbnNvbGUoKQog ewotICAgIGV2YWx1YXRlT25Mb2FkKCJJbnNwZWN0b3JGcm9udGVuZEFQSS5zaG93Q29uc29sZSgp Iik7CisgICAgZXZhbHVhdGVPbkxvYWQoIltcInNob3dDb25zb2xlXCJdIik7CiB9CiAKIHVuc2ln bmVkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWw6OmNvbnN0cmFpbmVkQXR0YWNoZWRXaW5k b3dIZWlnaHQodW5zaWduZWQgcHJlZmVycmVkSGVpZ2h0LCB1bnNpZ25lZCB0b3RhbFdpbmRvd0hl aWdodCkKQEAgLTI2MCw5ICsyNjEsOSBAQCBib29sIEluc3BlY3RvckZyb250ZW5kQ2xpZW50TG9j YWw6OmV2YWx1YXRlQXNCb29sZWFuKGNvbnN0IFN0cmluZyYgZXhwcmVzc2lvbikKIHZvaWQgSW5z cGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6ZXZhbHVhdGVPbkxvYWQoY29uc3QgU3RyaW5nJiBl eHByZXNzaW9uKQogewogICAgIGlmIChtX2Zyb250ZW5kTG9hZGVkKQotICAgICAgICBtX2Zyb250 ZW5kUGFnZS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5leGVjdXRlU2NyaXB0KGV4cHJlc3Npb24p OworICAgICAgICBtX2Zyb250ZW5kUGFnZS0+bWFpbkZyYW1lKCktPnNjcmlwdCgpLT5leGVjdXRl U2NyaXB0KCJJbnNwZWN0b3JGcm9udGVuZEFQSS5kaXNwYXRjaCgiICsgZXhwcmVzc2lvbiArICIp Iik7CiAgICAgZWxzZQotICAgICAgICBtX2V2YWx1YXRlT25Mb2FkID0gInNldFRpbWVvdXQoZnVu Y3Rpb24oKSB7ICIgKyBleHByZXNzaW9uICsgIjsgfSwgMCkiOworICAgICAgICBtX2V2YWx1YXRl T25Mb2FkLmFwcGVuZChleHByZXNzaW9uKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xp ZW50TG9jYWwuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENs aWVudExvY2FsLmgKaW5kZXggMTYwNmE2MjJlZjUzNGNlOGNkNmNjZGI4NGFkNzdiYjg1MDRkODcx OS4uZDA4ODA4ZTQwNDE4MTBhY2EyNjEzYzJmMmQ4MDYzNjc2ZDc1M2FjZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2Nh bC5oCkBAIC0xMDcsNyArMTA3LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8SW5zcGVjdG9yRnJv bnRlbmRIb3N0PiBtX2Zyb250ZW5kSG9zdDsKICAgICBPd25QdHI8SW5zcGVjdG9yRnJvbnRlbmRD bGllbnRMb2NhbDo6U2V0dGluZ3M+IG1fc2V0dGluZ3M7CiAgICAgYm9vbCBtX2Zyb250ZW5kTG9h ZGVkOwotICAgIFN0cmluZyBtX2V2YWx1YXRlT25Mb2FkOworICAgIFZlY3RvcjxTdHJpbmc+IG1f ZXZhbHVhdGVPbkxvYWQ7CiAgICAgT3duUHRyPEluc3BlY3RvckJhY2tlbmREaXNwYXRjaFRhc2s+ IG1fZGlzcGF0Y2hUYXNrOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMKaW5kZXggY2EwY2QzYTVi M2Q0NmU0Y2FlNDk2MDVmODlkNDRkOGQ4NDYyYzA1OC4uZWM4MGI5OGJjMjI2MTIwNTFlOTczZDNm YWEwNTNkYjBlYzc0M2ZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5kQVBJLmpzCkBAIC0yOCw1OCArMjgsNzYg QEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJ VFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotIEluc3BlY3RvckZyb250ZW5kQVBJID0gewotICAg ICBpc0RlYnVnZ2luZ0VuYWJsZWQ6IGZ1bmN0aW9uKCkKLSAgICAgewotICAgICAgICAgcmV0dXJu IFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5kZWJ1Z2dpbmdFbmFibGVkOwotICAgICB9LAor SW5zcGVjdG9yRnJvbnRlbmRBUEkgPSB7CisgICAgX3BlbmRpbmdDb21tYW5kczogW10sCiAKLSAg ICAgc2V0RGVidWdnaW5nRW5hYmxlZDogZnVuY3Rpb24oZW5hYmxlZCkKLSAgICAgewotICAgICAg ICAgaWYgKGVuYWJsZWQpIHsKLSAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlw dHMuZW5hYmxlRGVidWdnaW5nKCk7Ci0gICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmluc3BlY3Rv clZpZXcuc2V0Q3VycmVudFBhbmVsKFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cyk7Ci0gICAg ICAgICB9IGVsc2UKLSAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnNjcmlwdHMuZGlz YWJsZURlYnVnZ2luZygpOwotICAgICB9LAorICAgIGlzRGVidWdnaW5nRW5hYmxlZDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cy5k ZWJ1Z2dpbmdFbmFibGVkOworICAgIH0sCiAKLSAgICAgaXNUaW1lbGluZVByb2ZpbGluZ0VuYWJs ZWQ6IGZ1bmN0aW9uKCkKLSAgICAgewotICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5wYW5l bHMudGltZWxpbmUudGltZWxpbmVQcm9maWxpbmdFbmFibGVkOwotICAgICB9LAorICAgIHNldERl YnVnZ2luZ0VuYWJsZWQ6IGZ1bmN0aW9uKGVuYWJsZWQpCisgICAgeworICAgICAgICBpZiAoZW5h YmxlZCkgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmVuYWJsZURl YnVnZ2luZygpOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuc2V0Q3Vy cmVudFBhbmVsKFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0cyk7CisgICAgICAgIH0gZWxzZQor ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zY3JpcHRzLmRpc2FibGVEZWJ1Z2dpbmco KTsKKyAgICB9LAogCi0gICAgIHNldFRpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZDogZnVuY3Rpb24o ZW5hYmxlZCkKLSAgICAgewotICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy50aW1lbGluZS5z ZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQoZW5hYmxlZCk7Ci0gICAgIH0sCisgICAgaXNUaW1l bGluZVByb2ZpbGluZ0VuYWJsZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBX ZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5lLnRpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZDsKKyAg ICB9LAogCi0gICAgIGlzUHJvZmlsaW5nSmF2YVNjcmlwdDogZnVuY3Rpb24oKQotICAgICB7Ci0g ICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLmluc3RhbmNlICYmIFdl Ykluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5pbnN0YW5jZS5pc1JlY29yZGluZ1Byb2ZpbGUoKTsK LSAgICAgfSwKKyAgICBzZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQ6IGZ1bmN0aW9uKGVuYWJs ZWQpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnRpbWVsaW5lLnNldFRpbWVs aW5lUHJvZmlsaW5nRW5hYmxlZChlbmFibGVkKTsKKyAgICB9LAogCi0gICAgIHN0YXJ0UHJvZmls aW5nSmF2YVNjcmlwdDogZnVuY3Rpb24oKQotICAgICB7Ci0gICAgICAgICBXZWJJbnNwZWN0b3Iu cGFuZWxzLnByb2ZpbGVzLmVuYWJsZVByb2ZpbGVyKCk7Ci0gICAgICAgICBXZWJJbnNwZWN0b3Iu aW5zcGVjdG9yVmlldy5zZXRDdXJyZW50UGFuZWwoV2ViSW5zcGVjdG9yLnBhbmVscy5wcm9maWxl cyk7Ci0gICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLmluc3RhbmNlKQot ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5DUFVQcm9maWxlVHlwZS5pbnN0YW5jZS5zdGFydFJl Y29yZGluZ1Byb2ZpbGUoKTsKLSAgICAgfSwKKyAgICBpc1Byb2ZpbGluZ0phdmFTY3JpcHQ6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5 cGUuaW5zdGFuY2UgJiYgV2ViSW5zcGVjdG9yLkNQVVByb2ZpbGVUeXBlLmluc3RhbmNlLmlzUmVj b3JkaW5nUHJvZmlsZSgpOworICAgIH0sCiAKLSAgICAgc3RvcFByb2ZpbGluZ0phdmFTY3JpcHQ6 IGZ1bmN0aW9uKCkKLSAgICAgewotICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5DUFVQcm9maWxl VHlwZS5pbnN0YW5jZSkKLSAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ1BVUHJvZmlsZVR5cGUu aW5zdGFuY2Uuc3RvcFJlY29yZGluZ1Byb2ZpbGUoKTsKLSAgICAgICAgIFdlYkluc3BlY3Rvci5p bnNwZWN0b3JWaWV3LnNldEN1cnJlbnRQYW5lbChXZWJJbnNwZWN0b3IucGFuZWxzLnByb2ZpbGVz KTsKLSAgICAgfSwKKyAgICBzdGFydFByb2ZpbGluZ0phdmFTY3JpcHQ6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXMuZW5hYmxlUHJvZmlsZXIo KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmluc3BlY3RvclZpZXcuc2V0Q3VycmVudFBhbmVsKFdl Ykluc3BlY3Rvci5wYW5lbHMucHJvZmlsZXMpOworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLkNQ VVByb2ZpbGVUeXBlLmluc3RhbmNlKQorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLkNQVVByb2Zp bGVUeXBlLmluc3RhbmNlLnN0YXJ0UmVjb3JkaW5nUHJvZmlsZSgpOworICAgIH0sCiAKLSAgICAg c2V0QXR0YWNoZWRXaW5kb3c6IGZ1bmN0aW9uKGF0dGFjaGVkKQotICAgICB7Ci0gICAgICAgICBX ZWJJbnNwZWN0b3IuYXR0YWNoZWQgPSBhdHRhY2hlZDsKLSAgICAgfSwKKyAgICBzdG9wUHJvZmls aW5nSmF2YVNjcmlwdDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rv ci5DUFVQcm9maWxlVHlwZS5pbnN0YW5jZSkKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5DUFVQ cm9maWxlVHlwZS5pbnN0YW5jZS5zdG9wUmVjb3JkaW5nUHJvZmlsZSgpOworICAgICAgICBXZWJJ bnNwZWN0b3IuaW5zcGVjdG9yVmlldy5zZXRDdXJyZW50UGFuZWwoV2ViSW5zcGVjdG9yLnBhbmVs cy5wcm9maWxlcyk7CisgICAgfSwKIAotICAgICBzaG93Q29uc29sZTogZnVuY3Rpb24oKQotICAg ICB7Ci0gICAgICAgICBXZWJJbnNwZWN0b3IuaW5zcGVjdG9yVmlldy5zZXRDdXJyZW50UGFuZWwo V2ViSW5zcGVjdG9yLnBhbmVscy5jb25zb2xlKTsKLSAgICAgfQotIH0KKyAgICBzZXRBdHRhY2hl ZFdpbmRvdzogZnVuY3Rpb24oYXR0YWNoZWQpCisgICAgeworICAgICAgICBXZWJJbnNwZWN0b3Iu YXR0YWNoZWQgPSBhdHRhY2hlZDsKKyAgICB9LAorCisgICAgc2hvd0NvbnNvbGU6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LnNldEN1cnJlbnRQ YW5lbChXZWJJbnNwZWN0b3IucGFuZWxzLmNvbnNvbGUpOworICAgIH0sCisKKyAgICBkaXNwYXRj aDogZnVuY3Rpb24oc2lnbmF0dXJlKQorICAgIHsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5w YW5lbHMpIHsKKyAgICAgICAgICAgIHZhciBtZXRob2ROYW1lID0gc2lnbmF0dXJlLnNoaWZ0KCk7 CisgICAgICAgICAgICByZXR1cm4gSW5zcGVjdG9yRnJvbnRlbmRBUElbbWV0aG9kTmFtZV0uYXBw bHkoSW5zcGVjdG9yRnJvbnRlbmRBUEksIHNpZ25hdHVyZSk7CisgICAgICAgIH0KKyAgICAgICAg SW5zcGVjdG9yRnJvbnRlbmRBUEkuX3BlbmRpbmdDb21tYW5kcy5wdXNoKHNpZ25hdHVyZSk7Cisg ICAgfSwKKworICAgIGxvYWRDb21wbGV0ZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGZv ciAodmFyIGkgPSAwOyBpIDwgSW5zcGVjdG9yRnJvbnRlbmRBUEkuX3BlbmRpbmdDb21tYW5kcy5s ZW5ndGg7ICsraSkKKyAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kQVBJLmRpc3BhdGNoKElu c3BlY3RvckZyb250ZW5kQVBJLl9wZW5kaW5nQ29tbWFuZHNbaV0pOworICAgICAgICBJbnNwZWN0 b3JGcm9udGVuZEFQSS5fcGVuZGluZ0NvbW1hbmRzID0gW107CisgICAgfQorfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCBmODYxM2Y5 M2IzY2QzYmVlZmU5NzFmNmY0ZTExMjM2NjIwNzg0YWY4Li5lMmUwZDE0MzBhN2U4NmQzMGZiM2Zi ZDVkM2I3MTY5YjcwMTE2MGU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qcwpAQCAtNDEyLDYgKzQxMiw3IEBAIFdlYkluc3BlY3Rvci5fZG9M b2FkZWREb25lV2l0aENhcGFiaWxpdGllcyA9IGZ1bmN0aW9uKCkKIAogICAgIFdlYkluc3BlY3Rv ci5DU1NDb21wbGV0aW9ucy5yZXF1ZXN0Q1NTTmFtZUNvbXBsZXRpb25zKCk7CiAgICAgV2ViSW5z cGVjdG9yLldvcmtlck1hbmFnZXIubG9hZENvbXBsZXRlZCgpOworICAgIEluc3BlY3RvckZyb250 ZW5kQVBJLmxvYWRDb21wbGV0ZWQoKTsKIH0KIAogV2ViSW5zcGVjdG9yLmFkZFBhbmVsID0gZnVu Y3Rpb24ocGFuZWwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5z cGVjdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclBy b3h5LmNwcAppbmRleCAwYTM2NTMwMzk2MTM5MTQyZWE2M2ExZjAyMjhjZGRiYjJkODEyZDllLi4x MWE3MGUzMTI0NjQxM2QyY2FmNDhkNzk5ODc5M2JiOTdmYWZkMDVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5jcHAKQEAgLTIzMCw2ICsyMzAsOSBA QCB2b2lkIFdlYkluc3BlY3RvclByb3h5OjpkaWRMb2FkSW5zcGVjdG9yUGFnZSgpCiB2b2lkIFdl Ykluc3BlY3RvclByb3h5OjpkaWRDbG9zZSgpCiB7CiAgICAgbV9pc1Zpc2libGUgPSBmYWxzZTsK KyAgICBtX2lzRGVidWdnaW5nSmF2YVNjcmlwdCA9IGZhbHNlOworICAgIG1faXNQcm9maWxpbmdK YXZhU2NyaXB0ID0gZmFsc2U7CisgICAgbV9pc1Byb2ZpbGluZ1BhZ2UgPSBmYWxzZTsKIAogICAg IGlmIChtX2lzQXR0YWNoZWQpIHsKICAgICAgICAgLy8gRGV0YWNoIGhlcmUgc28gd2Ugb25seSBu ZWVkIHRvIGhhdmUgb25lIGNvZGUgcGF0aCB0aGF0IGlzIHJlc3BvbnNpYmxlIGZvciBjbGVhbmlu ZyB1cCB0aGUgaW5zcGVjdG9yCg==