95345 2012-08-29 08:15:18 -0700 Web Inspector: Extract StylesSourceMapping from StylesUISourceCodeProvider. 2012-08-29 08:38:46 -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 707460 0 vsevik 2012-08-29 08:15:18 -0700 Patch to follow. This is needed to prepare StylesUISourceCodeProvider for conversion into NetworkUISourceCodeProvider. 707461 1 161230 vsevik 2012-08-29 08:17:52 -0700 Created attachment 161230 Patch 707477 2 161230 apavlov 2012-08-29 08:30:54 -0700 Comment on attachment 161230 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161230&action=review One nit to be fixed before landing. > Source/WebCore/inspector/front-end/StylesUISourceCodeProvider.js:75 > + setTimeout(this._populate.bind(this), 0); Please FIXME-comment this change, stating that this should be handled in a different manner (like a DidWorkspaceReset event or something) 707484 3 vsevik 2012-08-29 08:38:46 -0700 Committed r127002: <http://trac.webkit.org/changeset/127002> 161230 2012-08-29 08:17:52 -0700 2012-08-29 08:30:54 -0700 Patch bug-95345-20120829191742.patch text/plain 11299 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2OTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFlYTAxMWFkY2EyZDE1 NzNjN2E2NTg3N2U1MjZkMTBhMzkxMmE5MS4uMmFkYmI5OTVmODA3ZTJhMjZiNGU0MjhmMjRiZmI1 NDA2M2EwODc5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTA4LTI5ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEV4dHJhY3QgU3R5bGVzU291cmNlTWFwcGluZyBmcm9tIFN0eWxlc1VJU291cmNlQ29kZVBy b3ZpZGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTUzNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoK KyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTb3VyY2VNYXBwaW5nLmpzOiBDb3BpZWQgZnJvbSBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVy LmpzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1hcHBpbmcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NvdXJjZU1hcHBpbmcucHJvdG90eXBlLmFkZFVJU291cmNl Q29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZy5wcm90b3R5 cGUucmF3TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxl c1NvdXJjZU1hcHBpbmcucHJvdG90eXBlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5yZXNldCk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlcik6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBl Ll9yZXNvdXJjZUFkZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNv ZGVQcm92aWRlci5wcm90b3R5cGUuX3Jlc2V0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1dlYktpdC5xcmM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu aHRtbDoKKworMjAxMi0wOC0yOSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9y Zz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUdXJuIHdvcmtzcGFjZSBpbnRvIGEgY29udGFp bmVyIG9mIFVpU291cmNlQ29kZXMgcHV0IGluIGRpZmZlcmVudCBwcm9qZWN0cy4KICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MzM1CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu Z3lwaQppbmRleCAyMGE1OGE3ZTllNjA1MTQ2NGNmZmY4MTg3NmRkNjM4ZDIzNGMzYjYzLi45YjI0 ZjJjZjA5MjZiNmVkMGNlYmMxN2ViZTdmNGQwNTEwMjE0MDk4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBA IC02MzkxLDYgKzYzOTEsNyBAQAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU3Bs aXRWaWV3LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0YXR1c0JhckJ1 dHRvbi5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZVNvdXJjZS5q cycsCisgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTb3VyY2VNYXBwaW5n LmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1VJU291cmNlQ29k ZVByb3ZpZGVyLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZFBh bmUuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvVGVzdENvbnRyb2xsZXIu anMnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52 Y3Byb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagppbmRl eCAxZjQzNjEzMDljNjE3OGMzOTQ5ZDMyZTBmMDUyNWYwMDFkN2VhYzI5Li40ZGE2MTMyYjA0YjBm NWY0YjNjZWRkNmRmNzUyZGE1NzU5ZWQ0NjEyIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LnZjcHJvai9XZWJDb3JlLnZjcHJvagpAQCAtNzY1OTgsNiArNzY1OTgsMTAgQEAKIAkJCQkJPgog CQkJCTwvRmlsZT4KIAkJCQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxm cm9udC1lbmRcU3R5bGVzU291cmNlTWFwcGluZy5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJ CQk8RmlsZQogCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcU3R5bGVz VUlTb3VyY2VDb2RlUHJvdmlkZXIuanMiCiAJCQkJCT4KIAkJCQk8L0ZpbGU+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKaW5kZXggZmNmYTA0ZWQzYzQ4 ZjhmZTdlNDliMDBkYWI0YzhiOTFlY2Y4MDgwYS4uMTBjZDJiNTQxMzdiMzgwZDZjMjc5OWIzZTcw ZDJhZmRmZWMzYjFlNSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBp bGUtZnJvbnQtZW5kLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZy b250LWVuZC5weQpAQCAtOTAsNiArOTAsNyBAQCBtb2R1bGVzID0gWwogICAgICAgICAgICAgIlNu aXBwZXRTdG9yYWdlLmpzIiwKICAgICAgICAgICAgICJTb3VyY2VNYXBwaW5nLmpzIiwKICAgICAg ICAgICAgICJTdHlsZVNvdXJjZS5qcyIsCisgICAgICAgICAgICAiU3R5bGVzU291cmNlTWFwcGlu Zy5qcyIsCiAgICAgICAgICAgICAiU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIuanMiLAogICAg ICAgICAgICAgIlRpbWVsaW5lTWFuYWdlci5qcyIsCiAgICAgICAgICAgICAiUmF3U291cmNlQ29k ZS5qcyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1NvdXJjZU1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NvdXJjZU1hcHBpbmcuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZDcwY2NlMmIzNDQ5NDliNGRmNDZi NjllMWU1YWU3ZTk3OWMwYTQwOQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU291cmNlTWFwcGluZy5qcwpAQCAtMCwwICsxLDc4IEBA CisvKgorICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICog ICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRo ZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUK KyAqIGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIElu Yy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBl bmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJl IHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklC VVRPUlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVT IE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQ T1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBP V05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwg SU5DSURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1B R0VTIChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNV QlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z CisgKiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElB QklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKwor LyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuU291cmNl TWFwcGluZ30KKyovCitXZWJJbnNwZWN0b3IuU3R5bGVzU291cmNlTWFwcGluZyA9IGZ1bmN0aW9u KCkKK3sKKyAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JVUkwgPSB7fTsKK30KKworV2ViSW5zcGVj dG9yLlN0eWxlc1NvdXJjZU1hcHBpbmcucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2RlCisgICAgICovCisg ICAgYWRkVUlTb3VyY2VDb2RlOiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCisgICAgeworICAgICAg ICB0aGlzLl91aVNvdXJjZUNvZGVGb3JVUkxbdWlTb3VyY2VDb2RlLnVybF0gPSB1aVNvdXJjZUNv ZGU7CisgICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5zZXRTb3VyY2VNYXBwaW5nKHVpU291 cmNlQ29kZS51cmwsIHRoaXMpOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge1dl Ykluc3BlY3Rvci5SYXdMb2NhdGlvbn0gcmF3TG9jYXRpb24KKyAgICAgKiBAcmV0dXJuIHtXZWJJ bnNwZWN0b3IuVUlMb2NhdGlvbn0KKyAgICAgKi8KKyAgICByYXdMb2NhdGlvblRvVUlMb2NhdGlv bjogZnVuY3Rpb24ocmF3TG9jYXRpb24pCisgICAgeworICAgICAgICB2YXIgbG9jYXRpb24gPSAv KiogQHR5cGUgV2ViSW5zcGVjdG9yLkNTU0xvY2F0aW9uICovIHJhd0xvY2F0aW9uOworICAgICAg ICB2YXIgdWlTb3VyY2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9yVVJMW2xvY2F0aW9uLnVy bF07CisgICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlVJTG9jYXRpb24odWlTb3VyY2VD b2RlLCBsb2NhdGlvbi5saW5lTnVtYmVyLCAwKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAgICAgKiBA cGFyYW0ge251bWJlcn0gbGluZU51bWJlcgorICAgICAqIEBwYXJhbSB7bnVtYmVyfSBjb2x1bW5O dW1iZXIKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuUmF3TG9jYXRpb259CisgICAgICov CisgICAgdWlMb2NhdGlvblRvUmF3TG9jYXRpb246IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgbGlu ZU51bWJlciwgY29sdW1uTnVtYmVyKQorICAgIHsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNw ZWN0b3IuQ1NTTG9jYXRpb24odWlTb3VyY2VDb2RlLmNvbnRlbnRVUkwoKSB8fCAiIiwgbGluZU51 bWJlcik7CisgICAgfSwKKworICAgIHJlc2V0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0 aGlzLl91aVNvdXJjZUNvZGVGb3JVUkwgPSB7fTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLmNzc01v ZGVsLnJlc2V0U291cmNlTWFwcGluZ3MoKTsKKyAgICB9Cit9CisKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1VJU291cmNlQ29k ZVByb3ZpZGVyLmpzCmluZGV4IGNiYmZhZGZmMDUyY2Y3NGFjMmVmNzZhZjEyYTRkMWNkYjIwYjZh MzUuLjEyYzA2MmZmYjZhMmM5NWE5NDQ2ZWE4YWQwNWNmMjJiYTllMTJiZGIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzVUlTb3VyY2VDb2RlUHJv dmlkZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNV SVNvdXJjZUNvZGVQcm92aWRlci5qcwpAQCAtMzAsNTIgKzMwLDE3IEBACiAKIC8qKgogICogQGNv bnN0cnVjdG9yCi0gKiBAaW1wbGVtZW50cyB7V2ViSW5zcGVjdG9yLlNvdXJjZU1hcHBpbmd9CiAg KiBAcGFyYW0ge1dlYkluc3BlY3Rvci5Xb3Jrc3BhY2V9IHdvcmtzcGFjZQogICovCiBXZWJJbnNw ZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIgPSBmdW5jdGlvbih3b3Jrc3BhY2UpCiB7 CiAgICAgdGhpcy5fd29ya3NwYWNlID0gd29ya3NwYWNlOwotICAgIC8qKgotICAgICAqIEB0eXBl IHtBcnJheS48V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZT59Ci0gICAgICovCi0gICAgdGhpcy5f dWlTb3VyY2VDb2RlcyA9IFtdOwotICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclVSTCA9IHt9Owog ICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLlJlc291cmNlQWRkZWQsIHRoaXMu X3Jlc291cmNlQWRkZWQsIHRoaXMpOwogICAgIHRoaXMuX3dvcmtzcGFjZS5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5Xb3Jrc3BhY2UuRXZlbnRzLlByb2plY3RXaWxsUmVzZXQsIHRoaXMu X3Jlc2V0LCB0aGlzKTsKKyAgICB0aGlzLl9zdHlsZXNTb3VyY2VNYXBwaW5nID0gbmV3IFdlYklu c3BlY3Rvci5TdHlsZXNTb3VyY2VNYXBwaW5nKCk7CiB9CiAKIFdlYkluc3BlY3Rvci5TdHlsZXNV SVNvdXJjZUNvZGVQcm92aWRlci5wcm90b3R5cGUgPSB7Ci0gICAgLyoqCi0gICAgICogQHJldHVy biB7QXJyYXkuPFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGU+fQotICAgICAqLwotICAgIHVpU291 cmNlQ29kZXM6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl91aVNvdXJj ZUNvZGVzOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5S YXdMb2NhdGlvbn0gcmF3TG9jYXRpb24KLSAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuVUlM b2NhdGlvbn0KLSAgICAgKi8KLSAgICByYXdMb2NhdGlvblRvVUlMb2NhdGlvbjogZnVuY3Rpb24o cmF3TG9jYXRpb24pCi0gICAgewotICAgICAgICB2YXIgbG9jYXRpb24gPSAvKiogQHR5cGUgV2Vi SW5zcGVjdG9yLkNTU0xvY2F0aW9uICovIHJhd0xvY2F0aW9uOwotICAgICAgICB2YXIgdWlTb3Vy Y2VDb2RlID0gdGhpcy5fdWlTb3VyY2VDb2RlRm9yVVJMW2xvY2F0aW9uLnVybF07Ci0gICAgICAg IHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLlVJTG9jYXRpb24odWlTb3VyY2VDb2RlLCBsb2NhdGlv bi5saW5lTnVtYmVyLCAwKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKLSAgICAgKiBAcGFyYW0ge251bWJl cn0gbGluZU51bWJlcgotICAgICAqIEBwYXJhbSB7bnVtYmVyfSBjb2x1bW5OdW1iZXIKLSAgICAg KiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuUmF3TG9jYXRpb259Ci0gICAgICovCi0gICAgdWlMb2Nh dGlvblRvUmF3TG9jYXRpb246IGZ1bmN0aW9uKHVpU291cmNlQ29kZSwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKQotICAgIHsKLSAgICAgICAgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuQ1NTTG9j YXRpb24odWlTb3VyY2VDb2RlLmNvbnRlbnRVUkwoKSB8fCAiIiwgbGluZU51bWJlcik7Ci0gICAg fSwKLQogICAgIF9wb3B1bGF0ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgZnVuY3Rpb24g cG9wdWxhdGVGcmFtZShmcmFtZSkKQEAgLTEwMCwxNyArNjUsMTMgQEAgV2ViSW5zcGVjdG9yLlN0 eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHJlc291 cmNlLnR5cGUgIT09IFdlYkluc3BlY3Rvci5yZXNvdXJjZVR5cGVzLlN0eWxlc2hlZXQpCiAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVj dG9yLlN0eWxlU291cmNlKHJlc291cmNlKTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2Rlcy5w dXNoKHVpU291cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZUZvclVSTFtyZXNv dXJjZS51cmxdID0gdWlTb3VyY2VDb2RlOwotICAgICAgICBXZWJJbnNwZWN0b3IuY3NzTW9kZWwu c2V0U291cmNlTWFwcGluZyhyZXNvdXJjZS51cmwsIHRoaXMpOworICAgICAgICB0aGlzLl9zdHls ZXNTb3VyY2VNYXBwaW5nLmFkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwogICAgICAgICB0 aGlzLl93b3Jrc3BhY2UucHJvamVjdCgpLmFkZFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOwog ICAgIH0sCiAKICAgICBfcmVzZXQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3Vp U291cmNlQ29kZXMgPSBbXTsKLSAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9yVVJMID0ge307 Ci0gICAgICAgIFdlYkluc3BlY3Rvci5jc3NNb2RlbC5yZXNldFNvdXJjZU1hcHBpbmdzKCk7Ci0g ICAgICAgIHRoaXMuX3BvcHVsYXRlKCk7CisgICAgICAgIHRoaXMuX3N0eWxlc1NvdXJjZU1hcHBp bmcucmVzZXQoKTsKKyAgICAgICAgc2V0VGltZW91dCh0aGlzLl9wb3B1bGF0ZS5iaW5kKHRoaXMp LCAwKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dlYktpdC5xcmMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dl YktpdC5xcmMKaW5kZXggZGQxODI3MjQyNjJmM2UwNWFiNGRlNjgyZmY0ZjNmZTE5NTAxZjk5MC4u ZjE4YzNkZjZkNjhlMjgxMzA3MDNjOGVmM2JiMDUwMzYwNGVmYzYyMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwpAQCAtMTgwLDYgKzE4MCw3IEBA CiAgICAgPGZpbGU+U3RhdHVzQmFyQnV0dG9uLmpzPC9maWxlPgogICAgIDxmaWxlPlN0eWxlU2hl ZXRPdXRsaW5lRGlhbG9nLmpzPC9maWxlPgogICAgIDxmaWxlPlN0eWxlU291cmNlLmpzPC9maWxl PgorICAgIDxmaWxlPlN0eWxlc1NvdXJjZU1hcHBpbmcuanM8L2ZpbGU+CiAgICAgPGZpbGU+U3R5 bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIuanM8L2ZpbGU+CiAgICAgPGZpbGU+U3R5bGVzU2lkZWJh clBhbmUuanM8L2ZpbGU+CiAgICAgPGZpbGU+VGFiYmVkRWRpdG9yQ29udGFpbmVyLmpzPC9maWxl PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0 b3IuaHRtbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0 bWwKaW5kZXggZDdlODUzNjg5ZGZhYjNhYTdkODFiNmY1MWNhMzg4OGM2ODBmNDdjZS4uMjJjNWIz MTRkZGE3MjE4MThmYWYzMTZkMTFkNjg3MmRiMDkzOGIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xNjEsNiArMTYxLDcg QEAgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTbmlw cGV0U3RvcmFnZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3Jp cHQiIHNyYz0iU2NyaXB0U25pcHBldE1vZGVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJQcm9ncmVzc0Jhci5qcyI+PC9zY3JpcHQ+CisgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU3R5bGVzU291cmNlTWFwcGluZy5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU3R5 bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0i dGV4dC9qYXZhc2NyaXB0IiBzcmM9IlN0eWxlU291cmNlLmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJFbGVtZW50c1BhbmVsRGVzY3JpcHRvci5q cyI+PC9zY3JpcHQ+Cg==