97776 2012-09-27 05:48:00 -0700 Web Inspector: [Canvas] log property setters too along with function calls 2012-09-28 05:09:00 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 aandrey aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 729447 0 aandrey 2012-09-27 05:48:00 -0700 Trace logs should also contain property setter calls. Patch to follow. 729448 1 165981 aandrey 2012-09-27 05:51:00 -0700 Created attachment 165981 Patch 730522 2 165981 webkit.review.bot 2012-09-28 05:08:57 -0700 Comment on attachment 165981 Patch Clearing flags on attachment: 165981 Committed r129877: <http://trac.webkit.org/changeset/129877> 730523 3 webkit.review.bot 2012-09-28 05:09:00 -0700 All reviewed patches have been landed. Closing bug. 165981 2012-09-27 05:51:00 -0700 2012-09-28 05:08:57 -0700 Patch bug-97776-20120927165017.patch text/plain 9702 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdlOWZmMGNmMzU5N2M1 ZWQwYjU2ODdmNDg4NDM5NjU0ODc1NmJjMi4uY2M1MmM4MmRmM2Q0YTU1YjdjZDJlZDJhMWZhYTEw YTVkNjlmMjUxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA5LTI3ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIGxvZyBwcm9wZXJ0eSBzZXR0ZXJzIHRvbyBhbG9uZyB3aXRoIGZ1bmN0aW9u IGNhbGxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 Nzc3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRy YWNlIGxvZ3Mgc2hvdWxkIGFsc28gY29udGFpbiBwcm9wZXJ0eSBzZXR0ZXIgY2FsbHMuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanM6Cisg ICAgICAgICguKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxlVmlldy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUuX3Nob3dUcmFjZUxvZyk6CisK IDIwMTItMDktMjYgIEFuZHJleSBBZGFpa2luICA8YWFuZHJleUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogW1RleHRFZGl0b3JdIGZpeCB0YWIgdW5pbmRlbnQgc2VsZWN0 aW9uIHJlc3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwppbmRleCAyNmFmZWViNTRmZWZkMmQ0 YmI4NzQ3MDNlMzcyMWZhNDhlYmIwNjgzLi4wZmNjMmYwNTBkZmY3MDQ5OGJjOTA0NTdlNDEzYTY0 OWI5YTNmOThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCkBAIC0yODgsNiArMjg4LDkgQEAg ZnVuY3Rpb24gQ2FsbCh0aGlzT2JqZWN0LCBmdW5jdGlvbk5hbWUsIGFyZ3MsIHJlc3VsdCwgc3Rh Y2tUcmFjZSkKICAgICB0aGlzLl9hcmdzID0gQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJn cywgMCk7CiAgICAgdGhpcy5fcmVzdWx0ID0gcmVzdWx0OwogICAgIHRoaXMuX3N0YWNrVHJhY2Ug PSBzdGFja1RyYWNlIHx8IG51bGw7CisKKyAgICBpZiAoIXRoaXMuX2Z1bmN0aW9uTmFtZSkKKyAg ICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fYXJncy5sZW5ndGggPT09IDIgJiYgdHlwZW9mIHRo aXMuX2FyZ3NbMF0gPT09ICJzdHJpbmciKTsKIH0KIAogQ2FsbC5wcm90b3R5cGUgPSB7CkBAIC0z MDgsNiArMzExLDE0IEBAIENhbGwucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAg ICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLworICAgIGlzUHJvcGVydHlTZXR0ZXI6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiAhdGhpcy5fZnVuY3Rpb25OYW1lOworICAg IH0sCisgICAgCisgICAgLyoqCiAgICAgICogQHJldHVybiB7QXJyYXl9CiAgICAgICovCiAgICAg YXJnczogZnVuY3Rpb24oKQpAQCAtMzgyLDE4ICszOTMsMjQgQEAgQ2FsbC5wcm90b3R5cGUgPSB7 CiAgICAgcmVwbGF5OiBmdW5jdGlvbihyZXBsYXlhYmxlQ2FsbCwgY2FjaGUpCiAgICAgewogICAg ICAgICB2YXIgcmVwbGF5T2JqZWN0ID0gUmVwbGF5YWJsZVJlc291cmNlLnJlcGxheShyZXBsYXlh YmxlQ2FsbC5yZXNvdXJjZSgpLCBjYWNoZSk7Ci0gICAgICAgIHZhciByZXBsYXlGdW5jdGlvbiA9 IHJlcGxheU9iamVjdFtyZXBsYXlhYmxlQ2FsbC5mdW5jdGlvbk5hbWUoKV07Ci0gICAgICAgIGNv bnNvbGUuYXNzZXJ0KHR5cGVvZiByZXBsYXlGdW5jdGlvbiA9PT0gImZ1bmN0aW9uIiwgIkV4cGVj dGVkIGEgZnVuY3Rpb24gdG8gcmVwbGF5Iik7CiAgICAgICAgIHZhciByZXBsYXlBcmdzID0gcmVw bGF5YWJsZUNhbGwuYXJncygpLm1hcChmdW5jdGlvbihvYmopIHsKICAgICAgICAgICAgIHJldHVy biBSZXBsYXlhYmxlUmVzb3VyY2UucmVwbGF5KG9iaiwgY2FjaGUpOwogICAgICAgICB9KTsKLSAg ICAgICAgdmFyIHJlcGxheVJlc3VsdCA9IHJlcGxheUZ1bmN0aW9uLmFwcGx5KHJlcGxheU9iamVj dCwgcmVwbGF5QXJncyk7Ci0gICAgICAgIGlmIChyZXBsYXlhYmxlQ2FsbC5yZXN1bHQoKSBpbnN0 YW5jZW9mIFJlcGxheWFibGVSZXNvdXJjZSkgewotICAgICAgICAgICAgdmFyIHJlc291cmNlID0g cmVwbGF5YWJsZUNhbGwucmVzdWx0KCkucmVwbGF5KGNhY2hlKTsKLSAgICAgICAgICAgIGlmICgh cmVzb3VyY2Uud3JhcHBlZE9iamVjdCgpKQotICAgICAgICAgICAgICAgIHJlc291cmNlLnNldFdy YXBwZWRPYmplY3QocmVwbGF5UmVzdWx0KTsKLSAgICAgICAgfQorICAgICAgICB2YXIgcmVwbGF5 UmVzdWx0ID0gdW5kZWZpbmVkOwogCisgICAgICAgIGlmIChyZXBsYXlhYmxlQ2FsbC5pc1Byb3Bl cnR5U2V0dGVyKCkpCisgICAgICAgICAgICByZXBsYXlPYmplY3RbcmVwbGF5QXJnc1swXV0gPSBy ZXBsYXlBcmdzWzFdOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIHZhciByZXBsYXlGdW5j dGlvbiA9IHJlcGxheU9iamVjdFtyZXBsYXlhYmxlQ2FsbC5mdW5jdGlvbk5hbWUoKV07CisgICAg ICAgICAgICBjb25zb2xlLmFzc2VydCh0eXBlb2YgcmVwbGF5RnVuY3Rpb24gPT09ICJmdW5jdGlv biIsICJFeHBlY3RlZCBhIGZ1bmN0aW9uIHRvIHJlcGxheSIpOworICAgICAgICAgICAgcmVwbGF5 UmVzdWx0ID0gcmVwbGF5RnVuY3Rpb24uYXBwbHkocmVwbGF5T2JqZWN0LCByZXBsYXlBcmdzKTsK KyAgICAgICAgICAgIGlmIChyZXBsYXlhYmxlQ2FsbC5yZXN1bHQoKSBpbnN0YW5jZW9mIFJlcGxh eWFibGVSZXNvdXJjZSkgeworICAgICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHJlcGxheWFi bGVDYWxsLnJlc3VsdCgpLnJlcGxheShjYWNoZSk7CisgICAgICAgICAgICAgICAgaWYgKCFyZXNv dXJjZS53cmFwcGVkT2JqZWN0KCkpCisgICAgICAgICAgICAgICAgICAgIHJlc291cmNlLnNldFdy YXBwZWRPYmplY3QocmVwbGF5UmVzdWx0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IAogICAgICAgICB0aGlzLl90aGlzT2JqZWN0ID0gcmVwbGF5T2JqZWN0OwogICAgICAgICB0aGlz Ll9mdW5jdGlvbk5hbWUgPSByZXBsYXlhYmxlQ2FsbC5mdW5jdGlvbk5hbWUoKTsKICAgICAgICAg dGhpcy5fYXJncyA9IHJlcGxheUFyZ3M7CkBAIC00MzksNiArNDU2LDE0IEBAIFJlcGxheWFibGVD YWxsLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCisgICAgICogQHJldHVybiB7Ym9v bGVhbn0KKyAgICAgKi8KKyAgICBpc1Byb3BlcnR5U2V0dGVyOiBmdW5jdGlvbigpCisgICAgewor ICAgICAgICByZXR1cm4gIXRoaXMuX2Z1bmN0aW9uTmFtZTsKKyAgICB9LAorCisgICAgLyoqCiAg ICAgICogQHJldHVybiB7QXJyYXkuPFJlcGxheWFibGVSZXNvdXJjZXwqPn0KICAgICAgKi8KICAg ICBhcmdzOiBmdW5jdGlvbigpCkBAIC02OTksMTIgKzcyNCw3IEBAIFJlc291cmNlLnByb3RvdHlw ZSA9IHsKICAgICAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIHdyYXBwZWRPYmplY3RbcHJvcGVydHldOwogICAgICAgICAgICAgICAgICAgICB9LAotICAg ICAgICAgICAgICAgICAgICBzZXQ6IGZ1bmN0aW9uKHZhbHVlKQotICAgICAgICAgICAgICAgICAg ICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogTG9nIHRoZSBzZXR0ZXIgY2Fs bHMuCi0gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKCJGSVhNRTogU2V0dGlu ZyBhbiBhdHRyaWJ1dGUgJXMgd2FzIG5vdCBsb2dnZWQuIiwgcHJvcGVydHkpOwotICAgICAgICAg ICAgICAgICAgICAgICAgd3JhcHBlZE9iamVjdFtwcm9wZXJ0eV0gPSB2YWx1ZTsKLSAgICAgICAg ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgc2V0OiBzZWxmLl93cmFwUHJvcGVy dHlTZXR0ZXIoc2VsZiwgd3JhcHBlZE9iamVjdCwgcHJvcGVydHkpLAogICAgICAgICAgICAgICAg ICAgICBlbnVtZXJhYmxlOiB0cnVlCiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9 CkBAIC03NzMsNiArNzkzLDMwIEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAg ICAgLyoqCisgICAgICogQHBhcmFtIHtSZXNvdXJjZX0gcmVzb3VyY2UKKyAgICAgKiBAcGFyYW0g e09iamVjdH0gb3JpZ2luYWxPYmplY3QKKyAgICAgKiBAcGFyYW0ge3N0cmluZ30gcHJvcGVydHlO YW1lCisgICAgICogQHJldHVybiB7RnVuY3Rpb259CisgICAgICovCisgICAgX3dyYXBQcm9wZXJ0 eVNldHRlcjogZnVuY3Rpb24ocmVzb3VyY2UsIG9yaWdpbmFsT2JqZWN0LCBwcm9wZXJ0eU5hbWUp CisgICAgeworICAgICAgICByZXR1cm4gZnVuY3Rpb24odmFsdWUpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHZhciBtYW5hZ2VyID0gcmVzb3VyY2UubWFuYWdlcigpOworICAgICAgICAgICAgaWYg KCFtYW5hZ2VyIHx8ICFtYW5hZ2VyLmNhcHR1cmluZygpKSB7CisgICAgICAgICAgICAgICAgb3Jp Z2luYWxPYmplY3RbcHJvcGVydHlOYW1lXSA9IHZhbHVlOworICAgICAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBhcmdzID0gW3Byb3BlcnR5TmFtZSwg dmFsdWVdOworICAgICAgICAgICAgbWFuYWdlci5jYXB0dXJlQXJndW1lbnRzKHJlc291cmNlLCBh cmdzKTsKKyAgICAgICAgICAgIG9yaWdpbmFsT2JqZWN0W3Byb3BlcnR5TmFtZV0gPSB2YWx1ZTsK KyAgICAgICAgICAgIHZhciBzdGFja1RyYWNlID0gU3RhY2tUcmFjZS5jcmVhdGUoMSwgYXJndW1l bnRzLmNhbGxlZSk7CisgICAgICAgICAgICB2YXIgY2FsbCA9IG5ldyBDYWxsKHJlc291cmNlLCAi IiwgYXJncywgdW5kZWZpbmVkLCBzdGFja1RyYWNlKTsKKyAgICAgICAgICAgIG1hbmFnZXIuY2Fw dHVyZUNhbGwoY2FsbCk7CisgICAgICAgIH07CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBy ZXR1cm4ge09iamVjdC48c3RyaW5nLCBGdW5jdGlvbj59CiAgICAgICovCiAgICAgX2N1c3RvbVdy YXBGdW5jdGlvbnM6IGZ1bmN0aW9uKCkKQEAgLTIyNzAsMTQgKzIzMTQsMjAgQEAgSW5qZWN0ZWRT Y3JpcHQucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIHN0YWNrVHJhY2UgPSBjYWxsLnN0 YWNrVHJhY2UoKTsKICAgICAgICAgICAgIHZhciBjYWxsRnJhbWUgPSBzdGFja1RyYWNlID8gc3Rh Y2tUcmFjZS5jYWxsRnJhbWUoMCkgfHwge30gOiB7fTsKICAgICAgICAgICAgIHZhciB0cmFjZUxv Z0l0ZW0gPSB7Ci0gICAgICAgICAgICAgICAgZnVuY3Rpb25OYW1lOiBjYWxsLmZ1bmN0aW9uTmFt ZSgpLAotICAgICAgICAgICAgICAgIGFyZ3VtZW50czogYXJncywKICAgICAgICAgICAgICAgICBz b3VyY2VVUkw6IGNhbGxGcmFtZS5zb3VyY2VVUkwsCiAgICAgICAgICAgICAgICAgbGluZU51bWJl cjogY2FsbEZyYW1lLmxpbmVOdW1iZXIsCiAgICAgICAgICAgICAgICAgY29sdW1uTnVtYmVyOiBj YWxsRnJhbWUuY29sdW1uTnVtYmVyCiAgICAgICAgICAgICB9OwotICAgICAgICAgICAgaWYgKGNh bGwucmVzdWx0KCkpCi0gICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLnJlc3VsdCA9IGNhbGwu cmVzdWx0KCkgKyAiIjsKKyAgICAgICAgICAgIGlmIChjYWxsLmZ1bmN0aW9uTmFtZSgpKSB7Cisg ICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLmZ1bmN0aW9uTmFtZSA9IGNhbGwuZnVuY3Rpb25O YW1lKCk7CisgICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLmFyZ3VtZW50cyA9IGFyZ3M7Cisg ICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5wcm9wZXJ0 eSA9IGFyZ3NbMF07CisgICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLnZhbHVlID0gYXJnc1sx XTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBjYWxsUmVzdWx0ID0gY2FsbC5yZXN1 bHQoKTsKKyAgICAgICAgICAgIGlmIChjYWxsUmVzdWx0ICE9PSB1bmRlZmluZWQgJiYgY2FsbFJl c3VsdCAhPT0gbnVsbCkKKyAgICAgICAgICAgICAgICB0cmFjZUxvZ0l0ZW0ucmVzdWx0ID0gY2Fs bFJlc3VsdCArICIiOwogICAgICAgICAgICAgcmVzdWx0LmNhbGxzLnB1c2godHJhY2VMb2dJdGVt KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVzdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3Rvci5qc29uCmluZGV4IDIxZDkyN2MyMTM4N2Q2MmVjMWQ2YzQyNDQ3Y2FlZDVl MjEyYzY4YzIuLmQ5MTk1Y2U4ZjAxZmI1Y2FlOTI1ZjE4YmI2ZGNlMWVlMjllZjA5N2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTMxMDAsOCArMzEwMCwxMCBA QAogICAgICAgICAgICAgICAgICJpZCI6ICJDYWxsIiwKICAgICAgICAgICAgICAgICAidHlwZSI6 ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImZ1bmN0aW9uTmFtZSIsICJ0eXBlIjogInN0cmluZyIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJhcmd1bWVudHMiLCAidHlwZSI6ICJhcnJheSIs ICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5nIiB9IH0sCisgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZnVuY3Rpb25OYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1 ZSB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImFyZ3VtZW50cyIsICJ0eXBlIjog ImFycmF5IiwgIml0ZW1zIjogeyAidHlwZSI6ICJzdHJpbmciIH0sICJvcHRpb25hbCI6IHRydWUg fSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJwcm9wZXJ0eSIsICJ0eXBlIjogInN0 cmluZyIsICJvcHRpb25hbCI6IHRydWUgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJ2YWx1ZSIsICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUgfSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJyZXN1bHQiLCAidHlwZSI6ICJzdHJpbmciLCAib3B0aW9u YWwiOiB0cnVlIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlVVJMIiwg InR5cGUiOiAic3RyaW5nIiwgIm9wdGlvbmFsIjogdHJ1ZSB9LAogICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImxpbmVOdW1iZXIiLCAidHlwZSI6ICJpbnRlZ2VyIiwgIm9wdGlvbmFsIjog dHJ1ZSB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D YW52YXNQcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv Q2FudmFzUHJvZmlsZVZpZXcuanMKaW5kZXggMDYxYWQ4YTM3MzkyM2Q4ODUwYTdkNzQxYmQ3NWUx MzQ4MTdlMzFlNy4uNjJiNTE2NDE0Nzg5OWFkZDAzNzgzMGZlZGU4NmYyYTQ4OTE1MjliOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9DYW52YXNQcm9maWxl Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NhbnZhc1By b2ZpbGVWaWV3LmpzCkBAIC0xMTAsMTcgKzExMCwyMiBAQCBXZWJJbnNwZWN0b3IuQ2FudmFzUHJv ZmlsZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5zdGVw Tm8gPSBpOwogICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVUZXh0Tm9kZSgiKCIgKyAoaSsxKSArICIpICIpKTsKIAorICAgICAgICAgICAgICAg IHZhciBzb3VyY2VUZXh0ID0gY2FsbC5mdW5jdGlvbk5hbWUgfHwgImNvbnRleHQuIiArIGNhbGwu cHJvcGVydHk7CiAgICAgICAgICAgICAgICAgaWYgKGNhbGwuc291cmNlVVJMKSB7CiAgICAgICAg ICAgICAgICAgICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGluZS9jb2x1bW4gbnVt YmVycyBhcmUgb25lLWJhc2VkLgogICAgICAgICAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9 IE1hdGgubWF4KDAsIGNhbGwubGluZU51bWJlciAtIDEpIHx8IDA7CiAgICAgICAgICAgICAgICAg ICAgIHZhciBjb2x1bW5OdW1iZXIgPSBNYXRoLm1heCgwLCBjYWxsLmNvbHVtbk51bWJlciAtIDEp IHx8IDA7CiAgICAgICAgICAgICAgICAgICAgIHZhciBsaW5rRWxlbWVudCA9IHRoaXMuX2xpbmtp Zmllci5saW5raWZ5TG9jYXRpb24oY2FsbC5zb3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcik7Ci0gICAgICAgICAgICAgICAgICAgIGxpbmtFbGVtZW50LnRleHRDb250ZW50ID0gY2Fs bC5mdW5jdGlvbk5hbWU7CisgICAgICAgICAgICAgICAgICAgIGxpbmtFbGVtZW50LnRleHRDb250 ZW50ID0gc291cmNlVGV4dDsKICAgICAgICAgICAgICAgICAgICAgdHJhY2VMb2dJdGVtLmFwcGVu ZENoaWxkKGxpbmtFbGVtZW50KTsKICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAg ICAgICAgICAgdHJhY2VMb2dJdGVtLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KGNhbGwuZnVuY3Rpb25OYW1lKSk7CisgICAgICAgICAgICAgICAgICAgIHRyYWNlTG9nSXRlbS5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShzb3VyY2VUZXh0KSk7CisKKyAgICAg ICAgICAgICAgICBpZiAoY2FsbC5hcmd1bWVudHMpCisgICAgICAgICAgICAgICAgICAgIHRyYWNl TG9nSXRlbS5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiKCIgKyBjYWxsLmFy Z3VtZW50cy5qb2luKCIsICIpICsgIikiKSk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAg ICAgICAgICAgICAgICB0cmFjZUxvZ0l0ZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4 dE5vZGUoIiA9ICIgKyBjYWxsLnZhbHVlKSk7CiAKLSAgICAgICAgICAgICAgICB0cmFjZUxvZ0l0 ZW0uYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIigiICsgY2FsbC5hcmd1bWVu dHMuam9pbigiLCAiKSArICIpIikpOwogICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgY2FsbC5y ZXN1bHQgIT09ICJ1bmRlZmluZWQiKQogICAgICAgICAgICAgICAgICAgICB0cmFjZUxvZ0l0ZW0u YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiA9PiAiICsgY2FsbC5yZXN1bHQp KTsKICAgICAgICAgICAgICAgICB0aGlzLl90cmFjZUxvZ0VsZW1lbnQuYXBwZW5kQ2hpbGQodHJh Y2VMb2dJdGVtKTsK