110105 2013-02-18 05:18:34 -0800 Web Inspector: [Resources] Only remember the tree element selection if explicitly made by user 2013-02-18 06:12:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 109572 1 apavlov apavlov apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 835374 0 apavlov 2013-02-18 05:18:34 -0800 Otherwise nodes that can go away before main frame navigation (detached frames, DOM storages, etc.) will not get restored. 835397 1 188862 apavlov 2013-02-18 05:48:43 -0800 Created attachment 188862 Patch 835418 2 apavlov 2013-02-18 06:12:12 -0800 Committed r143209: <http://trac.webkit.org/changeset/143209> 188862 2013-02-18 05:48:43 -0800 2013-02-18 06:07:41 -0800 Patch bug-110105-20130218174506.patch text/plain 10635 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ0YmU5MGJhY2RhN2Nh NDM1ZjgxYjZjY2VhODcxYWFmYmQ4MzUxNS4uOTg1YmIzMmFmNzg1Njc3ZTc2NGIxZjk3YjgyNTc1 N2ZlMDc5ZjU4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAyLTE4ICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1Jlc291cmNlc10gT25seSByZW1lbWJlciB0aGUgdHJlZSBlbGVtZW50IHNlbGVjdGlv biBpZiBleHBsaWNpdGx5IG1hZGUgYnkgdXNlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMTA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgaW5zdHJ1Y3RzIHRoZSBSZXNvdXJjZXMg cGFuZWwgdG8gcmVtZW1iZXIgdGhlIHNlbGVjdGVkIHRyZWUgZWxlbWVudCBvbmx5IGlmIGl0IGhh cyBiZWVuCisgICAgICAgIHNlbGVjdGVkIGJ5IHRoZSB1c2VyIChub3QgYXV0b21hdGljYWxseSwg bGlrZSBzZWxlY3RpbmcgYSBwYXJlbnQgd2hlbiBpdHMgY2hpbGQgaXMgcmVtb3ZlZCkuCisgICAg ICAgIEFsbCBvbnNlbGVjdCgpIG92ZXJyaWRlcyBwYXNzIHRoZSBzZWxlY3RlZEJ5VXNlciBhcmd1 bWVudCB2YWx1ZQorICAgICAgICB0byBCYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5v bnNlbGVjdC4KKyAgICAgICAgRHJpdmUtYnk6IFVzZSA9PT0gY29tcGFyaXNvbnMgZXZlcnl3aGVy ZS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLl9yZXNldCk6IERv IG5vdCBkZXRhY2ggW2ltbXV0YWJsZV0gY2F0ZWdvcnkgdmlld3MuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOiBSZW1lbWJl ciBpdGVtVVJMIG9uIHVzZXIgZ2VzdHVyZSBvbmx5LgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 b3JhZ2VDYXRlZ29yeVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxl Y3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlVHJlZUVsZW1lbnQucHJvdG90eXBl Lm9uc2VsZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVHJlZUVsZW1l bnQucHJvdG90eXBlLm9uc2VsZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5JREJEYXRhYmFz ZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu SURCT2JqZWN0U3RvcmVUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLklEQkluZGV4VHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0KToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlVHJlZUVsZW1lbnQpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkRPTVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZU1hbmlmZXN0VHJlZUVsZW1l bnQucHJvdG90eXBlLm9uc2VsZWN0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5BcHBsaWNhdGlv bkNhY2hlRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLkZpbGVTeXN0ZW1UcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLkZpbGVTeXN0ZW1UcmVlRWxlbWVudC5wcm90b3R5cGUuY2xlYXIp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlc1NlYXJjaENvbnRyb2xsZXIucHJvdG90 eXBlLm5leHRTZWFyY2hSZXN1bHQpOgorCiAyMDEzLTAyLTE4ICBHeXV5b3VuZyBLaW0gIDxneXV5 b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gUmViYXNlbGluZSBmYWlsdXJl IG1lZGlhIHRlc3RzIGFmdGVyIHIxNDI5NDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDZkMzFjNjlkZTgyNmRjOGM3 YWZhZmIwZjVmZjgzNmI2ZGYyYjc4MjQuLmVhYWExYTJlZDRkZTFlYTJlNjlmOGM3ZTQzMjYxMjg2 Yjg3ZWE2NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTkzLDcgKzE5Myw3IEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuc2Vzc2lvblN0b3JhZ2VMaXN0 VHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICAgICAgdGhpcy5jb29raWVMaXN0VHJl ZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKIAotICAgICAgICBpZiAodGhpcy52aXNpYmxlVmll dykKKyAgICAgICAgaWYgKHRoaXMudmlzaWJsZVZpZXcgJiYgISh0aGlzLnZpc2libGVWaWV3IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLlN0b3JhZ2VDYXRlZ29yeVZpZXcpKQogICAgICAgICAgICAg dGhpcy52aXNpYmxlVmlldy5kZXRhY2goKTsKIAogICAgICAgICB0aGlzLnN0b3JhZ2VWaWV3U3Rh dHVzQmFySXRlbXNDb250YWluZXIucmVtb3ZlQ2hpbGRyZW4oKTsKQEAgLTkzMyw4ICs5MzMsMTAg QEAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAg ICAgICB9CiAgICAgfSwKIAotICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCisgICAgb25zZWxlY3Q6 IGZ1bmN0aW9uKHNlbGVjdGVkQnlVc2VyKQogICAgIHsKKyAgICAgICAgaWYgKCFzZWxlY3RlZEJ5 VXNlcikKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdmFyIGl0ZW1VUkwgPSB0aGlzLml0 ZW1VUkw7CiAgICAgICAgIGlmIChpdGVtVVJMKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNl dHRpbmdzLnJlc291cmNlc0xhc3RTZWxlY3RlZEl0ZW0uc2V0KGl0ZW1VUkwpOwpAQCAtOTk1LDkg Kzk5Nyw5IEBAIFdlYkluc3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHJldHVybiAiY2F0ZWdvcnk6Ly8iICsgdGhpcy5fY2F0ZWdvcnlOYW1l OwogICAgIH0sCiAKLSAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQorICAgIG9uc2VsZWN0OiBmdW5j dGlvbihzZWxlY3RlZEJ5VXNlcikKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3Rv cmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMpOworICAgICAgICBX ZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2Fs bCh0aGlzLCBzZWxlY3RlZEJ5VXNlcik7CiAgICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5lbC5zaG93 Q2F0ZWdvcnlWaWV3KHRoaXMuX2NhdGVnb3J5TmFtZSk7CiAgICAgfSwKIApAQCAtMTA1Miw5ICsx MDU0LDkgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAg ICAgICByZXR1cm4gImZyYW1lOi8vIiArIGVuY29kZVVSSSh0aGlzLmRpc3BsYXlOYW1lKTsKICAg ICB9LAogCi0gICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKKyAgICBvbnNlbGVjdDogZnVuY3Rpb24o c2VsZWN0ZWRCeVVzZXIpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VU cmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhp cywgc2VsZWN0ZWRCeVVzZXIpOwogICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuc2hvd0NhdGVn b3J5Vmlldyh0aGlzLmRpc3BsYXlOYW1lKTsKIAogICAgICAgICB0aGlzLmxpc3RJdGVtRWxlbWVu dC5yZW1vdmVTdHlsZUNsYXNzKCJob3ZlcmVkIik7CkBAIC0xMTYwLDkgKzExNjIsOSBAQCBXZWJJ bnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAg cmV0dXJuIHRoaXMuX3Jlc291cmNlLnVybDsKICAgICB9LAogCi0gICAgb25zZWxlY3Q6IGZ1bmN0 aW9uKCkKKyAgICBvbnNlbGVjdDogZnVuY3Rpb24oc2VsZWN0ZWRCeVVzZXIpCiAgICAgewotICAg ICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxl Y3QuY2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1l bnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcywgc2VsZWN0ZWRCeVVzZXIpOwogICAgICAg ICB0aGlzLl9zdG9yYWdlUGFuZWwuX3Nob3dSZXNvdXJjZVZpZXcodGhpcy5fcmVzb3VyY2UpOwog ICAgIH0sCiAKQEAgLTEzMjcsOSArMTMyOSw5IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuICJkYXRhYmFzZTovLyIgKyBlbmNv ZGVVUkkodGhpcy5fZGF0YWJhc2UubmFtZSk7CiAgICAgfSwKIAotICAgIG9uc2VsZWN0OiBmdW5j dGlvbigpCisgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKHNlbGVjdGVkQnlVc2VyKQogICAgIHsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2Vs ZWN0LmNhbGwodGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVt ZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMsIHNlbGVjdGVkQnlVc2VyKTsKICAgICAg ICAgdGhpcy5fc3RvcmFnZVBhbmVsLl9zaG93RGF0YWJhc2UodGhpcy5fZGF0YWJhc2UpOwogICAg IH0sCiAKQEAgLTEzNzEsOSArMTM3Myw5IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVHJl ZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gImRhdGFiYXNlOi8vIiArIGVu Y29kZVVSSSh0aGlzLl9kYXRhYmFzZS5uYW1lKSArICIvIiArIGVuY29kZVVSSSh0aGlzLl90YWJs ZU5hbWUpOwogICAgIH0sCiAKLSAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQorICAgIG9uc2VsZWN0 OiBmdW5jdGlvbihzZWxlY3RlZEJ5VXNlcikKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5C YXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMpOworICAg ICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxl Y3QuY2FsbCh0aGlzLCBzZWxlY3RlZEJ5VXNlcik7CiAgICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5l bC5fc2hvd0RhdGFiYXNlKHRoaXMuX2RhdGFiYXNlLCB0aGlzLl90YWJsZU5hbWUpOwogICAgIH0s CiAKQEAgLTE2NDMsOSArMTY0NSw5IEBAIFdlYkluc3BlY3Rvci5JREJEYXRhYmFzZVRyZWVFbGVt ZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy50b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJWZXJzaW9uIikgKyAiOiAiICsgdGhpcy5fZGF0YWJhc2UudmVyc2lvbjsKICAgICB9 LAogCi0gICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKKyAgICBvbnNlbGVjdDogZnVuY3Rpb24oc2Vs ZWN0ZWRCeVVzZXIpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVl RWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2FsbCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVj dG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcywg c2VsZWN0ZWRCeVVzZXIpOwogICAgICAgICBpZiAoIXRoaXMuX3ZpZXcpCiAgICAgICAgICAgICB0 aGlzLl92aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5JREJEYXRhYmFzZVZpZXcodGhpcy5fZGF0YWJh c2UpOwogCkBAIC0xNzQ0LDkgKzE3NDYsOSBAQCBXZWJJbnNwZWN0b3IuSURCT2JqZWN0U3RvcmVU cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudG9vbHRpcCA9IHRvb2x0aXBT dHJpbmcKICAgICB9LAogCi0gICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKKyAgICBvbnNlbGVjdDog ZnVuY3Rpb24oc2VsZWN0ZWRCeVVzZXIpCiAgICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuQmFz ZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2FsbCh0aGlzKTsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0 LmNhbGwodGhpcywgc2VsZWN0ZWRCeVVzZXIpOwogICAgICAgICBpZiAoIXRoaXMuX3ZpZXcpCiAg ICAgICAgICAgICB0aGlzLl92aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5JREJEYXRhVmlldyh0aGlz Ll9tb2RlbCwgdGhpcy5fZGF0YWJhc2VJZCwgdGhpcy5fb2JqZWN0U3RvcmUsIG51bGwpOwogCkBA IC0xODI0LDkgKzE4MjYsOSBAQCBXZWJJbnNwZWN0b3IuSURCSW5kZXhUcmVlRWxlbWVudC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudG9vbHRpcCA9IHRvb2x0aXBMaW5lcy5qb2luKCJcbiIp OwogICAgIH0sCiAKLSAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQorICAgIG9uc2VsZWN0OiBmdW5j dGlvbihzZWxlY3RlZEJ5VXNlcikKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3Rv cmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMpOworICAgICAgICBX ZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2Fs bCh0aGlzLCBzZWxlY3RlZEJ5VXNlcik7CiAgICAgICAgIGlmICghdGhpcy5fdmlldykKICAgICAg ICAgICAgIHRoaXMuX3ZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLklEQkRhdGFWaWV3KHRoaXMuX21v ZGVsLCB0aGlzLl9kYXRhYmFzZUlkLCB0aGlzLl9vYmplY3RTdG9yZSwgdGhpcy5faW5kZXgpOwog CkBAIC0xODU4LDkgKzE4NjAsOSBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZVRyZWVFbGVtZW50 LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuICJzdG9yYWdlOi8vIiArIHRoaXMuX2RvbVN0 b3JhZ2UuZG9tYWluICsgIi8iICsgKHRoaXMuX2RvbVN0b3JhZ2UuaXNMb2NhbFN0b3JhZ2UgPyAi bG9jYWwiIDogInNlc3Npb24iKTsKICAgICB9LAogCi0gICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkK KyAgICBvbnNlbGVjdDogZnVuY3Rpb24oc2VsZWN0ZWRCeVVzZXIpCiAgICAgewotICAgICAgICBX ZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2Fs bCh0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcywgc2VsZWN0ZWRCeVVzZXIpOwogICAgICAgICB0aGlz Ll9zdG9yYWdlUGFuZWwuX3Nob3dET01TdG9yYWdlKHRoaXMuX2RvbVN0b3JhZ2UpOwogICAgIH0s CiAKQEAgLTE4ODMsOSArMTg4NSw5IEBAIFdlYkluc3BlY3Rvci5Db29raWVUcmVlRWxlbWVudC5w cm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAiY29va2llczovLyIgKyB0aGlzLl9jb29raWVE b21haW47CiAgICAgfSwKIAotICAgIG9uc2VsZWN0OiBmdW5jdGlvbigpCisgICAgb25zZWxlY3Q6 IGZ1bmN0aW9uKHNlbGVjdGVkQnlVc2VyKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkJh c2VTdG9yYWdlVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcyk7CisgICAg ICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVj dC5jYWxsKHRoaXMsIHNlbGVjdGVkQnlVc2VyKTsKICAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVs LnNob3dDb29raWVzKHRoaXMsIHRoaXMuX2Nvb2tpZURvbWFpbik7CiAgICAgfSwKIApAQCAtMTkx NSw5ICsxOTE3LDkgQEAgV2ViSW5zcGVjdG9yLkFwcGxpY2F0aW9uQ2FjaGVNYW5pZmVzdFRyZWVF bGVtZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX21hbmlmZXN0VVJMOwog ICAgIH0sCiAKLSAgICBvbnNlbGVjdDogZnVuY3Rpb24oKQorICAgIG9uc2VsZWN0OiBmdW5jdGlv bihzZWxlY3RlZEJ5VXNlcikKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFn ZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMpOworICAgICAgICBXZWJJ bnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QuY2FsbCh0 aGlzLCBzZWxlY3RlZEJ5VXNlcik7CiAgICAgICAgIHRoaXMuX3N0b3JhZ2VQYW5lbC5zaG93Q2F0 ZWdvcnlWaWV3KHRoaXMuX21hbmlmZXN0VVJMKTsKICAgICB9LAogCkBAIC0xOTY4LDkgKzE5NzAs OSBAQCBXZWJJbnNwZWN0b3IuQXBwbGljYXRpb25DYWNoZUZyYW1lVHJlZUVsZW1lbnQucHJvdG90 eXBlID0gewogICAgICAgICB0aGlzLl9yZWZyZXNoVGl0bGVzKCk7CiAgICAgfSwKIAotICAgIG9u c2VsZWN0OiBmdW5jdGlvbigpCisgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKHNlbGVjdGVkQnlVc2Vy KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3Rv cmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMsIHNlbGVjdGVkQnlV c2VyKTsKICAgICAgICAgdGhpcy5fc3RvcmFnZVBhbmVsLnNob3dBcHBsaWNhdGlvbkNhY2hlKHRo aXMuX2ZyYW1lSWQpOwogICAgIH0sCiAKQEAgLTIwMDEsMTYgKzIwMDMsMTYgQEAgV2ViSW5zcGVj dG9yLkZpbGVTeXN0ZW1UcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAi ZmlsZXN5c3RlbTovLyIgKyB0aGlzLl9maWxlU3lzdGVtLm5hbWU7CiAgICAgfSwKIAotICAgIG9u c2VsZWN0OiBmdW5jdGlvbigpCisgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKHNlbGVjdGVkQnlVc2Vy KQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQucHJv dG90eXBlLm9uc2VsZWN0LmNhbGwodGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3Rv cmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdC5jYWxsKHRoaXMsIHNlbGVjdGVkQnlV c2VyKTsKICAgICAgICAgdGhpcy5fZmlsZVN5c3RlbVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLkZp bGVTeXN0ZW1WaWV3KHRoaXMuX2ZpbGVTeXN0ZW0pOwogICAgICAgICB0aGlzLl9zdG9yYWdlUGFu ZWwuc2hvd0ZpbGVTeXN0ZW0odGhpcy5fZmlsZVN5c3RlbVZpZXcpOwogICAgIH0sCiAKICAgICBj bGVhcjogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuZmlsZVN5c3RlbVZpZXcg JiYgdGhpcy5fc3RvcmFnZVBhbmVsLnZpc2libGVWaWV3ID09IHRoaXMuZmlsZVN5c3RlbVZpZXcp CisgICAgICAgIGlmICh0aGlzLmZpbGVTeXN0ZW1WaWV3ICYmIHRoaXMuX3N0b3JhZ2VQYW5lbC52 aXNpYmxlVmlldyA9PT0gdGhpcy5maWxlU3lzdGVtVmlldykKICAgICAgICAgICAgIHRoaXMuX3N0 b3JhZ2VQYW5lbC5jbG9zZVZpc2libGVWaWV3KCk7CiAgICAgfSwKIApAQCAtMjA2OCw3ICsyMDcw LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlc1NlYXJjaENvbnRyb2xsZXIucHJvdG90eXBlID0g ewogICAgICAgICBpZiAodGhpcy5fbGFzdFRyZWVFbGVtZW50ICE9PSBjdXJyZW50VHJlZUVsZW1l bnQgfHwgdGhpcy5fbGFzdEluZGV4ID09PSAtMSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9z ZWFyY2hSZXN1bHQoY3VycmVudFRyZWVFbGVtZW50LCAwKTsKIAotICAgICAgICBpZiAodGhpcy5f bGFzdEluZGV4ID09IGN1cnJlbnRUcmVlRWxlbWVudC5zZWFyY2hNYXRjaGVzQ291bnQgLSAxKQor ICAgICAgICBpZiAodGhpcy5fbGFzdEluZGV4ID09PSBjdXJyZW50VHJlZUVsZW1lbnQuc2VhcmNo TWF0Y2hlc0NvdW50IC0gMSkKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9zZWFyY2hSZXN1bHQo dGhpcy5fdHJhdmVyc2VyLm5leHQoY3VycmVudFRyZWVFbGVtZW50KSwgMCwgdGhpcy5fY3VycmVu dE1hdGNoSW5kZXggJSB0aGlzLl9tYXRjaGVzQ291bnQgKyAxKTsKIAogICAgICAgICByZXR1cm4g dGhpcy5fc2VhcmNoUmVzdWx0KGN1cnJlbnRUcmVlRWxlbWVudCwgdGhpcy5fbGFzdEluZGV4ICsg MSwgdGhpcy5fY3VycmVudE1hdGNoSW5kZXggKyAxKTsK