90466 2012-07-03 09:11:36 -0700 Web Inspector: Introduce Workspace make it UISourceCode provider for ScriptsPanel. 2012-07-03 09:29:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 662287 0 vsevik 2012-07-03 09:11:36 -0700 We should extract a model behind ScriptsPanel because ExtensionServer will depend on it ocne it becomes UISourceCode based. 662292 1 150625 vsevik 2012-07-03 09:20:41 -0700 Created attachment 150625 Patch 662297 2 vsevik 2012-07-03 09:29:23 -0700 Committed r121778: <http://trac.webkit.org/changeset/121778> 150625 2012-07-03 09:20:41 -0700 2012-07-03 09:23:05 -0700 Patch bug-90466-20120703202039.patch text/plain 15684 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODEwZTFjZGMyYTEyNTlj YWNmNDRhNTQ1MDIyMzcwMTcxZDgzNzNlZi4uYjc2OWYwYjUwZjU3Y2I5N2U0OTQ1OTBkMDlhOGI3 OWI1YmRhMGFjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTA3LTAzICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEludHJvZHVjZSBXb3Jrc3BhY2UgbWFrZSBpdCBVSVNvdXJjZUNvZGUgcHJvdmlkZXIgZm9y IFNjcmlwdHNQYW5lbC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTkwNDY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgSW50cm9kdWNlZCBXZWJJbnNwZWN0b3IuV29ya3NwYWNlIGFzIGEgbW9kZWwgKFVJU291 cmNlQ29kZSBwcm92aWRlcikgYmVoaW5kIFNjcmlwdHNQYW5lbC4KKworICAgICAgICAqIFdlYkNv cmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAg ICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHk6CisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9XZWJLaXQucXJjOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpz OiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJjZUNvZGVQcm92 aWRlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcG9zaXRlVUlTb3VyY2VDb2RlUHJvdmlk ZXIucHJvdG90eXBlLl9yZWdpc3RlclVJU291cmNlQ29kZVByb3ZpZGVyKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUuX2hhbmRs ZVVJU291cmNlQ29kZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21wb3NpdGVVSVNv dXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUuX2hhbmRsZVVJU291cmNlQ29kZVJlcGxhY2VkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90 b3R5cGUuX2hhbmRsZVVJU291cmNlQ29kZVJlbW92ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LkNvbXBvc2l0ZVVJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS51aVNvdXJjZUNvZGVzKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LldvcmtzcGFjZS5wcm90b3R5cGUucmVnaXN0ZXJVSVNvdXJjZUNvZGVQcm92aWRlcik6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbDoKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKworMjAxMi0wNy0wMyAgVnNldm9sb2QgVmxh c292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKwogICAgICAgICBpbnNwZWN0b3IvZGVidWdnZXIv c2NyaXB0LXNuaXBwZXQtbW9kZWwuaHRtbCBmYWlscwogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAzODUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDRjYTgz MDg4Njc0MmJhODMwZmQxN2MyMTU4MGFjYzExMGM3MjUxOTEuLjZhMDc3ZGVjZDFmMGM2MjdlNTBl MDBmZmVlM2NjMDBhYWJmY2JhNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKQEAgLTY0MDYsNiArNjQwNiw3 IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9XYXRjaEV4cHJlc3Npb25zU2lk ZWJhclBhbmUuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvV29ya2VyTWFu YWdlci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9Xb3JrZXJzU2lkZWJh clBhbmUuanMnLAorICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpz JywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL2RpYWxvZy5jc3MnLAogICAgICAg ICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzcycsCiAgICAgICAgICAgICAn aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3JTeW50YXhIaWdobGlnaHQuY3NzJywKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUudmNwcm9qIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5kZXggZTNkN2I2Y2M2 ODk0NTM1MDYxYzBiODdlYzhlMzk5NzJkMWYyOGVkOC4uZDMwMzNjNTk3ZWY0YjY4ZWE4YmI2YjRi OTFmNzc3ZTk5YTAwOWIwOCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3By b2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2Vi Q29yZS52Y3Byb2oKQEAgLTc1NTQ1LDYgKzc1NTQ1LDEwIEBACiAJCQkJCVJlbGF0aXZlUGF0aD0i Li5caW5zcGVjdG9yXGZyb250LWVuZFxXb3JrZXJzU2lkZWJhclBhbmUuanMiCiAJCQkJCT4KIAkJ CQk8L0ZpbGU+CisJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3JcZnJv bnQtZW5kXFdvcmtzcGFjZS5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4KIAkJCTwvRmlsdGVyPgog CQk8L0ZpbHRlcj4KIAkJPEZpbHRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBp bGUtZnJvbnQtZW5kLnB5CmluZGV4IGQ0MGQ5ZjA3MmFkNDY3ODY3YmI2NTMxZWIxNDI5OGFhMDAz NGYyMjEuLmQ4NDFjMjZlMzBkMThmYjNhNjdlODM2NGZmNzM2ZTZlYTgwOTg1M2MgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKQEAgLTEwNiw2ICsx MDYsNyBAQCBtb2R1bGVzID0gWwogICAgICAgICAgICAgIk5ldHdvcmtSZXF1ZXN0LmpzIiwKICAg ICAgICAgICAgICJVSVNvdXJjZUNvZGUuanMiLAogICAgICAgICAgICAgIlVzZXJBZ2VudFN1cHBv cnQuanMiLAorICAgICAgICAgICAgIldvcmtzcGFjZS5qcyIsCiAgICAgICAgIF0KICAgICB9LAog ICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKaW5kZXggMjg2OTc3NWMwOWU1YWE4NGI2NGY5NDFlNTFmMTgyYmZkNDhkOTI4OS4u N2E2YWIzMzczMDM2ZDhhN2ZmNGZhYjFkYWYxMGFiY2E0NTk3MmI4OSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTI5LDcg KzI5LDcgQEAKICAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFp bmVyRGVsZWdhdGV9CiAgKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLkNvbnRleHRNZW51LlBy b3ZpZGVyfQogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5QYW5lbH0KLSAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLkNvbXBvc2l0ZVVJU291cmNlQ29kZVByb3ZpZGVyPX0gdWlTb3VyY2VDb2RlUHJv dmlkZXJGb3JUZXN0CisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRl cj19IHVpU291cmNlQ29kZVByb3ZpZGVyRm9yVGVzdAogICovCiBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsID0gZnVuY3Rpb24odWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0KQogewpAQCAtNDAs MTMgKzQwLDcgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCA9IGZ1bmN0aW9uKHVpU291cmNl Q29kZVByb3ZpZGVyRm9yVGVzdCkKICAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MubmF2aWdhdG9y V2FzT25jZUhpZGRlbiA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJuYXZp Z2F0b3JXYXNPbmNlSGlkZGVuIiwgZmFsc2UpOwogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5k ZWJ1Z2dlclNpZGViYXJIaWRkZW4gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGlu ZygiZGVidWdnZXJTaWRlYmFySGlkZGVuIiwgZmFsc2UpOwogCi0gICAgdmFyIHNjcmlwdE1hcHBp bmcgPSBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZygpOwotICAgIHZhciBw cm92aWRlcnMgPSBzY3JpcHRNYXBwaW5nLnVpU291cmNlQ29kZVByb3ZpZGVycygpOwotICAgIHBy b3ZpZGVycyA9IHByb3ZpZGVycy5jb25jYXQobmV3IFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJj ZUNvZGVQcm92aWRlcigpKTsKLSAgICB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlciA9IHVpU291 cmNlQ29kZVByb3ZpZGVyRm9yVGVzdCB8fCBuZXcgV2ViSW5zcGVjdG9yLkNvbXBvc2l0ZVVJU291 cmNlQ29kZVByb3ZpZGVyKHByb3ZpZGVycyk7Ci0KLSAgICBuZXcgV2ViSW5zcGVjdG9yLlByZXNl bnRhdGlvbkNvbnNvbGVNZXNzYWdlSGVscGVyKHRoaXMuX3VpU291cmNlQ29kZVByb3ZpZGVyKTsK LSAgICBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nKHRoaXMuX3VpU291 cmNlQ29kZVByb3ZpZGVyKTsKKyAgICB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlciA9IHVpU291 cmNlQ29kZVByb3ZpZGVyRm9yVGVzdCB8fCBXZWJJbnNwZWN0b3Iud29ya3NwYWNlOwogCiAgICAg ZnVuY3Rpb24gdmlld0dldHRlcigpCiAgICAgewpAQCAtMTA1OCwxNCArMTA1Miw2IEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAg ICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlcn0gdWlTb3VyY2VD b2RlUHJvdmlkZXIKLSAgICAgKi8KLSAgICByZWdpc3RlclVJU291cmNlQ29kZVByb3ZpZGVyOiBm dW5jdGlvbih1aVNvdXJjZUNvZGVQcm92aWRlcikKLSAgICB7Ci0gICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZVByb3ZpZGVyLl9yZWdpc3RlclVJU291cmNlQ29kZVByb3ZpZGVyKHVpU291cmNlQ29k ZVByb3ZpZGVyKTsKLSAgICB9LAotCi0gICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKICAgICAgKi8KICAgICBfc2hvd0xvY2FsSGlz dG9yeTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQpAQCAtMTA5Niw2NyArMTA4MiwzIEBAIFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogfQogCiBXZWJJbnNwZWN0b3IuU2Ny aXB0c1BhbmVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90 eXBlOwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5P YmplY3R9Ci0gKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVy fQotICogQHBhcmFtIHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyPn0g dWlTb3VyY2VDb2RlUHJvdmlkZXJzCi0gKi8KLVdlYkluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJj ZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKHVpU291cmNlQ29kZVByb3ZpZGVycykKLXsKLSAgICBX ZWJJbnNwZWN0b3IuT2JqZWN0LmNhbGwodGhpcyk7Ci0gICAgdGhpcy5fdWlTb3VyY2VDb2RlUHJv dmlkZXJzID0gW107Ci0gICAgZm9yICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVQcm92aWRl cnMubGVuZ3RoOyArK2kpCi0gICAgICAgIHRoaXMuX3JlZ2lzdGVyVUlTb3VyY2VDb2RlUHJvdmlk ZXIodWlTb3VyY2VDb2RlUHJvdmlkZXJzW2ldKTsKLX0KLQotV2ViSW5zcGVjdG9yLkNvbXBvc2l0 ZVVJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlcn0gdWlTb3VyY2VDb2RlUHJvdmlk ZXIKLSAgICAgKi8KLSAgICBfcmVnaXN0ZXJVSVNvdXJjZUNvZGVQcm92aWRlcjogZnVuY3Rpb24o dWlTb3VyY2VDb2RlUHJvdmlkZXIpCi0gICAgewotICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVQ cm92aWRlcnMucHVzaCh1aVNvdXJjZUNvZGVQcm92aWRlcik7Ci0gICAgICAgIHVpU291cmNlQ29k ZVByb3ZpZGVyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3Zp ZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVBZGRlZCwgdGhpcy5faGFuZGxlVUlTb3VyY2VDb2RlQWRk ZWQsIHRoaXMpOwotICAgICAgICB1aVNvdXJjZUNvZGVQcm92aWRlci5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlUmVw bGFjZWQsIHRoaXMuX2hhbmRsZVVJU291cmNlQ29kZVJlcGxhY2VkLCB0aGlzKTsKLSAgICAgICAg dWlTb3VyY2VDb2RlUHJvdmlkZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3Vy Y2VDb2RlUHJvdmlkZXIuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQsIHRoaXMuX2hhbmRsZVVJ U291cmNlQ29kZVJlbW92ZWQsIHRoaXMpOwotICAgIH0sCi0KLSAgICBfaGFuZGxlVUlTb3VyY2VD b2RlQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5V SVNvdXJjZUNvZGVBZGRlZCwgZXZlbnQuZGF0YSk7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAq IEBwYXJhbSB7V2ViSW5zcGVjdG9yLkV2ZW50fSBldmVudAotICAgICAqLwotICAgIF9oYW5kbGVV SVNvdXJjZUNvZGVSZXBsYWNlZDogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICB0aGlz LmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlk ZXIuRXZlbnRzLlVJU291cmNlQ29kZVJlcGxhY2VkLCBldmVudC5kYXRhKTsKLSAgICB9LAotCi0g ICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50Ci0gICAgICov Ci0gICAgX2hhbmRsZVVJU291cmNlQ29kZVJlbW92ZWQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsK LSAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291 cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJjZUNvZGVSZW1vdmVkLCBldmVudC5kYXRhKTsK LSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXkuPFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGU+fQotICAgICAqLwotICAgIHVpU291cmNlQ29kZXM6IGZ1bmN0aW9uKCkKLSAg ICB7Ci0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlcnMubGVuZ3RoOyArK2kpIHsKLSAgICAgICAgICAg IHZhciB1aVNvdXJjZUNvZGVzID0gdGhpcy5fdWlTb3VyY2VDb2RlUHJvdmlkZXJzW2ldLnVpU291 cmNlQ29kZXMoKTsKLSAgICAgICAgICAgIGZvciAodmFyIGogPSAwOyBqIDwgdWlTb3VyY2VDb2Rl cy5sZW5ndGg7ICsraikKLSAgICAgICAgICAgICAgICByZXN1bHQucHVzaCh1aVNvdXJjZUNvZGVz W2pdKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0KLX0KLQotV2Vi SW5zcGVjdG9yLkNvbXBvc2l0ZVVJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCA4M2EzYThlNTY5NWMyMTM3MzI2Yzkx NmFjM2Y4N2ZhNzhjMjAzNGViLi4yZmRjNWIyYzAzYjA0N2I4YjAyZjE4Yzk1Mzk2ZjhjYzFmNGY0 ODA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktp dC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJj CkBAIC0xODksNiArMTg5LDcgQEAKICAgICA8ZmlsZT5XYXRjaEV4cHJlc3Npb25zU2lkZWJhclBh bmUuanM8L2ZpbGU+CiAgICAgPGZpbGU+V29ya2VyTWFuYWdlci5qczwvZmlsZT4KICAgICA8Zmls ZT5Xb3JrZXJzU2lkZWJhclBhbmUuanM8L2ZpbGU+CisgICAgPGZpbGU+V29ya3NwYWNlLmpzPC9m aWxlPgogICAgIDxmaWxlPlVnbGlmeUpTL3BhcnNlLWpzLmpzPC9maWxlPgogICAgIDxmaWxlPmF1 ZGl0c1BhbmVsLmNzczwvZmlsZT4KICAgICA8ZmlsZT5kYXRhR3JpZC5jc3M8L2ZpbGU+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV29ya3NwYWNlLmpzCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjVjMzAxNTZlN2YxZGM0N2ZkOTBmNWYyNjRkNzM2NjNmNDFlMGQ1ZTYKLS0tIC9kZXYvbnVs bAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dvcmtzcGFjZS5qcwpA QCAtMCwwICsxLDEyNSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291 cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBh cmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQor ICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmln aHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRpb24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBu YW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMg bWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQor ICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lv bi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9M REVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMgSVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVAorICogTElNSVRFRCBUTywgVEhFIElN UExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisgKiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwK KyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5z cGVjdG9yLk9iamVjdH0KKyAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl UHJvdmlkZXJ9CisgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJv dmlkZXI+fSB1aVNvdXJjZUNvZGVQcm92aWRlcnMKKyAqLworV2ViSW5zcGVjdG9yLkNvbXBvc2l0 ZVVJU291cmNlQ29kZVByb3ZpZGVyID0gZnVuY3Rpb24odWlTb3VyY2VDb2RlUHJvdmlkZXJzKQor eworICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKKyAgICB0aGlzLl91aVNvdXJj ZUNvZGVQcm92aWRlcnMgPSBbXTsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVpU291cmNlQ29k ZVByb3ZpZGVycy5sZW5ndGg7ICsraSkKKyAgICAgICAgdGhpcy5fcmVnaXN0ZXJVSVNvdXJjZUNv ZGVQcm92aWRlcih1aVNvdXJjZUNvZGVQcm92aWRlcnNbaV0pOworfQorCitXZWJJbnNwZWN0b3Iu Q29tcG9zaXRlVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlID0geworICAgIC8qKgorICAg ICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyfSB1aVNvdXJjZUNv ZGVQcm92aWRlcgorICAgICAqLworICAgIF9yZWdpc3RlclVJU291cmNlQ29kZVByb3ZpZGVyOiBm dW5jdGlvbih1aVNvdXJjZUNvZGVQcm92aWRlcikKKyAgICB7CisgICAgICAgIHRoaXMuX3VpU291 cmNlQ29kZVByb3ZpZGVycy5wdXNoKHVpU291cmNlQ29kZVByb3ZpZGVyKTsKKyAgICAgICAgdWlT b3VyY2VDb2RlUHJvdmlkZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlUHJvdmlkZXIuRXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCB0aGlzLl9oYW5kbGVVSVNvdXJj ZUNvZGVBZGRlZCwgdGhpcyk7CisgICAgICAgIHVpU291cmNlQ29kZVByb3ZpZGVyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJj ZUNvZGVSZXBsYWNlZCwgdGhpcy5faGFuZGxlVUlTb3VyY2VDb2RlUmVwbGFjZWQsIHRoaXMpOwor ICAgICAgICB1aVNvdXJjZUNvZGVQcm92aWRlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlUmVtb3ZlZCwgdGhpcy5f aGFuZGxlVUlTb3VyY2VDb2RlUmVtb3ZlZCwgdGhpcyk7CisgICAgfSwKKworICAgIF9oYW5kbGVV SVNvdXJjZUNvZGVBZGRlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXIu RXZlbnRzLlVJU291cmNlQ29kZUFkZGVkLCBldmVudC5kYXRhKTsKKyAgICB9LAorCisgICAgLyoq CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRXZlbnR9IGV2ZW50CisgICAgICovCisgICAg X2hhbmRsZVVJU291cmNlQ29kZVJlcGxhY2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVQcm92aWRlci5FdmVudHMuVUlTb3VyY2VDb2RlUmVwbGFjZWQsIGV2ZW50LmRhdGEpOworICAg IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5FdmVudH0gZXZlbnQK KyAgICAgKi8KKyAgICBfaGFuZGxlVUlTb3VyY2VDb2RlUmVtb3ZlZDogZnVuY3Rpb24oZXZlbnQp CisgICAgeworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXIuRXZlbnRzLlVJU291cmNlQ29kZVJlbW92ZWQsIGV2ZW50 LmRhdGEpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtBcnJheS48V2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZT59CisgICAgICovCisgICAgdWlTb3VyY2VDb2RlczogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdmFyIHJlc3VsdCA9IFtdOworICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHRoaXMuX3VpU291cmNlQ29kZVByb3ZpZGVycy5sZW5ndGg7ICsraSkgeworICAg ICAgICAgICAgdmFyIHVpU291cmNlQ29kZXMgPSB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlcnNb aV0udWlTb3VyY2VDb2RlcygpOworICAgICAgICAgICAgZm9yICh2YXIgaiA9IDA7IGogPCB1aVNv dXJjZUNvZGVzLmxlbmd0aDsgKytqKQorICAgICAgICAgICAgICAgIHJlc3VsdC5wdXNoKHVpU291 cmNlQ29kZXNbal0pOworICAgICAgICB9CisgICAgICAgIHJldHVybiByZXN1bHQ7CisgICAgfQor fQorCitXZWJJbnNwZWN0b3IuQ29tcG9zaXRlVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBl Ll9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBlOworCisvKioKKyAqIEBj b25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5Db21wb3NpdGVVSVNvdXJjZUNv ZGVQcm92aWRlcn0KKyAqLworV2ViSW5zcGVjdG9yLldvcmtzcGFjZSA9IGZ1bmN0aW9uKCkKK3sK KyAgICB2YXIgc2NyaXB0TWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3IuRGVidWdnZXJTY3JpcHRN YXBwaW5nKCk7CisgICAgdmFyIHByb3ZpZGVycyA9IHNjcmlwdE1hcHBpbmcudWlTb3VyY2VDb2Rl UHJvdmlkZXJzKCk7CisgICAgcHJvdmlkZXJzID0gcHJvdmlkZXJzLmNvbmNhdChuZXcgV2ViSW5z cGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyKCkpOworICAgIFdlYkluc3BlY3Rvci5D b21wb3NpdGVVSVNvdXJjZUNvZGVQcm92aWRlci5jYWxsKHRoaXMsIHByb3ZpZGVycyk7CisgICAg CisgICAgbmV3IFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZUhlbHBlcih0 aGlzKTsKKyAgICBuZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUmVzb3VyY2VCaW5kaW5nKHRoaXMp OworfQorCitXZWJJbnNwZWN0b3IuV29ya3NwYWNlLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAg ICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVQcm92aWRlcn0gdWlTb3VyY2VD b2RlUHJvdmlkZXIKKyAgICAgKi8KKyAgICByZWdpc3RlclVJU291cmNlQ29kZVByb3ZpZGVyOiBm dW5jdGlvbih1aVNvdXJjZUNvZGVQcm92aWRlcikKKyAgICB7CisgICAgICAgIHRoaXMuX3JlZ2lz dGVyVUlTb3VyY2VDb2RlUHJvdmlkZXIodWlTb3VyY2VDb2RlUHJvdmlkZXIpOworICAgIH0sCit9 CisKK1dlYkluc3BlY3Rvci5Xb3Jrc3BhY2UucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3Bl Y3Rvci5Db21wb3NpdGVVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGU7CisKKy8qKgorICog QHR5cGUgez9XZWJJbnNwZWN0b3IuV29ya3NwYWNlfQorICovCitXZWJJbnNwZWN0b3Iud29ya3Nw YWNlID0gbnVsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5odG1sCmluZGV4IGQzOTJkZjBlZDliYmZjZGY3YjRkNDg0YWJhZTM0ZDFjYTI2NWRm MjIuLjRmNWNmZjUyMzg0YTBjMGI5ZDBjYjQxZTA2NTIwOGJmMzE0MmRiM2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApAQCAtMTkw LDYgKzE5MCw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQi IHNyYz0iRGVidWdnZXJTY3JpcHRNYXBwaW5nLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJEZWJ1Z2dlclJlc291cmNlQmluZGluZy5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2VIZWxwZXIuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IldvcmtzcGFjZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQnJlYWtwb2ludE1hbmFnZXIuanMiPjwvc2Ny aXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IkNvbnRlbnRQcm92 aWRlcnMuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBz cmM9IlJhd1NvdXJjZUNvZGUuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA5M2U3MWIyNzRkZDJjNTc3YWU5YTA3 YzgzZmE4YjgwZTc1YzcyZjQzLi5jM2U3NGZiNGE3ZTE2MTdmYmI5MzljZGMxZGI1YzdhNmQ3MTdk YjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcwpAQCAtNDU2LDYgKzQ1Niw4IEBAIFdlYkluc3BlY3Rvci5fZG9Mb2FkZWREb25lV2l0aENh cGFiaWxpdGllcyA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLm9wZW5BbmNob3JMb2NhdGlvblJlZ2lz dHJ5ID0gbmV3IFdlYkluc3BlY3Rvci5IYW5kbGVyUmVnaXN0cnkob3BlbkFuY2hvckxvY2F0aW9u U2V0dGluZyk7CiAgICAgdGhpcy5vcGVuQW5jaG9yTG9jYXRpb25SZWdpc3RyeS5yZWdpc3Rlckhh bmRsZXIoYXV0b3NlbGVjdFBhbmVsLCBmdW5jdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9KTsKIAor ICAgIHRoaXMud29ya3NwYWNlID0gbmV3IFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UoKTsKKwogICAg IHRoaXMuX2NyZWF0ZVBhbmVscygpOwogICAgIHRoaXMuX2NyZWF0ZUdsb2JhbFN0YXR1c0Jhckl0 ZW1zKCk7CiAK