103994 2012-12-04 05:57:05 -0800 Web Inspector: [Canvas] nit: add more typization for js compiler 2012-12-05 00:46:26 -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 782494 0 aandrey 2012-12-04 05:57:05 -0800 The patch to follow makes InjectedScriptCanvasModuleSource.js 91.2% typed instead of 88.4% 782496 1 177471 aandrey 2012-12-04 05:59:41 -0800 Created attachment 177471 Patch 783480 2 177471 webkit.review.bot 2012-12-05 00:46:23 -0800 Comment on attachment 177471 Patch Clearing flags on attachment: 177471 Committed r136651: <http://trac.webkit.org/changeset/136651> 783481 3 webkit.review.bot 2012-12-05 00:46:26 -0800 All reviewed patches have been landed. Closing bug. 177471 2012-12-04 05:59:41 -0800 2012-12-05 00:46:23 -0800 Patch bug-103994-20121204175705.patch text/plain 15303 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM1YWExM2FhMTEyNTVm ZDA5NjM3Y2U2YjY3MzM3MDU3NjY4NmRhYi4uOTVmNzYwMjc5MjhlMzU4NzkyYWRmOGFiNWMwOGM0 NTFiMmIzNzNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTEyLTA0ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIG5pdDogYWRkIG1vcmUgdHlwaXphdGlvbiBmb3IganMgY29tcGlsZXIKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzk5NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzOgorICAgICAgICAoLik6CisKIDIw MTItMTItMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtHVEtdIFVzZSBhIHByaXZhdGUgc3RydWN0IGFuZCBwbGFjZW1lbnQgbmV3IHN5bnRh eCBpbiBHT2JqZWN0IERPTSBiaW5kaW5ncwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCmluZGV4IGI2 YmNhYTc3NWZlYzNkMzJlMTg0OTc2OTc1NmM0ZjAxNmQ0ZDIxMGQuLjI2ZWU0Zjc3ODE5ZDIwZTIz NGYyNWMyZTQ1YzA2MzYwZjMxZWZjZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKQEAgLTkz LDcgKzkzLDcgQEAgdmFyIFR5cGVVdGlscyA9IHsKICAgICAgICAgICAgIC8vIEZJWE1FOiBNYXli ZSB0aGlzIGlzIGEgYnVnIGluIFdlYktpdCBjb3JlPwogICAgICAgICAgICAgaWYgKC9eYmxvYjov LnRlc3QoaW1nLnNyYykpIHsKICAgICAgICAgICAgICAgICB2YXIgY2FudmFzID0gaW5zcGVjdGVk V2luZG93LmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZhcyIpOwotICAgICAgICAgICAgICAg IHZhciBjb250ZXh0ID0gUmVzb3VyY2Uud3JhcHBlZE9iamVjdChjYW52YXMuZ2V0Q29udGV4dCgi MmQiKSk7CisgICAgICAgICAgICAgICAgdmFyIGNvbnRleHQgPSAvKiogQHR5cGUge0NhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRH0gKi8gKFJlc291cmNlLndyYXBwZWRPYmplY3QoY2FudmFzLmdldENv bnRleHQoIjJkIikpKTsKICAgICAgICAgICAgICAgICBjYW52YXMud2lkdGggPSBpbWcud2lkdGg7 CiAgICAgICAgICAgICAgICAgY2FudmFzLmhlaWdodCA9IGltZy5oZWlnaHQ7CiAgICAgICAgICAg ICAgICAgY29udGV4dC5kcmF3SW1hZ2UoaW1nLCAwLCAwKTsKQEAgLTEwNCw3ICsxMDQsNyBAQCB2 YXIgVHlwZVV0aWxzID0gewogCiAgICAgICAgIGlmIChvYmogaW5zdGFuY2VvZiBIVE1MQ2FudmFz RWxlbWVudCkgewogICAgICAgICAgICAgdmFyIHJlc3VsdCA9IG9iai5jbG9uZU5vZGUodHJ1ZSk7 Ci0gICAgICAgICAgICB2YXIgY29udGV4dCA9IFJlc291cmNlLndyYXBwZWRPYmplY3QocmVzdWx0 LmdldENvbnRleHQoIjJkIikpOworICAgICAgICAgICAgdmFyIGNvbnRleHQgPSAvKiogQHR5cGUg e0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRH0gKi8gKFJlc291cmNlLndyYXBwZWRPYmplY3QocmVz dWx0LmdldENvbnRleHQoIjJkIikpKTsKICAgICAgICAgICAgIGNvbnRleHQuZHJhd0ltYWdlKG9i aiwgMCwgMCk7CiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9CkBAIC0yNjUs NyArMjY1LDkgQEAgQ2FjaGUucHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKCkK ICAgICB7CisgICAgICAgIC8qKiBAdHlwZSB7IU9iamVjdC48bnVtYmVyLCBPYmplY3Q+fSAqLwog ICAgICAgICB0aGlzLl9pdGVtcyA9IE9iamVjdC5jcmVhdGUobnVsbCk7CisgICAgICAgIC8qKiBA dHlwZSB7bnVtYmVyfSAqLwogICAgICAgICB0aGlzLl9zaXplID0gMDsKICAgICB9LAogCkBAIC00 MTksNyArNDIxLDcgQEAgQ2FsbC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAg ICAqIEBwYXJhbSB7Q2FjaGV9IGNhY2hlCisgICAgICogQHBhcmFtIHshQ2FjaGV9IGNhY2hlCiAg ICAgICogQHJldHVybiB7IVJlcGxheWFibGVDYWxsfQogICAgICAqLwogICAgIHRvUmVwbGF5YWJs ZTogZnVuY3Rpb24oY2FjaGUpCkBAIC00MzUsOCArNDM3LDggQEAgQ2FsbC5wcm90b3R5cGUgPSB7 CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7UmVwbGF5YWJsZUNhbGx9IHJlcGxh eWFibGVDYWxsCi0gICAgICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKKyAgICAgKiBAcGFyYW0geyFS ZXBsYXlhYmxlQ2FsbH0gcmVwbGF5YWJsZUNhbGwKKyAgICAgKiBAcGFyYW0geyFDYWNoZX0gY2Fj aGUKICAgICAgKiBAcmV0dXJuIHshQ2FsbH0KICAgICAgKi8KICAgICByZXBsYXk6IGZ1bmN0aW9u KHJlcGxheWFibGVDYWxsLCBjYWNoZSkKQEAgLTU2NSw3ICs1NjcsNyBAQCBSZXBsYXlhYmxlQ2Fs bC5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgcmVwbGF5OiBmdW5jdGlvbihjYWNoZSkKICAg ICB7Ci0gICAgICAgIHZhciBjYWxsID0gT2JqZWN0LmNyZWF0ZShDYWxsLnByb3RvdHlwZSk7Cisg ICAgICAgIHZhciBjYWxsID0gLyoqIEB0eXBlIHshQ2FsbH0gKi8gKE9iamVjdC5jcmVhdGUoQ2Fs bC5wcm90b3R5cGUpKTsKICAgICAgICAgcmV0dXJuIGNhbGwucmVwbGF5KHRoaXMsIGNhY2hlKTsK ICAgICB9CiB9CkBAIC02MTcsNyArNjE5LDcgQEAgUmVzb3VyY2Uud3JhcHBlZE9iamVjdCA9IGZ1 bmN0aW9uKG9iaikKIAogLyoqCiAgKiBAcGFyYW0ge1Jlc291cmNlfCp9IG9iagotICogQHBhcmFt IHtDYWNoZX0gY2FjaGUKKyAqIEBwYXJhbSB7IUNhY2hlfSBjYWNoZQogICogQHJldHVybiB7UmVw bGF5YWJsZVJlc291cmNlfCp9CiAgKi8KIFJlc291cmNlLnRvUmVwbGF5YWJsZSA9IGZ1bmN0aW9u KG9iaiwgY2FjaGUpCkBAIC02ODksNyArNjkxLDcgQEAgUmVzb3VyY2UucHJvdG90eXBlID0gewog ICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBw YXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqIEByZXR1cm4geyFSZXBsYXlhYmxlUmVzb3VyY2V9 CiAgICAgICovCiAgICAgdG9SZXBsYXlhYmxlOiBmdW5jdGlvbihjYWNoZSkKQEAgLTcxMCw4ICs3 MTIsOCBAQCBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAq IEBwYXJhbSB7T2JqZWN0fSBkYXRhCi0gICAgICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKKyAgICAg KiBAcGFyYW0geyFPYmplY3R9IGRhdGEKKyAgICAgKiBAcGFyYW0geyFDYWNoZX0gY2FjaGUKICAg ICAgKi8KICAgICBfcG9wdWxhdGVSZXBsYXlhYmxlRGF0YTogZnVuY3Rpb24oZGF0YSwgY2FjaGUp CiAgICAgewpAQCAtNzE5LDggKzcyMSw4IEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB9 LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtPYmplY3R9IGRhdGEKLSAgICAgKiBAcGFyYW0g e0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7IU9iamVjdH0gZGF0YQorICAgICAqIEBwYXJh bSB7IUNhY2hlfSBjYWNoZQogICAgICAqIEByZXR1cm4geyFSZXNvdXJjZX0KICAgICAgKi8KICAg ICByZXBsYXk6IGZ1bmN0aW9uKGRhdGEsIGNhY2hlKQpAQCAtNzM5LDggKzc0MSw4IEBAIFJlc291 cmNlLnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtPYmpl Y3R9IGRhdGEKLSAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7IU9i amVjdH0gZGF0YQorICAgICAqIEBwYXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqLwogICAgIF9k b1JlcGxheUNhbGxzOiBmdW5jdGlvbihkYXRhLCBjYWNoZSkKICAgICB7CkBAIC03NDksNyArNzUx LDcgQEAgUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBA cGFyYW0ge0NhbGx9IGNhbGwKKyAgICAgKiBAcGFyYW0geyFDYWxsfSBjYWxsCiAgICAgICovCiAg ICAgcHVzaENhbGw6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtOTkyLDcgKzk5NCw3IEBAIFJl cGxheWFibGVSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgcmVwbGF5OiBmdW5j dGlvbihjYWNoZSkKICAgICB7Ci0gICAgICAgIHZhciByZXN1bHQgPSBPYmplY3QuY3JlYXRlKHRo aXMuX3Byb3RvKTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IC8qKiBAdHlwZSB7IVJlc291cmNlfSAq LyAoT2JqZWN0LmNyZWF0ZSh0aGlzLl9wcm90bykpOwogICAgICAgICByZXN1bHQgPSByZXN1bHQu cmVwbGF5KHRoaXMuX2RhdGEsIGNhY2hlKQogICAgICAgICBjb25zb2xlLmFzc2VydChyZXN1bHQu X19wcm90b19fID09PSB0aGlzLl9wcm90bywgIldyb25nIHR5cGUgb2YgYSByZXBsYXkgcmVzdWx0 Iik7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CkBAIC0xMDYwLDggKzEwNjIsOCBAQCBmdW5jdGlv biBXZWJHTEJvdW5kUmVzb3VyY2Uod3JhcHBlZE9iamVjdCkKIFdlYkdMQm91bmRSZXNvdXJjZS5w cm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQG92ZXJyaWRlCi0gICAgICogQHBhcmFtIHtP YmplY3R9IGRhdGEKLSAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7 IU9iamVjdH0gZGF0YQorICAgICAqIEBwYXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqLwogICAg IF9wb3B1bGF0ZVJlcGxheWFibGVEYXRhOiBmdW5jdGlvbihkYXRhLCBjYWNoZSkKICAgICB7CkBA IC0xMDc0LDggKzEwNzYsOCBAQCBXZWJHTEJvdW5kUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAg ICAgLyoqCiAgICAgICogQG92ZXJyaWRlCi0gICAgICogQHBhcmFtIHtPYmplY3R9IGRhdGEKLSAg ICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7IU9iamVjdH0gZGF0YQor ICAgICAqIEBwYXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqLwogICAgIF9kb1JlcGxheUNhbGxz OiBmdW5jdGlvbihkYXRhLCBjYWNoZSkKICAgICB7CkBAIC0xMTA5LDYgKzExMTEsMTEgQEAgV2Vi R0xCb3VuZFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgfSk7CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7IU9iamVjdH0gZGF0YQorICAgICAqIEBwYXJhbSB7IUNhY2hl fSBjYWNoZQorICAgICAqIEByZXR1cm4ge1dlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlfQor ICAgICAqLwogICAgIF9yZXBsYXlDb250ZXh0UmVzb3VyY2U6IGZ1bmN0aW9uKGRhdGEsIGNhY2hl KQogICAgIHsKICAgICAgICAgdmFyIGNhbGxzID0gZGF0YS5jYWxsczsKQEAgLTExNDgsOCArMTE1 NSw4IEBAIGZ1bmN0aW9uIFdlYkdMVGV4dHVyZVJlc291cmNlKHdyYXBwZWRPYmplY3QpCiBXZWJH TFRleHR1cmVSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQG92ZXJyaWRl Ci0gICAgICogQHBhcmFtIHtPYmplY3R9IGRhdGEKLSAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNo ZQorICAgICAqIEBwYXJhbSB7IU9iamVjdH0gZGF0YQorICAgICAqIEBwYXJhbSB7IUNhY2hlfSBj YWNoZQogICAgICAqLwogICAgIF9kb1JlcGxheUNhbGxzOiBmdW5jdGlvbihkYXRhLCBjYWNoZSkK ICAgICB7CkBAIC0xMTY5LDExICsxMTc2LDExIEBAIFdlYkdMVGV4dHVyZVJlc291cmNlLnByb3Rv dHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBvdmVycmlkZQotICAgICAqIEBwYXJhbSB7Q2Fs bH0gY2FsbAorICAgICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KICAgICBwdXNoQ2Fs bDogZnVuY3Rpb24oY2FsbCkKICAgICB7Ci0gICAgICAgIHZhciBnbCA9IGNhbGwucmVzb3VyY2Uo KS53cmFwcGVkT2JqZWN0KCk7CisgICAgICAgIHZhciBnbCA9IFdlYkdMUmVuZGVyaW5nQ29udGV4 dFJlc291cmNlLmZvck9iamVjdChjYWxsLnJlc291cmNlKCkpLndyYXBwZWRPYmplY3QoKTsKICAg ICAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UuUGl4ZWxTdG9yZVBhcmFtZXRlcnMu Zm9yRWFjaChmdW5jdGlvbihwYXJhbWV0ZXIpIHsKICAgICAgICAgICAgIHZhciB2YWx1ZSA9IGds LmdldFBhcmFtZXRlcihnbFtwYXJhbWV0ZXJdKTsKICAgICAgICAgICAgIGlmICh0aGlzLl9zdGF0 ZVtwYXJhbWV0ZXJdICE9PSB2YWx1ZSkgewpAQCAtMTE5MCw3ICsxMTk3LDcgQEAgV2ViR0xUZXh0 dXJlUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogSGFuZGxlczogdGV4 UGFyYW1ldGVyaSwgdGV4UGFyYW1ldGVyZgotICAgICAqIEBwYXJhbSB7Q2FsbH0gY2FsbAorICAg ICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KICAgICBwdXNoQ2FsbF90ZXhQYXJhbWV0 ZXI6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtMTIwNiwxMyArMTIxMywxMyBAQCBXZWJHTFRl eHR1cmVSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogSGFuZGxlczogY29w eVRleEltYWdlMkQsIGNvcHlUZXhTdWJJbWFnZTJECiAgICAgICogY29weVRleEltYWdlMkQgYW5k IGNvcHlUZXhTdWJJbWFnZTJEIGRlZmluZSBhIHRleHR1cmUgaW1hZ2Ugd2l0aCBwaXhlbHMgZnJv bSB0aGUgY3VycmVudCBmcmFtZWJ1ZmZlci4KLSAgICAgKiBAcGFyYW0ge0NhbGx9IGNhbGwKKyAg ICAgKiBAcGFyYW0geyFDYWxsfSBjYWxsCiAgICAgICovCiAgICAgcHVzaENhbGxfY29weVRleElt YWdlMkQ6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewotICAgICAgICB2YXIgZ2xSZXNvdXJjZSA9IGNh bGwucmVzb3VyY2UoKTsKKyAgICAgICAgdmFyIGdsUmVzb3VyY2UgPSBXZWJHTFJlbmRlcmluZ0Nv bnRleHRSZXNvdXJjZS5mb3JPYmplY3QoY2FsbC5yZXNvdXJjZSgpKTsKICAgICAgICAgdmFyIGds ID0gZ2xSZXNvdXJjZS53cmFwcGVkT2JqZWN0KCk7Ci0gICAgICAgIHZhciBmcmFtZWJ1ZmZlclJl c291cmNlID0gZ2xSZXNvdXJjZS5jdXJyZW50QmluZGluZyhnbC5GUkFNRUJVRkZFUik7CisgICAg ICAgIHZhciBmcmFtZWJ1ZmZlclJlc291cmNlID0gLyoqIEB0eXBlIHtXZWJHTEZyYW1lYnVmZmVy UmVzb3VyY2V9ICovIGdsUmVzb3VyY2UuY3VycmVudEJpbmRpbmcoZ2wuRlJBTUVCVUZGRVIpOwog ICAgICAgICBpZiAoZnJhbWVidWZmZXJSZXNvdXJjZSkKICAgICAgICAgICAgIHRoaXMucHVzaENh bGwobmV3IENhbGwoZ2xSZXNvdXJjZSwgImJpbmRGcmFtZWJ1ZmZlciIsIFtnbC5GUkFNRUJVRkZF UiwgZnJhbWVidWZmZXJSZXNvdXJjZV0pKTsKICAgICAgICAgZWxzZSB7CkBAIC0xMjM2LDkgKzEy NDMsMTggQEAgZnVuY3Rpb24gV2ViR0xQcm9ncmFtUmVzb3VyY2Uod3JhcHBlZE9iamVjdCkKIAog V2ViR0xQcm9ncmFtUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIC8qKgorICAgICAqIEBvdmVy cmlkZSAob3ZlcnJpZGVzIEByZXR1cm4gdHlwZSkKKyAgICAgKiBAcmV0dXJuIHtXZWJHTFByb2dy YW19CisgICAgICovCisgICAgd3JhcHBlZE9iamVjdDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3dyYXBwZWRPYmplY3Q7CisgICAgfSwKKworICAgIC8qKgogICAgICAq IEBvdmVycmlkZQotICAgICAqIEBwYXJhbSB7T2JqZWN0fSBkYXRhCi0gICAgICogQHBhcmFtIHtD YWNoZX0gY2FjaGUKKyAgICAgKiBAcGFyYW0geyFPYmplY3R9IGRhdGEKKyAgICAgKiBAcGFyYW0g eyFDYWNoZX0gY2FjaGUKICAgICAgKi8KICAgICBfcG9wdWxhdGVSZXBsYXlhYmxlRGF0YTogZnVu Y3Rpb24oZGF0YSwgY2FjaGUpCiAgICAgewpAQCAtMTI0OSw3ICsxMjY1LDcgQEAgV2ViR0xQcm9n cmFtUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgICAgICB2YXIgb3JpZ2luYWxFcnJvcnMgPSBn bFJlc291cmNlLmdldEFsbEVycm9ycygpOwogCiAgICAgICAgIHZhciB1bmlmb3JtcyA9IFtdOwot ICAgICAgICB2YXIgdW5pZm9ybXNDb3VudCA9IGdsLmdldFByb2dyYW1QYXJhbWV0ZXIocHJvZ3Jh bSwgZ2wuQUNUSVZFX1VOSUZPUk1TKTsKKyAgICAgICAgdmFyIHVuaWZvcm1zQ291bnQgPSAvKiog QHR5cGUge251bWJlcn0gKi8gZ2wuZ2V0UHJvZ3JhbVBhcmFtZXRlcihwcm9ncmFtLCBnbC5BQ1RJ VkVfVU5JRk9STVMpOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHVuaWZvcm1zQ291bnQ7 ICsraSkgewogICAgICAgICAgICAgdmFyIGFjdGl2ZUluZm8gPSBnbC5nZXRBY3RpdmVVbmlmb3Jt KHByb2dyYW0sIGkpOwogICAgICAgICAgICAgaWYgKCFhY3RpdmVJbmZvKQpAQCAtMTI3MSw4ICsx Mjg3LDggQEAgV2ViR0xQcm9ncmFtUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAg ICAgICogQG92ZXJyaWRlCi0gICAgICogQHBhcmFtIHtPYmplY3R9IGRhdGEKLSAgICAgKiBAcGFy YW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7IU9iamVjdH0gZGF0YQorICAgICAqIEBw YXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqLwogICAgIF9kb1JlcGxheUNhbGxzOiBmdW5jdGlv bihkYXRhLCBjYWNoZSkKICAgICB7CkBAIC0xMjgwLDcgKzEyOTYsNyBAQCBXZWJHTFByb2dyYW1S ZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBnbCA9IFdlYkdMUmVuZGVyaW5nQ29u dGV4dFJlc291cmNlLmZvck9iamVjdCh0aGlzKS53cmFwcGVkT2JqZWN0KCk7CiAgICAgICAgIHZh ciBwcm9ncmFtID0gdGhpcy53cmFwcGVkT2JqZWN0KCk7CiAKLSAgICAgICAgdmFyIG9yaWdpbmFs UHJvZ3JhbSA9IGdsLmdldFBhcmFtZXRlcihnbC5DVVJSRU5UX1BST0dSQU0pOworICAgICAgICB2 YXIgb3JpZ2luYWxQcm9ncmFtID0gLyoqIEB0eXBlIHtXZWJHTFByb2dyYW19ICovIChnbC5nZXRQ YXJhbWV0ZXIoZ2wuQ1VSUkVOVF9QUk9HUkFNKSk7CiAgICAgICAgIHZhciBjdXJyZW50UHJvZ3Jh bSA9IG9yaWdpbmFsUHJvZ3JhbTsKICAgICAgICAgCiAgICAgICAgIGRhdGEudW5pZm9ybXMuZm9y RWFjaChmdW5jdGlvbih1bmlmb3JtKSB7CkBAIC0xMzM3LDcgKzEzNTMsNyBAQCBXZWJHTFByb2dy YW1SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAb3ZlcnJpZGUKLSAg ICAgKiBAcGFyYW0ge0NhbGx9IGNhbGwKKyAgICAgKiBAcGFyYW0geyFDYWxsfSBjYWxsCiAgICAg ICovCiAgICAgcHVzaENhbGw6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtMTM2MSw3ICsxMzc3 LDcgQEAgZnVuY3Rpb24gV2ViR0xTaGFkZXJSZXNvdXJjZSh3cmFwcGVkT2JqZWN0KQogV2ViR0xT aGFkZXJSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICogQG92ZXJyaWRlCi0g ICAgICogQHBhcmFtIHtDYWxsfSBjYWxsCisgICAgICogQHBhcmFtIHshQ2FsbH0gY2FsbAogICAg ICAqLwogICAgIHB1c2hDYWxsOiBmdW5jdGlvbihjYWxsKQogICAgIHsKQEAgLTEzODUsNyArMTQw MSw3IEBAIGZ1bmN0aW9uIFdlYkdMQnVmZmVyUmVzb3VyY2Uod3JhcHBlZE9iamVjdCkKIFdlYkdM QnVmZmVyUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBvdmVycmlkZQot ICAgICAqIEBwYXJhbSB7Q2FsbH0gY2FsbAorICAgICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAg ICAgKi8KICAgICBwdXNoQ2FsbDogZnVuY3Rpb24oY2FsbCkKICAgICB7CkBAIC0xNDA5LDcgKzE0 MjUsNyBAQCBmdW5jdGlvbiBXZWJHTEZyYW1lYnVmZmVyUmVzb3VyY2Uod3JhcHBlZE9iamVjdCkK IFdlYkdMRnJhbWVidWZmZXJSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCiAgICAgICog QG92ZXJyaWRlCi0gICAgICogQHBhcmFtIHtDYWxsfSBjYWxsCisgICAgICogQHBhcmFtIHshQ2Fs bH0gY2FsbAogICAgICAqLwogICAgIHB1c2hDYWxsOiBmdW5jdGlvbihjYWxsKQogICAgIHsKQEAg LTE0MzIsNyArMTQ0OCw3IEBAIGZ1bmN0aW9uIFdlYkdMUmVuZGVyYnVmZmVyUmVzb3VyY2Uod3Jh cHBlZE9iamVjdCkKIFdlYkdMUmVuZGVyYnVmZmVyUmVzb3VyY2UucHJvdG90eXBlID0gewogICAg IC8qKgogICAgICAqIEBvdmVycmlkZQotICAgICAqIEBwYXJhbSB7Q2FsbH0gY2FsbAorICAgICAq IEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KICAgICBwdXNoQ2FsbDogZnVuY3Rpb24oY2Fs bCkKICAgICB7CkBAIC0xNTYxLDYgKzE1NzcsMTUgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVz b3VyY2UuZm9yT2JqZWN0ID0gZnVuY3Rpb24ob2JqKQogCiBXZWJHTFJlbmRlcmluZ0NvbnRleHRS ZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCisgICAgICogQG92ZXJyaWRlIChvdmVycmlk ZXMgQHJldHVybiB0eXBlKQorICAgICAqIEByZXR1cm4ge1dlYkdMUmVuZGVyaW5nQ29udGV4dH0K KyAgICAgKi8KKyAgICB3cmFwcGVkT2JqZWN0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBy ZXR1cm4gdGhpcy5fd3JhcHBlZE9iamVjdDsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICogQHJl dHVybiB7QXJyYXkuPG51bWJlcj59CiAgICAgICovCiAgICAgZ2V0QWxsRXJyb3JzOiBmdW5jdGlv bigpCkBAIC0xNjM4LDEzICsxNjYzLDE0IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNl LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBhZGRFeHRlbnNpb246IGZ1bmN0aW9uKG5hbWUp CiAgICAgeworICAgICAgICAvLyBGSVhNRTogV3JhcCBPRVNfdmVydGV4X2FycmF5X29iamVjdCBl eHRlbnNpb24uCiAgICAgICAgIHRoaXMuX2V4dGVuc2lvbnNbbmFtZV0gPSB0cnVlOwogICAgIH0s CiAKICAgICAvKioKICAgICAgKiBAb3ZlcnJpZGUKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gZGF0 YQotICAgICAqIEBwYXJhbSB7Q2FjaGV9IGNhY2hlCisgICAgICogQHBhcmFtIHshT2JqZWN0fSBk YXRhCisgICAgICogQHBhcmFtIHshQ2FjaGV9IGNhY2hlCiAgICAgICovCiAgICAgX3BvcHVsYXRl UmVwbGF5YWJsZURhdGE6IGZ1bmN0aW9uKGRhdGEsIGNhY2hlKQogICAgIHsKQEAgLTE2NjQsNyAr MTY5MCw3IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgfSk7CiAKICAgICAgICAgLy8gVkVSVEVYX0FUVFJJQl9BUlJBWVMKLSAgICAgICAgdmFy IG1heFZlcnRleEF0dHJpYnMgPSBnbC5nZXRQYXJhbWV0ZXIoZ2wuTUFYX1ZFUlRFWF9BVFRSSUJT KTsKKyAgICAgICAgdmFyIG1heFZlcnRleEF0dHJpYnMgPSAvKiogQHR5cGUge251bWJlcn0gKi8g KGdsLmdldFBhcmFtZXRlcihnbC5NQVhfVkVSVEVYX0FUVFJJQlMpKTsKICAgICAgICAgdmFyIHZl cnRleEF0dHJpYlBhcmFtZXRlcnMgPSBbIlZFUlRFWF9BVFRSSUJfQVJSQVlfQlVGRkVSX0JJTkRJ TkciLCAiVkVSVEVYX0FUVFJJQl9BUlJBWV9FTkFCTEVEIiwgIlZFUlRFWF9BVFRSSUJfQVJSQVlf U0laRSIsICJWRVJURVhfQVRUUklCX0FSUkFZX1NUUklERSIsICJWRVJURVhfQVRUUklCX0FSUkFZ X1RZUEUiLCAiVkVSVEVYX0FUVFJJQl9BUlJBWV9OT1JNQUxJWkVEIiwgIkNVUlJFTlRfVkVSVEVY X0FUVFJJQiJdOwogICAgICAgICB2YXIgdmVydGV4QXR0cmliU3RhdGVzID0gW107CiAgICAgICAg IGZvciAodmFyIGkgPSAwOyBpIDwgbWF4VmVydGV4QXR0cmliczsgKytpKSB7CkBAIC0xNjc4LDgg KzE3MDQsOCBAQCBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIGdsU3RhdGUudmVydGV4QXR0cmliU3RhdGVzID0gdmVydGV4QXR0cmliU3RhdGVzOwog CiAgICAgICAgIC8vIFRFWFRVUkVTCi0gICAgICAgIHZhciBjdXJyZW50VGV4dHVyZUJpbmRpbmcg PSBnbC5nZXRQYXJhbWV0ZXIoZ2wuQUNUSVZFX1RFWFRVUkUpOwotICAgICAgICB2YXIgbWF4VGV4 dHVyZUltYWdlVW5pdHMgPSBnbC5nZXRQYXJhbWV0ZXIoZ2wuTUFYX1RFWFRVUkVfSU1BR0VfVU5J VFMpOworICAgICAgICB2YXIgY3VycmVudFRleHR1cmVCaW5kaW5nID0gLyoqIEB0eXBlIHtudW1i ZXJ9ICovIChnbC5nZXRQYXJhbWV0ZXIoZ2wuQUNUSVZFX1RFWFRVUkUpKTsKKyAgICAgICAgdmFy IG1heFRleHR1cmVJbWFnZVVuaXRzID0gLyoqIEB0eXBlIHtudW1iZXJ9ICovIChnbC5nZXRQYXJh bWV0ZXIoZ2wuTUFYX1RFWFRVUkVfSU1BR0VfVU5JVFMpKTsKICAgICAgICAgdmFyIHRleHR1cmVC aW5kaW5ncyA9IFtdOwogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1heFRleHR1cmVJbWFn ZVVuaXRzOyArK2kpIHsKICAgICAgICAgICAgIGdsLmFjdGl2ZVRleHR1cmUoZ2wuVEVYVFVSRTAg KyBpKTsKQEAgLTE2OTksOCArMTcyNSw4IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNl LnByb3RvdHlwZSA9IHsKIAogICAgIC8qKgogICAgICAqIEBvdmVycmlkZQotICAgICAqIEBwYXJh bSB7T2JqZWN0fSBkYXRhCi0gICAgICogQHBhcmFtIHtDYWNoZX0gY2FjaGUKKyAgICAgKiBAcGFy YW0geyFPYmplY3R9IGRhdGEKKyAgICAgKiBAcGFyYW0geyFDYWNoZX0gY2FjaGUKICAgICAgKi8K ICAgICBfZG9SZXBsYXlDYWxsczogZnVuY3Rpb24oZGF0YSwgY2FjaGUpCiAgICAgewpAQCAtMTg2 OCw3ICsxODk0LDcgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UucHJvdG90eXBlID0g ewogCiAgICAgICAgICAgICAvKioKICAgICAgICAgICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtZXRo b2ROYW1lCi0gICAgICAgICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKHRoaXM6UmVzb3VyY2UsIENh bGwpPX0gcHVzaENhbGxGdW5jCisgICAgICAgICAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKHRoaXM6 UmVzb3VyY2UsICFDYWxsKT19IHB1c2hDYWxsRnVuYwogICAgICAgICAgICAgICovCiAgICAgICAg ICAgICBmdW5jdGlvbiBzdGF0ZU1vZGlmeWluZ1dyYXBGdW5jdGlvbihtZXRob2ROYW1lLCBwdXNo Q2FsbEZ1bmMpCiAgICAgICAgICAgICB7CkBAIC0yMDIwLDkgKzIwNDYsMTggQEAgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEUmVzb3VyY2UuVHJhbnNmb3JtYXRpb25NYXRyaXhNZXRob2RzID0gWwog CiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoq CisgICAgICogQG92ZXJyaWRlIChvdmVycmlkZXMgQHJldHVybiB0eXBlKQorICAgICAqIEByZXR1 cm4ge0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRH0KKyAgICAgKi8KKyAgICB3cmFwcGVkT2JqZWN0 OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fd3JhcHBlZE9iamVjdDsK KyAgICB9LAorCisgICAgLyoqCiAgICAgICogQG92ZXJyaWRlCi0gICAgICogQHBhcmFtIHtPYmpl Y3R9IGRhdGEKLSAgICAgKiBAcGFyYW0ge0NhY2hlfSBjYWNoZQorICAgICAqIEBwYXJhbSB7IU9i amVjdH0gZGF0YQorICAgICAqIEBwYXJhbSB7IUNhY2hlfSBjYWNoZQogICAgICAqLwogICAgIF9w b3B1bGF0ZVJlcGxheWFibGVEYXRhOiBmdW5jdGlvbihkYXRhLCBjYWNoZSkKICAgICB7CkBAIC0y MDM4LDggKzIwNzMsOCBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRSZXNvdXJjZS5wcm90b3R5 cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAb3ZlcnJpZGUKLSAgICAgKiBAcGFyYW0ge09iamVj dH0gZGF0YQotICAgICAqIEBwYXJhbSB7Q2FjaGV9IGNhY2hlCisgICAgICogQHBhcmFtIHshT2Jq ZWN0fSBkYXRhCisgICAgICogQHBhcmFtIHshQ2FjaGV9IGNhY2hlCiAgICAgICovCiAgICAgX2Rv UmVwbGF5Q2FsbHM6IGZ1bmN0aW9uKGRhdGEsIGNhY2hlKQogICAgIHsKQEAgLTIwNjYsNyArMjEw MSw3IEBAIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAg ICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtDYWxsfSBjYWxsCisgICAgICogQHBhcmFt IHshQ2FsbH0gY2FsbAogICAgICAqLwogICAgIHB1c2hDYWxsX3NldFRyYW5zZm9ybTogZnVuY3Rp b24oY2FsbCkKICAgICB7CkBAIC0yMDc5LDcgKzIxMTQsNyBAQCBDYW52YXNSZW5kZXJpbmdDb250 ZXh0MkRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBw YXJhbSB7Q2FsbH0gY2FsbAorICAgICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KICAg ICBwdXNoQ2FsbF9iZWdpblBhdGg6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewpAQCAtMjA5MCw3ICsy MTI1LDcgQEAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEUmVzb3VyY2UucHJvdG90eXBlID0gewog ICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge0NhbGx9IGNhbGwKKyAgICAgKiBAcGFy YW0geyFDYWxsfSBjYWxsCiAgICAgICovCiAgICAgcHVzaENhbGxfc2F2ZTogZnVuY3Rpb24oY2Fs bCkKICAgICB7CkBAIC0yMDk5LDcgKzIxMzQsNyBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRS ZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7 Q2FsbH0gY2FsbAorICAgICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KICAgICBwdXNo Q2FsbF9yZXN0b3JlOiBmdW5jdGlvbihjYWxsKQogICAgIHsKQEAgLTIyODYsNyArMjMyMSw3IEBA IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRFJlc291cmNlLnByb3RvdHlwZSA9IHsKIAogICAgICAg ICAgICAgLyoqCiAgICAgICAgICAgICAgKiBAcGFyYW0ge3N0cmluZ30gbWV0aG9kTmFtZQotICAg ICAgICAgICAgICogQHBhcmFtIHtmdW5jdGlvbih0aGlzOlJlc291cmNlLCBDYWxsKT19IGZ1bmMK KyAgICAgICAgICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24odGhpczpSZXNvdXJjZSwgIUNhbGwpPX0g ZnVuYwogICAgICAgICAgICAgICovCiAgICAgICAgICAgICBmdW5jdGlvbiBzdGF0ZU1vZGlmeWlu Z1dyYXBGdW5jdGlvbihtZXRob2ROYW1lLCBmdW5jKQogICAgICAgICAgICAgewpAQCAtMjQ3Nyw3 ICsyNTEyLDcgQEAgUmVzb3VyY2VUcmFja2luZ01hbmFnZXIucHJvdG90eXBlID0gewogICAgIH0s CiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge1Jlc291cmNlfSByZXNvdXJjZQorICAgICAqIEBw YXJhbSB7IVJlc291cmNlfSByZXNvdXJjZQogICAgICAqLwogICAgIHJlZ2lzdGVyUmVzb3VyY2U6 IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsK