94689 2012-08-22 03:59:08 -0700 Web Inspector: [WebGL] Support the communication protocol from the injected script 2012-08-22 08:54:40 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 88973 0 aandrey aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 701752 0 aandrey 2012-08-22 03:59:08 -0700 Support the protocol from the injected script. The backend code was committed as of https://bugs.webkit.org/show_bug.cgi?id=88973 701756 1 159897 aandrey 2012-08-22 04:02:27 -0700 Created attachment 159897 Patch 701759 2 159898 aandrey 2012-08-22 04:06:17 -0700 Created attachment 159898 Patch 701975 3 159898 webkit.review.bot 2012-08-22 08:54:36 -0700 Comment on attachment 159898 Patch Clearing flags on attachment: 159898 Committed r126308: <http://trac.webkit.org/changeset/126308> 701976 4 webkit.review.bot 2012-08-22 08:54:40 -0700 All reviewed patches have been landed. Closing bug. 159897 2012-08-22 04:02:27 -0700 2012-08-22 04:06:12 -0700 Patch bug-94689-20120822150225.patch text/plain 7520 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MzZDY3MTAzYzJhZDkx ZWMxMTQ1M2IxOWRiM2QyOGJhYWFiMWZiZi4uZDFjNmZlNmZhNTMxNTVkODNlYjJlYTY4ZWVlNDM0 Y2M5OTllY2JjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTA4LTIyICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJHTF0gU3VwcG9ydCB0aGUgY29tbXVuaWNhdGlvbiBwcm90b2NvbCBmcm9tIHRoZSBp bmplY3RlZCBzY3JpcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk0Njg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3VwcG9ydCB0aGUgV2ViR0wgY29tbXVuaWNhdGlvbiBwcm90b2NvbCBmcm9tIHRoZSBp bmplY3RlZCBzY3JpcHQgbW9kdWxlLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0V2ViR0xNb2R1bGVTb3VyY2UuanM6CisgICAgICAgICguKToKKworMjAxMi0wOC0yMiAgQW5k cmV5IEFkYWlraW4gIDxhYW5kcmV5QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBbV2ViR0xdIEdlbmVyaWMgZnJhbWV3b3JrIGRyYWZ0IGZvciB0cmFja2luZyBXZWJHTCBy ZXNvdXJjZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkwNTk3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdFdlYkdMTW9kdWxlU291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuanMKaW5kZXggOTc3ODcyNzY3NjUxZmRkOTMyOGQw YjMwYWI4Mjk3NGFhNDU5ZDFlNy4uZTI5ZDJiOTRkMGNiMzk1OGI0MmZkY2FhYTM3ZDdlMTJiMTJh OTllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 V2ViR0xNb2R1bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuanMKQEAgLTEzOSw2ICsxMzksNjQgQEAgQ2FsbC5w cm90b3R5cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1JlcGxheWFi bGVSZXNvdXJjZX0gdGhpc09iamVjdAorICogQHBhcmFtIHtzdHJpbmd9IGZ1bmN0aW9uTmFtZQor ICogQHBhcmFtIHtBcnJheS48UmVwbGF5YWJsZVJlc291cmNlfCo+fSBhcmdzCisgKiBAcGFyYW0g e1JlcGxheWFibGVSZXNvdXJjZXwqfSByZXN1bHQKKyAqLworZnVuY3Rpb24gUmVwbGF5YWJsZUNh bGwodGhpc09iamVjdCwgZnVuY3Rpb25OYW1lLCBhcmdzLCByZXN1bHQpCit7CisgICAgdGhpcy5f dGhpc09iamVjdCA9IHRoaXNPYmplY3Q7CisgICAgdGhpcy5fZnVuY3Rpb25OYW1lID0gZnVuY3Rp b25OYW1lOworICAgIHRoaXMuX2FyZ3MgPSBhcmdzOworICAgIHRoaXMuX3Jlc3VsdCA9IHJlc3Vs dDsKK30KKworUmVwbGF5YWJsZUNhbGwucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBy ZXR1cm4ge1JlcGxheWFibGVSZXNvdXJjZX0KKyAgICAgKi8KKyAgICByZXNvdXJjZTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RoaXNPYmplY3Q7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICBmdW5jdGlvbk5h bWU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9mdW5jdGlvbk5hbWU7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge0FycmF5LjxSZXBsYXlhYmxlUmVz b3VyY2V8Kj59CisgICAgICovCisgICAgYXJnczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuX2FyZ3M7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge1Jl cGxheWFibGVSZXNvdXJjZXwqfQorICAgICAqLworICAgIHJlc3VsdDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc3VsdDsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKKyAgICAgKiBAcmV0dXJuIHtDYWxsfQorICAgICAqLwor ICAgIHJlcGxheTogZnVuY3Rpb24oY2FjaGUpCisgICAgeworICAgICAgICAvLyBGSVhNRTogRG8g dGhlIHJlcGxheS4KKyAgICB9Cit9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0g e09iamVjdH0gd3JhcHBlZE9iamVjdAogICovCiBmdW5jdGlvbiBSZXNvdXJjZSh3cmFwcGVkT2Jq ZWN0KQpAQCAtMjI2LDYgKzI4NCwyNiBAQCBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKIC8qKgog ICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1Jlc291cmNlfSBvcmlnaW5hbFJlc291cmNlCisg KiBAcGFyYW0ge09iamVjdH0gZGF0YQorICovCitmdW5jdGlvbiBSZXBsYXlhYmxlUmVzb3VyY2Uo b3JpZ2luYWxSZXNvdXJjZSwgZGF0YSkKK3sKK30KKworUmVwbGF5YWJsZVJlc291cmNlLnByb3Rv dHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBy ZXR1cm4ge1Jlc291cmNlfQorICAgICAqLworICAgIHJlcGxheTogZnVuY3Rpb24oY2FjaGUpCisg ICAgeworICAgICAgICAvLyBGSVhNRTogRG8gdGhlIHJlcGxheS4KKyAgICB9Cit9CisKKy8qKgor ICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7UmVzb3VyY2V9CiAgKiBAcGFyYW0ge1dlYkdM UmVuZGVyaW5nQ29udGV4dH0gZ2xDb250ZXh0CiAgKi8KQEAgLTM1Myw4ICs0MzEsOCBAQCBXZWJH TFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5XcmFwRnVuY3Rpb24ucHJvdG90eXBlID0gewogICov CiBmdW5jdGlvbiBUcmFjZUxvZygpCiB7Ci0gICAgdGhpcy5fY2FsbHMgPSBbXTsKLSAgICB0aGlz Ll9yZXNvdXJjZUNhY2hlID0gbmV3IENhY2hlKCk7CisgICAgdGhpcy5fcmVwbGF5YWJsZUNhbGxz ID0gW107CisgICAgdGhpcy5fcmVwbGF5YWJsZXNDYWNoZSA9IG5ldyBDYWNoZSgpOwogfQogCiBU cmFjZUxvZy5wcm90b3R5cGUgPSB7CkBAIC0zNjMsNyArNDQxLDE1IEBAIFRyYWNlTG9nLnByb3Rv dHlwZSA9IHsKICAgICAgKi8KICAgICBzaXplOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fY2FsbHMubGVuZ3RoOworICAgICAgICByZXR1cm4gdGhpcy5fcmVwbGF5YWJs ZUNhbGxzLmxlbmd0aDsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7QXJyYXku PFJlcGxheWFibGVDYWxsPn0KKyAgICAgKi8KKyAgICByZXBsYXlhYmxlQ2FsbHM6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXBsYXlhYmxlQ2FsbHM7CiAgICAgfSwK IAogICAgIC8qKgpAQCAtMzc5LDggKzQ2NSw2OCBAQCBUcmFjZUxvZy5wcm90b3R5cGUgPSB7CiAg ICAgICovCiAgICAgYWRkQ2FsbDogZnVuY3Rpb24oY2FsbCkKICAgICB7Ci0gICAgICAgIC8vIEZJ WE1FOiBDbG9uZSBjYWxsIGFuZCBwdXNoIHRoZSBjbG9uZS4KLSAgICAgICAgdGhpcy5fY2FsbHMu cHVzaChjYWxsKTsKKyAgICAgICAgLy8gRklYTUU6IENvbnZlcnQgdGhlIGNhbGwgdG8gYSBSZXBs YXlhYmxlQ2FsbCBhbmQgcHVzaCBpdC4KKyAgICB9Cit9CisKKy8qKgorICogQGNvbnN0cnVjdG9y CisgKiBAcGFyYW0ge1RyYWNlTG9nfSB0cmFjZUxvZworICovCitmdW5jdGlvbiBUcmFjZUxvZ1Bs YXllcih0cmFjZUxvZykKK3sKKyAgICB0aGlzLl90cmFjZUxvZyA9IHRyYWNlTG9nOworICAgIHRo aXMuX25leHRSZXBsYXlTdGVwID0gMDsKKyAgICB0aGlzLl9yZXBsYXlXb3JsZENhY2hlID0gbmV3 IENhY2hlKCk7Cit9CisKK1RyYWNlTG9nUGxheWVyLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAg ICAgKiBAcmV0dXJuIHtUcmFjZUxvZ30KKyAgICAgKi8KKyAgICB0cmFjZUxvZzogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RyYWNlTG9nOworICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcmV0dXJuIHtudW1iZXJ9CisgICAgICovCisgICAgbmV4dFJlcGxheVN0ZXA6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9uZXh0UmVwbGF5U3RlcDsK KyAgICB9LAorCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1F OiBQcmV2ZW50IG1lbW9yeSBsZWFrczogZGV0YWNoIGFuZCBkZWxldGUgYWxsIG9sZCByZXNvdXJj ZXMgT1IgcmV1c2UgdGhlbSBPUiBjcmVhdGUgYSBuZXcgcmVwbGF5IGNhbnZhcyBldmVyeSB0aW1l LgorICAgICAgICB0aGlzLl9uZXh0UmVwbGF5U3RlcCA9IDA7CisgICAgICAgIHRoaXMuX3JlcGxh eVdvcmxkQ2FjaGUucmVzZXQoKTsKKyAgICB9LAorCisgICAgc3RlcDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdGhpcy5zdGVwVG8odGhpcy5fbmV4dFJlcGxheVN0ZXApOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gc3RlcE51bQorICAgICAqLworICAgIHN0 ZXBUbzogZnVuY3Rpb24oc3RlcE51bSkKKyAgICB7CisgICAgICAgIHN0ZXBOdW0gPSBNYXRoLm1p bihzdGVwTnVtLCB0aGlzLl90cmFjZUxvZy5zaXplKCkgLSAxKTsKKyAgICAgICAgY29uc29sZS5h c3NlcnQoc3RlcE51bSA+PSAwKTsKKyAgICAgICAgaWYgKHRoaXMuX25leHRSZXBsYXlTdGVwID4g c3RlcE51bSkKKyAgICAgICAgICAgIHRoaXMucmVzZXQoKTsKKyAgICAgICAgLy8gRklYTUU6IFJl cGxheSBhbGwgdGhlIGNhY2hlZCByZXNvdXJjZXMgZmlyc3QgdG8gd2FybS11cC4KKyAgICAgICAg dmFyIHJlcGxheWFibGVDYWxscyA9IHRoaXMuX3RyYWNlTG9nLnJlcGxheWFibGVDYWxscygpOwor ICAgICAgICB3aGlsZSAodGhpcy5fbmV4dFJlcGxheVN0ZXAgPD0gc3RlcE51bSkKKyAgICAgICAg ICAgIHJlcGxheWFibGVDYWxsc1t0aGlzLl9uZXh0UmVwbGF5U3RlcCsrXS5yZXBsYXkodGhpcy5f cmVwbGF5V29ybGRDYWNoZSk7ICAgICAgICAgICAgCisgICAgfSwKKworICAgIHJlcGxheTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5zdGVwVG8odGhpcy5fdHJhY2VMb2cuc2l6ZSgp IC0gMSk7CiAgICAgfQogfQogCkBAIC00OTEsNiArNjM3LDEwIEBAIFJlc291cmNlVHJhY2tpbmdN YW5hZ2VyLnByb3RvdHlwZSA9IHsKIHZhciBJbmplY3RlZFNjcmlwdCA9IGZ1bmN0aW9uKCkKIHsK ICAgICB0aGlzLl9tYW5hZ2VyID0gbmV3IFJlc291cmNlVHJhY2tpbmdNYW5hZ2VyKCk7CisgICAg dGhpcy5fbGFzdFRyYWNlTG9nSWQgPSAwOworICAgIHRoaXMuX3RyYWNlTG9ncyA9IHt9OworICAg IHRoaXMuX3RyYWNlTG9nUGxheWVyID0gbnVsbDsKKyAgICB0aGlzLl9yZXBsYXlDb250ZXh0ID0g bnVsbDsKIH0KIAogSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewpAQCAtNTA4LDcgKzY1OCw2 OCBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAKICAgICBjYXB0dXJlRnJhbWU6IGZ1 bmN0aW9uKCkKICAgICB7CisgICAgICAgIHZhciBpZCA9IHRoaXMuX21ha2VUcmFjZUxvZ0lkKCk7 CiAgICAgICAgIHRoaXMuX21hbmFnZXIuY2FwdHVyZUZyYW1lKCk7CisgICAgICAgIHRoaXMuX3Ry YWNlTG9nc1tpZF0gPSB0aGlzLl9tYW5hZ2VyLmxhc3RUcmFjZUxvZygpOworICAgICAgICByZXR1 cm4gaWQ7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAg ICAqLworICAgIGRyb3BUcmFjZUxvZzogZnVuY3Rpb24oaWQpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fdHJhY2VMb2dQbGF5ZXIgJiYgdGhpcy5fdHJhY2VMb2dQbGF5ZXIudHJhY2VMb2coKSA9 PT0gdGhpcy5fdHJhY2VMb2dzW2lkXSkKKyAgICAgICAgICAgIHRoaXMuX3RyYWNlTG9nUGxheWVy ID0gbnVsbDsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3RyYWNlTG9nc1tpZF07CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAgICAqIEByZXR1cm4ge09iamVj dHxzdHJpbmd9CisgICAgICovCisgICAgdHJhY2VMb2c6IGZ1bmN0aW9uKGlkKQorICAgIHsKKyAg ICAgICAgdmFyIHRyYWNlTG9nID0gdGhpcy5fdHJhY2VMb2dzW2lkXTsKKyAgICAgICAgaWYgKCF0 cmFjZUxvZykKKyAgICAgICAgICAgIHJldHVybiAiRXJyb3I6IFRyYWNlIGxvZyB3aXRoIHRoaXMg SUQgbm90IGZvdW5kLiI7CisgICAgICAgIHZhciByZXN1bHQgPSB7CisgICAgICAgICAgICBpZDog aWQsCisgICAgICAgICAgICBjYWxsczogW10KKyAgICAgICAgfTsKKyAgICAgICAgdmFyIGNhbGxz ID0gdHJhY2VMb2cucmVwbGF5YWJsZUNhbGxzKCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwLCBu ID0gY2FsbHMubGVuZ3RoOyBpIDwgbjsgKytpKSB7CisgICAgICAgICAgICB2YXIgY2FsbCA9IGNh bGxzW2ldOworICAgICAgICAgICAgcmVzdWx0LmNhbGxzLnB1c2goeworICAgICAgICAgICAgICAg IGZ1bmN0aW9uTmFtZTogY2FsbC5mdW5jdGlvbk5hbWUoKSArICIoIiArIGNhbGwuYXJncygpLmpv aW4oIiwgIikgKyAiKSA9PiAiICsgY2FsbC5yZXN1bHQoKQorICAgICAgICAgICAgfSk7CisgICAg ICAgIH0KKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtzdHJpbmd9IGlkCisgICAgICogQHBhcmFtIHtudW1iZXJ9IHN0ZXBObworICAgICAq IEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICByZXBsYXlUcmFjZUxvZzogZnVuY3Rpb24o aWQsIHN0ZXBObykKKyAgICB7CisgICAgICAgIHZhciB0cmFjZUxvZyA9IHRoaXMuX3RyYWNlTG9n c1tpZF07CisgICAgICAgIGlmICghdHJhY2VMb2cpCisgICAgICAgICAgICByZXR1cm4gIiI7Cisg ICAgICAgIGlmICghdGhpcy5fdHJhY2VMb2dQbGF5ZXIgfHwgdGhpcy5fdHJhY2VMb2dQbGF5ZXIu dHJhY2VMb2coKSAhPT0gdHJhY2VMb2cpCisgICAgICAgICAgICB0aGlzLl90cmFjZUxvZ1BsYXll ciA9IG5ldyBUcmFjZUxvZ1BsYXllcih0cmFjZUxvZyk7CisgICAgICAgIHRoaXMuX3RyYWNlTG9n UGxheWVyLnN0ZXBUbyhzdGVwTm8pOworICAgICAgICAvLyBSZXR1cm4gY3VycmVudCBzY3JlZW5z aG90LgorICAgICAgICByZXR1cm4gdGhpcy5fcmVwbGF5Q29udGV4dC5jYW52YXMudG9EYXRhVVJM KCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8K KyAgICBfbWFrZVRyYWNlTG9nSWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiAi e1wiaW5qZWN0ZWRTY3JpcHRJZFwiOiIgKyBpbmplY3RlZFNjcmlwdElkICsgIixcInRyYWNlTG9n SWRcIjoiICsgKCsrdGhpcy5fbGFzdFRyYWNlTG9nSWQpICsgIn0iOwogICAgIH0KIH0KIAo= 159898 2012-08-22 04:06:17 -0700 2012-08-22 08:54:36 -0700 Patch bug-94689-20120822150615.patch text/plain 7693 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2MjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MzZDY3MTAzYzJhZDkx ZWMxMTQ1M2IxOWRiM2QyOGJhYWFiMWZiZi4uZDFjNmZlNmZhNTMxNTVkODNlYjJlYTY4ZWVlNDM0 Y2M5OTllY2JjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTA4LTIyICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJHTF0gU3VwcG9ydCB0aGUgY29tbXVuaWNhdGlvbiBwcm90b2NvbCBmcm9tIHRoZSBp bmplY3RlZCBzY3JpcHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk0Njg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3VwcG9ydCB0aGUgV2ViR0wgY29tbXVuaWNhdGlvbiBwcm90b2NvbCBmcm9tIHRoZSBp bmplY3RlZCBzY3JpcHQgbW9kdWxlLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0V2ViR0xNb2R1bGVTb3VyY2UuanM6CisgICAgICAgICguKToKKworMjAxMi0wOC0yMiAgQW5k cmV5IEFkYWlraW4gIDxhYW5kcmV5QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBbV2ViR0xdIEdlbmVyaWMgZnJhbWV3b3JrIGRyYWZ0IGZvciB0cmFja2luZyBXZWJHTCBy ZXNvdXJjZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkwNTk3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdFdlYkdMTW9kdWxlU291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuanMKaW5kZXggOTc3ODcyNzY3NjUxZmRkOTMyOGQw YjMwYWI4Mjk3NGFhNDU5ZDFlNy4uMTM2ZThjODNhYmIyYWIxNjUwNTE5ZjdhN2RkMTk5MjkyYjcz MmQ5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0 V2ViR0xNb2R1bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuanMKQEAgLTEzOSw2ICsxMzksNjQgQEAgQ2FsbC5w cm90b3R5cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1JlcGxheWFi bGVSZXNvdXJjZX0gdGhpc09iamVjdAorICogQHBhcmFtIHtzdHJpbmd9IGZ1bmN0aW9uTmFtZQor ICogQHBhcmFtIHtBcnJheS48UmVwbGF5YWJsZVJlc291cmNlfCo+fSBhcmdzCisgKiBAcGFyYW0g e1JlcGxheWFibGVSZXNvdXJjZXwqfSByZXN1bHQKKyAqLworZnVuY3Rpb24gUmVwbGF5YWJsZUNh bGwodGhpc09iamVjdCwgZnVuY3Rpb25OYW1lLCBhcmdzLCByZXN1bHQpCit7CisgICAgdGhpcy5f dGhpc09iamVjdCA9IHRoaXNPYmplY3Q7CisgICAgdGhpcy5fZnVuY3Rpb25OYW1lID0gZnVuY3Rp b25OYW1lOworICAgIHRoaXMuX2FyZ3MgPSBhcmdzOworICAgIHRoaXMuX3Jlc3VsdCA9IHJlc3Vs dDsKK30KKworUmVwbGF5YWJsZUNhbGwucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBy ZXR1cm4ge1JlcGxheWFibGVSZXNvdXJjZX0KKyAgICAgKi8KKyAgICByZXNvdXJjZTogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RoaXNPYmplY3Q7CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICBmdW5jdGlvbk5h bWU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9mdW5jdGlvbk5hbWU7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge0FycmF5LjxSZXBsYXlhYmxlUmVz b3VyY2V8Kj59CisgICAgICovCisgICAgYXJnczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg cmV0dXJuIHRoaXMuX2FyZ3M7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge1Jl cGxheWFibGVSZXNvdXJjZXwqfQorICAgICAqLworICAgIHJlc3VsdDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc3VsdDsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKKyAgICAgKiBAcmV0dXJuIHtDYWxsfQorICAgICAqLwor ICAgIHJlcGxheTogZnVuY3Rpb24oY2FjaGUpCisgICAgeworICAgICAgICAvLyBGSVhNRTogRG8g dGhlIHJlcGxheS4KKyAgICB9Cit9CisKKy8qKgorICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0g e09iamVjdH0gd3JhcHBlZE9iamVjdAogICovCiBmdW5jdGlvbiBSZXNvdXJjZSh3cmFwcGVkT2Jq ZWN0KQpAQCAtMjI2LDYgKzI4NCwyNiBAQCBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKIC8qKgog ICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge1Jlc291cmNlfSBvcmlnaW5hbFJlc291cmNlCisg KiBAcGFyYW0ge09iamVjdH0gZGF0YQorICovCitmdW5jdGlvbiBSZXBsYXlhYmxlUmVzb3VyY2Uo b3JpZ2luYWxSZXNvdXJjZSwgZGF0YSkKK3sKK30KKworUmVwbGF5YWJsZVJlc291cmNlLnByb3Rv dHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBy ZXR1cm4ge1Jlc291cmNlfQorICAgICAqLworICAgIHJlcGxheTogZnVuY3Rpb24oY2FjaGUpCisg ICAgeworICAgICAgICAvLyBGSVhNRTogRG8gdGhlIHJlcGxheS4KKyAgICB9Cit9CisKKy8qKgor ICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7UmVzb3VyY2V9CiAgKiBAcGFyYW0ge1dlYkdM UmVuZGVyaW5nQ29udGV4dH0gZ2xDb250ZXh0CiAgKi8KQEAgLTM1Myw4ICs0MzEsOCBAQCBXZWJH TFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5XcmFwRnVuY3Rpb24ucHJvdG90eXBlID0gewogICov CiBmdW5jdGlvbiBUcmFjZUxvZygpCiB7Ci0gICAgdGhpcy5fY2FsbHMgPSBbXTsKLSAgICB0aGlz Ll9yZXNvdXJjZUNhY2hlID0gbmV3IENhY2hlKCk7CisgICAgdGhpcy5fcmVwbGF5YWJsZUNhbGxz ID0gW107CisgICAgdGhpcy5fcmVwbGF5YWJsZXNDYWNoZSA9IG5ldyBDYWNoZSgpOwogfQogCiBU cmFjZUxvZy5wcm90b3R5cGUgPSB7CkBAIC0zNjMsNyArNDQxLDE1IEBAIFRyYWNlTG9nLnByb3Rv dHlwZSA9IHsKICAgICAgKi8KICAgICBzaXplOiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fY2FsbHMubGVuZ3RoOworICAgICAgICByZXR1cm4gdGhpcy5fcmVwbGF5YWJs ZUNhbGxzLmxlbmd0aDsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7QXJyYXku PFJlcGxheWFibGVDYWxsPn0KKyAgICAgKi8KKyAgICByZXBsYXlhYmxlQ2FsbHM6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9yZXBsYXlhYmxlQ2FsbHM7CiAgICAgfSwK IAogICAgIC8qKgpAQCAtMzc5LDggKzQ2NSw2OCBAQCBUcmFjZUxvZy5wcm90b3R5cGUgPSB7CiAg ICAgICovCiAgICAgYWRkQ2FsbDogZnVuY3Rpb24oY2FsbCkKICAgICB7Ci0gICAgICAgIC8vIEZJ WE1FOiBDbG9uZSBjYWxsIGFuZCBwdXNoIHRoZSBjbG9uZS4KLSAgICAgICAgdGhpcy5fY2FsbHMu cHVzaChjYWxsKTsKKyAgICAgICAgLy8gRklYTUU6IENvbnZlcnQgdGhlIGNhbGwgdG8gYSBSZXBs YXlhYmxlQ2FsbCBhbmQgcHVzaCBpdC4KKyAgICB9Cit9CisKKy8qKgorICogQGNvbnN0cnVjdG9y CisgKiBAcGFyYW0ge1RyYWNlTG9nfSB0cmFjZUxvZworICovCitmdW5jdGlvbiBUcmFjZUxvZ1Bs YXllcih0cmFjZUxvZykKK3sKKyAgICB0aGlzLl90cmFjZUxvZyA9IHRyYWNlTG9nOworICAgIHRo aXMuX25leHRSZXBsYXlTdGVwID0gMDsKKyAgICB0aGlzLl9yZXBsYXlXb3JsZENhY2hlID0gbmV3 IENhY2hlKCk7Cit9CisKK1RyYWNlTG9nUGxheWVyLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAg ICAgKiBAcmV0dXJuIHtUcmFjZUxvZ30KKyAgICAgKi8KKyAgICB0cmFjZUxvZzogZnVuY3Rpb24o KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3RyYWNlTG9nOworICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcmV0dXJuIHtudW1iZXJ9CisgICAgICovCisgICAgbmV4dFJlcGxheVN0ZXA6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9uZXh0UmVwbGF5U3RlcDsK KyAgICB9LAorCisgICAgcmVzZXQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIEZJWE1F OiBQcmV2ZW50IG1lbW9yeSBsZWFrczogZGV0YWNoIGFuZCBkZWxldGUgYWxsIG9sZCByZXNvdXJj ZXMgT1IgcmV1c2UgdGhlbSBPUiBjcmVhdGUgYSBuZXcgcmVwbGF5IGNhbnZhcyBldmVyeSB0aW1l LgorICAgICAgICB0aGlzLl9uZXh0UmVwbGF5U3RlcCA9IDA7CisgICAgICAgIHRoaXMuX3JlcGxh eVdvcmxkQ2FjaGUucmVzZXQoKTsKKyAgICB9LAorCisgICAgc3RlcDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgdGhpcy5zdGVwVG8odGhpcy5fbmV4dFJlcGxheVN0ZXApOworICAgIH0sCisK KyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gc3RlcE51bQorICAgICAqLworICAgIHN0 ZXBUbzogZnVuY3Rpb24oc3RlcE51bSkKKyAgICB7CisgICAgICAgIHN0ZXBOdW0gPSBNYXRoLm1p bihzdGVwTnVtLCB0aGlzLl90cmFjZUxvZy5zaXplKCkgLSAxKTsKKyAgICAgICAgY29uc29sZS5h c3NlcnQoc3RlcE51bSA+PSAwKTsKKyAgICAgICAgaWYgKHRoaXMuX25leHRSZXBsYXlTdGVwID4g c3RlcE51bSkKKyAgICAgICAgICAgIHRoaXMucmVzZXQoKTsKKyAgICAgICAgLy8gRklYTUU6IFJl cGxheSBhbGwgdGhlIGNhY2hlZCByZXNvdXJjZXMgZmlyc3QgdG8gd2FybS11cC4KKyAgICAgICAg dmFyIHJlcGxheWFibGVDYWxscyA9IHRoaXMuX3RyYWNlTG9nLnJlcGxheWFibGVDYWxscygpOwor ICAgICAgICB3aGlsZSAodGhpcy5fbmV4dFJlcGxheVN0ZXAgPD0gc3RlcE51bSkKKyAgICAgICAg ICAgIHJlcGxheWFibGVDYWxsc1t0aGlzLl9uZXh0UmVwbGF5U3RlcCsrXS5yZXBsYXkodGhpcy5f cmVwbGF5V29ybGRDYWNoZSk7ICAgICAgICAgICAgCisgICAgfSwKKworICAgIHJlcGxheTogZnVu Y3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5zdGVwVG8odGhpcy5fdHJhY2VMb2cuc2l6ZSgp IC0gMSk7CiAgICAgfQogfQogCkBAIC00OTEsNiArNjM3LDEwIEBAIFJlc291cmNlVHJhY2tpbmdN YW5hZ2VyLnByb3RvdHlwZSA9IHsKIHZhciBJbmplY3RlZFNjcmlwdCA9IGZ1bmN0aW9uKCkKIHsK ICAgICB0aGlzLl9tYW5hZ2VyID0gbmV3IFJlc291cmNlVHJhY2tpbmdNYW5hZ2VyKCk7CisgICAg dGhpcy5fbGFzdFRyYWNlTG9nSWQgPSAwOworICAgIHRoaXMuX3RyYWNlTG9ncyA9IHt9OworICAg IHRoaXMuX3RyYWNlTG9nUGxheWVyID0gbnVsbDsKKyAgICB0aGlzLl9yZXBsYXlDb250ZXh0ID0g bnVsbDsKIH0KIAogSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewpAQCAtNTA4LDcgKzY1OCw3 MiBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAKICAgICBjYXB0dXJlRnJhbWU6IGZ1 bmN0aW9uKCkKICAgICB7CisgICAgICAgIHZhciBpZCA9IHRoaXMuX21ha2VUcmFjZUxvZ0lkKCk7 CiAgICAgICAgIHRoaXMuX21hbmFnZXIuY2FwdHVyZUZyYW1lKCk7CisgICAgICAgIHRoaXMuX3Ry YWNlTG9nc1tpZF0gPSB0aGlzLl9tYW5hZ2VyLmxhc3RUcmFjZUxvZygpOworICAgICAgICByZXR1 cm4gaWQ7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAg ICAqLworICAgIGRyb3BUcmFjZUxvZzogZnVuY3Rpb24oaWQpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fdHJhY2VMb2dQbGF5ZXIgJiYgdGhpcy5fdHJhY2VMb2dQbGF5ZXIudHJhY2VMb2coKSA9 PT0gdGhpcy5fdHJhY2VMb2dzW2lkXSkKKyAgICAgICAgICAgIHRoaXMuX3RyYWNlTG9nUGxheWVy ID0gbnVsbDsKKyAgICAgICAgZGVsZXRlIHRoaXMuX3RyYWNlTG9nc1tpZF07CisgICAgfSwKKwor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBpZAorICAgICAqIEByZXR1cm4ge09iamVj dHxzdHJpbmd9CisgICAgICovCisgICAgdHJhY2VMb2c6IGZ1bmN0aW9uKGlkKQorICAgIHsKKyAg ICAgICAgdmFyIHRyYWNlTG9nID0gdGhpcy5fdHJhY2VMb2dzW2lkXTsKKyAgICAgICAgaWYgKCF0 cmFjZUxvZykKKyAgICAgICAgICAgIHJldHVybiAiRXJyb3I6IFRyYWNlIGxvZyB3aXRoIHRoaXMg SUQgbm90IGZvdW5kLiI7CisgICAgICAgIHZhciByZXN1bHQgPSB7CisgICAgICAgICAgICBpZDog aWQsCisgICAgICAgICAgICBjYWxsczogW10KKyAgICAgICAgfTsKKyAgICAgICAgdmFyIGNhbGxz ID0gdHJhY2VMb2cucmVwbGF5YWJsZUNhbGxzKCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwLCBu ID0gY2FsbHMubGVuZ3RoOyBpIDwgbjsgKytpKSB7CisgICAgICAgICAgICB2YXIgY2FsbCA9IGNh bGxzW2ldOworICAgICAgICAgICAgcmVzdWx0LmNhbGxzLnB1c2goeworICAgICAgICAgICAgICAg IGZ1bmN0aW9uTmFtZTogY2FsbC5mdW5jdGlvbk5hbWUoKSArICIoIiArIGNhbGwuYXJncygpLmpv aW4oIiwgIikgKyAiKSA9PiAiICsgY2FsbC5yZXN1bHQoKQorICAgICAgICAgICAgfSk7CisgICAg ICAgIH0KKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9LAorCisgICAgLyoqCisgICAgICog QHBhcmFtIHtzdHJpbmd9IGlkCisgICAgICogQHBhcmFtIHtudW1iZXJ9IHN0ZXBObworICAgICAq IEByZXR1cm4ge3N0cmluZ30KKyAgICAgKi8KKyAgICByZXBsYXlUcmFjZUxvZzogZnVuY3Rpb24o aWQsIHN0ZXBObykKKyAgICB7CisgICAgICAgIHZhciB0cmFjZUxvZyA9IHRoaXMuX3RyYWNlTG9n c1tpZF07CisgICAgICAgIGlmICghdHJhY2VMb2cpCisgICAgICAgICAgICByZXR1cm4gIiI7Cisg ICAgICAgIGlmICghdGhpcy5fdHJhY2VMb2dQbGF5ZXIgfHwgdGhpcy5fdHJhY2VMb2dQbGF5ZXIu dHJhY2VMb2coKSAhPT0gdHJhY2VMb2cpCisgICAgICAgICAgICB0aGlzLl90cmFjZUxvZ1BsYXll ciA9IG5ldyBUcmFjZUxvZ1BsYXllcih0cmFjZUxvZyk7CisgICAgICAgIHRoaXMuX3RyYWNlTG9n UGxheWVyLnN0ZXBUbyhzdGVwTm8pOworICAgICAgICBpZiAoIXRoaXMuX3JlcGxheUNvbnRleHQp IHsKKyAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoIkFTU0VSVF9OT1RfUkVBQ0hFRDogcmVwbGF5 VHJhY2VMb2cgZmFpbGVkIHRvIGNyZWF0ZSBhIHJlcGxheSBjYW52YXM/ISIpOworICAgICAgICAg ICAgcmV0dXJuICIiOworICAgICAgICB9CisgICAgICAgIC8vIFJldHVybiBjdXJyZW50IHNjcmVl bnNob3QuCisgICAgICAgIHJldHVybiB0aGlzLl9yZXBsYXlDb250ZXh0LmNhbnZhcy50b0RhdGFV UkwoKTsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7c3RyaW5nfQorICAgICAq LworICAgIF9tYWtlVHJhY2VMb2dJZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJu ICJ7XCJpbmplY3RlZFNjcmlwdElkXCI6IiArIGluamVjdGVkU2NyaXB0SWQgKyAiLFwidHJhY2VM b2dJZFwiOiIgKyAoKyt0aGlzLl9sYXN0VHJhY2VMb2dJZCkgKyAifSI7CiAgICAgfQogfQogCg==