101459 2012-11-07 05:54:41 -0800 Web Inspector: [Canvas] closure compiler fixes 2012-11-07 06:38:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 760605 0 aandrey 2012-11-07 05:54:41 -0800 Minor compiler fixes, a follow-up to http://trac.webkit.org/changeset/130518 Patch to follow. 760607 1 172779 aandrey 2012-11-07 05:56:44 -0800 Created attachment 172779 Patch 760640 2 172779 webkit.review.bot 2012-11-07 06:38:09 -0800 Comment on attachment 172779 Patch Clearing flags on attachment: 172779 Committed r133752: <http://trac.webkit.org/changeset/133752> 760641 3 webkit.review.bot 2012-11-07 06:38:12 -0800 All reviewed patches have been landed. Closing bug. 172779 2012-11-07 05:56:44 -0800 2012-11-07 06:38:08 -0800 Patch bug-101459-20121107175455.patch text/plain 10796 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUwOWFkMjVmZWI3N2Ew MDljNjAyZGZiNWFkMjM5ZTdhZjI1MTc3Zi4uMzU2ZGExYmJkMGQ1ZjU0M2JhODAzNjI4ZTgwNzdl MTVlNjFmNmU0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTExLTA3ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIGNsb3N1cmUgY29tcGlsZXIgZml4ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTQ1OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2Fu dmFzTW9kdWxlU291cmNlLmpzOgorICAgICAgICAoLik6CisKIDIwMTItMTEtMDIgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog SmF2YVNjcmlwdCB3ZWIgd29ya2VycyBkZWJ1Z2dpbmcgY3Jhc2hlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291 cmNlLmpzCmluZGV4IGVlYjNlZTM5NmE0OTA2Y2QxYTE2MmYyODFmZjUyODY2Y2Y3MWQ0ZjEuLjZl OWYxNjExM2Y2MzhlNjE0ODhhZTY5MWE3Y2FkOWU1Mjk1NWJmZjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVT b3VyY2UuanMKQEAgLTM4LDcgKzM4LDggQEAKIHZhciBUeXBlVXRpbHMgPSB7CiAgICAgLyoqCiAg ICAgICogaHR0cDovL3d3dy5raHJvbm9zLm9yZy9yZWdpc3RyeS90eXBlZGFycmF5L3NwZWNzL2xh dGVzdC8jNwotICAgICAqIEB0eXBlIHshQXJyYXkuPEZ1bmN0aW9uPn0KKyAgICAgKiBAY29uc3QK KyAgICAgKiBAdHlwZSB7IUFycmF5LjxmdW5jdGlvbihuZXc6QXJyYXlCdWZmZXJWaWV3LCBBcnJh eUJ1ZmZlclZpZXcpPn0KICAgICAgKi8KICAgICBfdHlwZWRBcnJheUNsYXNzZXM6IChmdW5jdGlv bih0eXBlTmFtZXMpIHsKICAgICAgICAgdmFyIHJlc3VsdCA9IFtdOwpAQCAtNTEsNyArNTIsNyBA QCB2YXIgVHlwZVV0aWxzID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHsqfSBhcnJheQot ICAgICAqIEByZXR1cm4ge0Z1bmN0aW9ufQorICAgICAqIEByZXR1cm4ge2Z1bmN0aW9uKG5ldzpB cnJheUJ1ZmZlclZpZXcsIEFycmF5QnVmZmVyVmlldyl8bnVsbH0KICAgICAgKi8KICAgICB0eXBl ZEFycmF5Q2xhc3M6IGZ1bmN0aW9uKGFycmF5KQogICAgIHsKQEAgLTg2LDcgKzg3LDcgQEAgdmFy IFR5cGVVdGlscyA9IHsKIAogICAgICAgICB2YXIgdHlwZWRBcnJheUNsYXNzID0gVHlwZVV0aWxz LnR5cGVkQXJyYXlDbGFzcyhvYmopOwogICAgICAgICBpZiAodHlwZWRBcnJheUNsYXNzKQotICAg ICAgICAgICAgcmV0dXJuIG5ldyB0eXBlZEFycmF5Q2xhc3Mob2JqKTsKKyAgICAgICAgICAgIHJl dHVybiBuZXcgdHlwZWRBcnJheUNsYXNzKC8qKiBAdHlwZSB7QXJyYXlCdWZmZXJWaWV3fSAqLyAo b2JqKSk7CiAKICAgICAgICAgaWYgKG9iaiBpbnN0YW5jZW9mIEhUTUxJbWFnZUVsZW1lbnQpCiAg ICAgICAgICAgICByZXR1cm4gb2JqLmNsb25lTm9kZSh0cnVlKTsKQEAgLTU2MCw3ICs1NjEsNyBA QCBSZXBsYXlhYmxlQ2FsbC5wcm90b3R5cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCi0g KiBAcGFyYW0ge09iamVjdH0gd3JhcHBlZE9iamVjdAorICogQHBhcmFtIHshT2JqZWN0fSB3cmFw cGVkT2JqZWN0CiAgKi8KIGZ1bmN0aW9uIFJlc291cmNlKHdyYXBwZWRPYmplY3QpCiB7CkBAIC02 MjksNyArNjMwLDcgQEAgUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioK LSAgICAgKiBAcGFyYW0geyp9IHZhbHVlCisgICAgICogQHBhcmFtIHshT2JqZWN0fSB2YWx1ZQog ICAgICAqLwogICAgIHNldFdyYXBwZWRPYmplY3Q6IGZ1bmN0aW9uKHZhbHVlKQogICAgIHsKQEAg LTcwNiwxMSArNzA3LDExIEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAg KiBAcGFyYW0ge09iamVjdH0gZGF0YQogICAgICAqIEBwYXJhbSB7Q2FjaGV9IGNhY2hlCi0gICAg ICogQHJldHVybiB7UmVzb3VyY2V8UmVwbGF5YWJsZVJlc291cmNlfQorICAgICAqIEByZXR1cm4g e1Jlc291cmNlfQogICAgICAqLwogICAgIHJlcGxheTogZnVuY3Rpb24oZGF0YSwgY2FjaGUpCiAg ICAgewotICAgICAgICB2YXIgcmVzb3VyY2UgPSAvKiogQHR5cGUge1JlcGxheWFibGVSZXNvdXJj ZX0gKi8gKGNhY2hlLmdldChkYXRhLmlkKSk7CisgICAgICAgIHZhciByZXNvdXJjZSA9IC8qKiBA dHlwZSB7UmVzb3VyY2V9ICovIChjYWNoZS5nZXQoZGF0YS5pZCkpOwogICAgICAgICBpZiAocmVz b3VyY2UpCiAgICAgICAgICAgICByZXR1cm4gcmVzb3VyY2U7CiAgICAgICAgIHRoaXMuX2lkID0g ZGF0YS5pZDsKQEAgLTc0MywxMSArNzQ0LDExIEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAg ICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHsqfSBvYmplY3QKKyAgICAgKiBAcGFyYW0g eyFPYmplY3R9IG9iamVjdAogICAgICAqLwogICAgIF9iaW5kT2JqZWN0VG9SZXNvdXJjZTogZnVu Y3Rpb24ob2JqZWN0KQogICAgIHsKLSAgICAgICAgT2JqZWN0LmRlZmluZVByb3BlcnR5KC8qKiBA dHlwZSB7IU9iamVjdH0gKi8gKG9iamVjdCksICJfX3Jlc291cmNlT2JqZWN0IiwgeworICAgICAg ICBPYmplY3QuZGVmaW5lUHJvcGVydHkob2JqZWN0LCAiX19yZXNvdXJjZU9iamVjdCIsIHsKICAg ICAgICAgICAgIHZhbHVlOiB0aGlzLAogICAgICAgICAgICAgd3JpdGFibGU6IGZhbHNlLAogICAg ICAgICAgICAgZW51bWVyYWJsZTogZmFsc2UsCkBAIC05MzksMTUgKzk0MCwxNSBAQCBSZXNvdXJj ZS5XcmFwRnVuY3Rpb24ucHJvdG90eXBlID0gewogfQogCiAvKioKLSAqIEBwYXJhbSB7IUZ1bmN0 aW9ufSByZXNvdXJjZUNvbnN0cnVjdG9yCi0gKiBAcmV0dXJuIHtGdW5jdGlvbn0KKyAqIEBwYXJh bSB7ZnVuY3Rpb24obmV3OlJlc291cmNlLCAhT2JqZWN0KX0gcmVzb3VyY2VDb25zdHJ1Y3Rvcgor ICogQHJldHVybiB7ZnVuY3Rpb24odGhpczpSZXNvdXJjZS5XcmFwRnVuY3Rpb24pfQogICovCiBS ZXNvdXJjZS5XcmFwRnVuY3Rpb24ucmVzb3VyY2VGYWN0b3J5TWV0aG9kID0gZnVuY3Rpb24ocmVz b3VyY2VDb25zdHJ1Y3RvcikKIHsKICAgICAvKiogQHRoaXMgUmVzb3VyY2UuV3JhcEZ1bmN0aW9u ICovCiAgICAgcmV0dXJuIGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciB3cmFwcGVkT2Jq ZWN0ID0gdGhpcy5yZXN1bHQoKTsKKyAgICAgICAgdmFyIHdyYXBwZWRPYmplY3QgPSAvKiogQHR5 cGUge09iamVjdH0gKi8gKHRoaXMucmVzdWx0KCkpOwogICAgICAgICBpZiAoIXdyYXBwZWRPYmpl Y3QpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIHZhciByZXNvdXJjZSA9IG5ldyByZXNv dXJjZUNvbnN0cnVjdG9yKHdyYXBwZWRPYmplY3QpOwpAQCAtOTYxLDggKzk2Miw4IEBAIFJlc291 cmNlLldyYXBGdW5jdGlvbi5yZXNvdXJjZUZhY3RvcnlNZXRob2QgPSBmdW5jdGlvbihyZXNvdXJj ZUNvbnN0cnVjdG9yKQogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQHBhcmFtIHtSZXNvdXJj ZX0gb3JpZ2luYWxSZXNvdXJjZQotICogQHBhcmFtIHtPYmplY3R9IGRhdGEKKyAqIEBwYXJhbSB7 IVJlc291cmNlfSBvcmlnaW5hbFJlc291cmNlCisgKiBAcGFyYW0geyFPYmplY3R9IGRhdGEKICAq LwogZnVuY3Rpb24gUmVwbGF5YWJsZVJlc291cmNlKG9yaWdpbmFsUmVzb3VyY2UsIGRhdGEpCiB7 CkBAIC0xMzk5LDggKzE0MDAsOCBAQCBXZWJHTFJlbmRlcmJ1ZmZlclJlc291cmNlLnByb3RvdHlw ZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7UmVzb3VyY2V9Ci0gKiBA cGFyYW0ge1dlYkdMUmVuZGVyaW5nQ29udGV4dH0gZ2xDb250ZXh0Ci0gKiBAcGFyYW0ge0Z1bmN0 aW9ufSByZXBsYXlDb250ZXh0Q2FsbGJhY2sKKyAqIEBwYXJhbSB7IVdlYkdMUmVuZGVyaW5nQ29u dGV4dH0gZ2xDb250ZXh0CisgKiBAcGFyYW0ge2Z1bmN0aW9uKCk6V2ViR0xSZW5kZXJpbmdDb250 ZXh0fSByZXBsYXlDb250ZXh0Q2FsbGJhY2sKICAqLwogZnVuY3Rpb24gV2ViR0xSZW5kZXJpbmdD b250ZXh0UmVzb3VyY2UoZ2xDb250ZXh0LCByZXBsYXlDb250ZXh0Q2FsbGJhY2spCiB7CkBAIC0x NjQ5LDEyICsxNjUwLDEyIEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLnByb3RvdHlw ZSA9IHsKICAgICAgICAgdGhpcy5fcmVwbGF5Q29udGV4dENhbGxiYWNrID0gZGF0YS5yZXBsYXlD b250ZXh0Q2FsbGJhY2s7CiAgICAgICAgIHRoaXMuX2N1c3RvbUVycm9ycyA9IG51bGw7CiAKLSAg ICAgICAgdmFyIGdsID0gUmVzb3VyY2Uud3JhcHBlZE9iamVjdCh0aGlzLl9yZXBsYXlDb250ZXh0 Q2FsbGJhY2soKSk7CisgICAgICAgIHZhciBnbCA9IC8qKiBAdHlwZSB7IVdlYkdMUmVuZGVyaW5n Q29udGV4dH0gKi8gKFJlc291cmNlLndyYXBwZWRPYmplY3QodGhpcy5fcmVwbGF5Q29udGV4dENh bGxiYWNrKCkpKTsKICAgICAgICAgdGhpcy5zZXRXcmFwcGVkT2JqZWN0KGdsKTsKIAogICAgICAg ICB2YXIgZ2xTdGF0ZSA9IGRhdGEuZ2xTdGF0ZTsKLSAgICAgICAgZ2wuYmluZEZyYW1lYnVmZmVy KGdsLkZSQU1FQlVGRkVSLCBSZXBsYXlhYmxlUmVzb3VyY2UucmVwbGF5KGdsU3RhdGUuRlJBTUVC VUZGRVJfQklORElORywgY2FjaGUpKTsKLSAgICAgICAgZ2wuYmluZFJlbmRlcmJ1ZmZlcihnbC5S RU5ERVJCVUZGRVIsIFJlcGxheWFibGVSZXNvdXJjZS5yZXBsYXkoZ2xTdGF0ZS5SRU5ERVJCVUZG RVJfQklORElORywgY2FjaGUpKTsKKyAgICAgICAgZ2wuYmluZEZyYW1lYnVmZmVyKGdsLkZSQU1F QlVGRkVSLCAvKiogQHR5cGUge1dlYkdMRnJhbWVidWZmZXJ9ICovIChSZXBsYXlhYmxlUmVzb3Vy Y2UucmVwbGF5KGdsU3RhdGUuRlJBTUVCVUZGRVJfQklORElORywgY2FjaGUpKSk7CisgICAgICAg IGdsLmJpbmRSZW5kZXJidWZmZXIoZ2wuUkVOREVSQlVGRkVSLCAvKiogQHR5cGUge1dlYkdMUmVu ZGVyYnVmZmVyfSAqLyAoUmVwbGF5YWJsZVJlc291cmNlLnJlcGxheShnbFN0YXRlLlJFTkRFUkJV RkZFUl9CSU5ESU5HLCBjYWNoZSkpKTsKIAogICAgICAgICAvLyBFbmFibGUgb3IgZGlzYWJsZSBz ZXJ2ZXItc2lkZSBHTCBjYXBhYmlsaXRpZXMuCiAgICAgICAgIFdlYkdMUmVuZGVyaW5nQ29udGV4 dFJlc291cmNlLkdMQ2FwYWJpbGl0aWVzLmZvckVhY2goZnVuY3Rpb24ocGFyYW1ldGVyKSB7CkBA IC0xNjk2LDEwICsxNjk3LDEwIEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLnByb3Rv dHlwZSA9IHsKICAgICAgICAgZ2wuc2Npc3NvcihnbFN0YXRlLlNDSVNTT1JfQk9YWzBdLCBnbFN0 YXRlLlNDSVNTT1JfQk9YWzFdLCBnbFN0YXRlLlNDSVNTT1JfQk9YWzJdLCBnbFN0YXRlLlNDSVNT T1JfQk9YWzNdKTsKICAgICAgICAgZ2wudmlld3BvcnQoZ2xTdGF0ZS5WSUVXUE9SVFswXSwgZ2xT dGF0ZS5WSUVXUE9SVFsxXSwgZ2xTdGF0ZS5WSUVXUE9SVFsyXSwgZ2xTdGF0ZS5WSUVXUE9SVFsz XSk7CiAKLSAgICAgICAgZ2wudXNlUHJvZ3JhbShSZXBsYXlhYmxlUmVzb3VyY2UucmVwbGF5KGds U3RhdGUuQ1VSUkVOVF9QUk9HUkFNLCBjYWNoZSkpOworICAgICAgICBnbC51c2VQcm9ncmFtKC8q KiBAdHlwZSB7V2ViR0xQcm9ncmFtfSAqLyAoUmVwbGF5YWJsZVJlc291cmNlLnJlcGxheShnbFN0 YXRlLkNVUlJFTlRfUFJPR1JBTSwgY2FjaGUpKSk7CiAKICAgICAgICAgLy8gVkVSVEVYX0FUVFJJ Ql9BUlJBWVMKLSAgICAgICAgdmFyIG1heFZlcnRleEF0dHJpYnMgPSBnbC5nZXRQYXJhbWV0ZXIo Z2wuTUFYX1ZFUlRFWF9BVFRSSUJTKTsKKyAgICAgICAgdmFyIG1heFZlcnRleEF0dHJpYnMgPSAv KiogQHR5cGUge251bWJlcn0gKi8gKGdsLmdldFBhcmFtZXRlcihnbC5NQVhfVkVSVEVYX0FUVFJJ QlMpKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBtYXhWZXJ0ZXhBdHRyaWJzOyArK2kp IHsKICAgICAgICAgICAgIHZhciBzdGF0ZSA9IGdsU3RhdGUudmVydGV4QXR0cmliU3RhdGVzW2ld IHx8IHt9OwogICAgICAgICAgICAgaWYgKHN0YXRlLlZFUlRFWF9BVFRSSUJfQVJSQVlfRU5BQkxF RCkKQEAgLTE3MDgsMjIgKzE3MDksMjIgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2Uu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGdsLmRpc2FibGVWZXJ0ZXhBdHRyaWJBcnJh eShpKTsKICAgICAgICAgICAgIGlmIChzdGF0ZS5DVVJSRU5UX1ZFUlRFWF9BVFRSSUIpCiAgICAg ICAgICAgICAgICAgZ2wudmVydGV4QXR0cmliNGZ2KGksIHN0YXRlLkNVUlJFTlRfVkVSVEVYX0FU VFJJQik7Ci0gICAgICAgICAgICB2YXIgYnVmZmVyID0gUmVwbGF5YWJsZVJlc291cmNlLnJlcGxh eShzdGF0ZS5WRVJURVhfQVRUUklCX0FSUkFZX0JVRkZFUl9CSU5ESU5HLCBjYWNoZSk7CisgICAg ICAgICAgICB2YXIgYnVmZmVyID0gLyoqIEB0eXBlIHtXZWJHTEJ1ZmZlcn0gKi8gKFJlcGxheWFi bGVSZXNvdXJjZS5yZXBsYXkoc3RhdGUuVkVSVEVYX0FUVFJJQl9BUlJBWV9CVUZGRVJfQklORElO RywgY2FjaGUpKTsKICAgICAgICAgICAgIGlmIChidWZmZXIpIHsKICAgICAgICAgICAgICAgICBn bC5iaW5kQnVmZmVyKGdsLkFSUkFZX0JVRkZFUiwgYnVmZmVyKTsKICAgICAgICAgICAgICAgICBn bC52ZXJ0ZXhBdHRyaWJQb2ludGVyKGksIHN0YXRlLlZFUlRFWF9BVFRSSUJfQVJSQVlfU0laRSwg c3RhdGUuVkVSVEVYX0FUVFJJQl9BUlJBWV9UWVBFLCBzdGF0ZS5WRVJURVhfQVRUUklCX0FSUkFZ X05PUk1BTElaRUQsIHN0YXRlLlZFUlRFWF9BVFRSSUJfQVJSQVlfU1RSSURFLCBzdGF0ZS5WRVJU RVhfQVRUUklCX0FSUkFZX1BPSU5URVIpOwogICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAg ICAgIGdsLmJpbmRCdWZmZXIoZ2wuQVJSQVlfQlVGRkVSLCBSZXBsYXlhYmxlUmVzb3VyY2UucmVw bGF5KGdsU3RhdGUuQVJSQVlfQlVGRkVSX0JJTkRJTkcsIGNhY2hlKSk7Ci0gICAgICAgIGdsLmJp bmRCdWZmZXIoZ2wuRUxFTUVOVF9BUlJBWV9CVUZGRVIsIFJlcGxheWFibGVSZXNvdXJjZS5yZXBs YXkoZ2xTdGF0ZS5FTEVNRU5UX0FSUkFZX0JVRkZFUl9CSU5ESU5HLCBjYWNoZSkpOworICAgICAg ICBnbC5iaW5kQnVmZmVyKGdsLkFSUkFZX0JVRkZFUiwgLyoqIEB0eXBlIHtXZWJHTEJ1ZmZlcn0g Ki8gKFJlcGxheWFibGVSZXNvdXJjZS5yZXBsYXkoZ2xTdGF0ZS5BUlJBWV9CVUZGRVJfQklORElO RywgY2FjaGUpKSk7CisgICAgICAgIGdsLmJpbmRCdWZmZXIoZ2wuRUxFTUVOVF9BUlJBWV9CVUZG RVIsIC8qKiBAdHlwZSB7V2ViR0xCdWZmZXJ9ICovIChSZXBsYXlhYmxlUmVzb3VyY2UucmVwbGF5 KGdsU3RhdGUuRUxFTUVOVF9BUlJBWV9CVUZGRVJfQklORElORywgY2FjaGUpKSk7CiAKICAgICAg ICAgLy8gVEVYVFVSRVMKLSAgICAgICAgdmFyIG1heFRleHR1cmVJbWFnZVVuaXRzID0gZ2wuZ2V0 UGFyYW1ldGVyKGdsLk1BWF9URVhUVVJFX0lNQUdFX1VOSVRTKTsKKyAgICAgICAgdmFyIG1heFRl eHR1cmVJbWFnZVVuaXRzID0gLyoqIEB0eXBlIHtudW1iZXJ9ICovIChnbC5nZXRQYXJhbWV0ZXIo Z2wuTUFYX1RFWFRVUkVfSU1BR0VfVU5JVFMpKTsKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkg PCBtYXhUZXh0dXJlSW1hZ2VVbml0czsgKytpKSB7CiAgICAgICAgICAgICBnbC5hY3RpdmVUZXh0 dXJlKGdsLlRFWFRVUkUwICsgaSk7CiAgICAgICAgICAgICB2YXIgc3RhdGUgPSBnbFN0YXRlLnRl eHR1cmVCaW5kaW5nc1tpXSB8fCB7fTsKLSAgICAgICAgICAgIGdsLmJpbmRUZXh0dXJlKGdsLlRF WFRVUkVfMkQsIFJlcGxheWFibGVSZXNvdXJjZS5yZXBsYXkoc3RhdGUuVEVYVFVSRV8yRCwgY2Fj aGUpKTsKLSAgICAgICAgICAgIGdsLmJpbmRUZXh0dXJlKGdsLlRFWFRVUkVfQ1VCRV9NQVAsIFJl cGxheWFibGVSZXNvdXJjZS5yZXBsYXkoc3RhdGUuVEVYVFVSRV9DVUJFX01BUCwgY2FjaGUpKTsK KyAgICAgICAgICAgIGdsLmJpbmRUZXh0dXJlKGdsLlRFWFRVUkVfMkQsIC8qKiBAdHlwZSB7V2Vi R0xUZXh0dXJlfSAqLyAoUmVwbGF5YWJsZVJlc291cmNlLnJlcGxheShzdGF0ZS5URVhUVVJFXzJE LCBjYWNoZSkpKTsKKyAgICAgICAgICAgIGdsLmJpbmRUZXh0dXJlKGdsLlRFWFRVUkVfQ1VCRV9N QVAsIC8qKiBAdHlwZSB7V2ViR0xUZXh0dXJlfSAqLyAoUmVwbGF5YWJsZVJlc291cmNlLnJlcGxh eShzdGF0ZS5URVhUVVJFX0NVQkVfTUFQLCBjYWNoZSkpKTsKICAgICAgICAgfQogICAgICAgICBn bC5hY3RpdmVUZXh0dXJlKGdsU3RhdGUuQUNUSVZFX1RFWFRVUkUpOwogCkBAIC0xODc0LDggKzE4 NzUsOCBAQCBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAvKioK ICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1Jlc291cmNlfQotICogQHBhcmFtIHtDYW52 YXNSZW5kZXJpbmdDb250ZXh0MkR9IGNvbnRleHQKLSAqIEBwYXJhbSB7RnVuY3Rpb259IHJlcGxh eUNvbnRleHRDYWxsYmFjaworICogQHBhcmFtIHshQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEfSBj b250ZXh0CisgKiBAcGFyYW0ge2Z1bmN0aW9uKCk6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEfSBy ZXBsYXlDb250ZXh0Q2FsbGJhY2sKICAqLwogZnVuY3Rpb24gQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEUmVzb3VyY2UoY29udGV4dCwgcmVwbGF5Q29udGV4dENhbGxiYWNrKQogewpAQCAtMTk2NCw3 ICsxOTY1LDcgQEAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEUmVzb3VyY2UucHJvdG90eXBlID0g ewogICAgIHsKICAgICAgICAgdGhpcy5fcmVwbGF5Q29udGV4dENhbGxiYWNrID0gZGF0YS5yZXBs YXlDb250ZXh0Q2FsbGJhY2s7CiAKLSAgICAgICAgdmFyIGN0eCA9IFJlc291cmNlLndyYXBwZWRP YmplY3QodGhpcy5fcmVwbGF5Q29udGV4dENhbGxiYWNrKCkpOworICAgICAgICB2YXIgY3R4ID0g LyoqIEB0eXBlIHshQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEfSAqLyAoUmVzb3VyY2Uud3JhcHBl ZE9iamVjdCh0aGlzLl9yZXBsYXlDb250ZXh0Q2FsbGJhY2soKSkpOwogICAgICAgICB0aGlzLnNl dFdyYXBwZWRPYmplY3QoY3R4KTsKIAogICAgICAgICBpZiAoZGF0YS5vcmlnaW5hbEltYWdlRGF0 YSkgewpAQCAtMjQ0Myw3ICsyNDQ0LDcgQEAgUmVzb3VyY2VUcmFja2luZ01hbmFnZXIucHJvdG90 eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0Z1bmN0aW9ufSBjYWxs YmFjaworICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oKX0gY2FsbGJhY2sKICAgICAgKi8KICAgICBf c2V0WmVyb1RpbWVvdXRzOiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7CkBAIC0yNDcwLDcgKzI0 NzEsNyBAQCB2YXIgSW5qZWN0ZWRTY3JpcHQgPSBmdW5jdGlvbigpCiAKIEluamVjdGVkU2NyaXB0 LnByb3RvdHlwZSA9IHsKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkdMUmVuZGVyaW5nQ29u dGV4dH0gZ2xDb250ZXh0CisgICAgICogQHBhcmFtIHshV2ViR0xSZW5kZXJpbmdDb250ZXh0fSBn bENvbnRleHQKICAgICAgKiBAcmV0dXJuIHtPYmplY3R9CiAgICAgICovCiAgICAgd3JhcFdlYkdM Q29udGV4dDogZnVuY3Rpb24oZ2xDb250ZXh0KQpAQCAtMjQ4MSw3ICsyNDgyLDcgQEAgSW5qZWN0 ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0g e0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRH0gY29udGV4dAorICAgICAqIEBwYXJhbSB7IUNhbnZh c1JlbmRlcmluZ0NvbnRleHQyRH0gY29udGV4dAogICAgICAqIEByZXR1cm4ge09iamVjdH0KICAg ICAgKi8KICAgICB3cmFwQ2FudmFzMkRDb250ZXh0OiBmdW5jdGlvbihjb250ZXh0KQpAQCAtMjU4 MSw3ICsyNTgyLDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewogICAgIH0sCiAKICAg ICAvKioKLSAgICAgKiBAcGFyYW0ge1dlYkdMUmVuZGVyaW5nQ29udGV4dH0gb3JpZ2luYWxHbENv bnRleHQKKyAgICAgKiBAcGFyYW0geyFXZWJHTFJlbmRlcmluZ0NvbnRleHR9IG9yaWdpbmFsR2xD b250ZXh0CiAgICAgICogQHJldHVybiB7V2ViR0xSZW5kZXJpbmdDb250ZXh0fQogICAgICAqLwog ICAgIF9jb25zdHJ1Y3RXZWJHTFJlcGxheUNvbnRleHQ6IGZ1bmN0aW9uKG9yaWdpbmFsR2xDb250 ZXh0KQpAQCAtMjYxMiw3ICsyNjEzLDcgQEAgSW5qZWN0ZWRTY3JpcHQucHJvdG90eXBlID0gewog ICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RH0gb3JpZ2luYWxDb250ZXh0CisgICAgICogQHBhcmFtIHshQ2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEfSBvcmlnaW5hbENvbnRleHQKICAgICAgKiBAcmV0dXJuIHtDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkR9CiAgICAgICovCiAgICAgX2NvbnN0cnVjdENhbnZhczJEUmVwbGF5Q29udGV4dDogZnVu Y3Rpb24ob3JpZ2luYWxDb250ZXh0KQo=