95533 2012-08-31 00:42:01 -0700 Web Inspector: [WebGL] Make wrap functions initialization lazy 2012-08-31 02:14:24 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 95443 0 aandrey aandrey apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 709349 0 aandrey 2012-08-31 00:42:01 -0700 WebGL wrap functions initialization is not always needed to be executed. 709350 1 161629 aandrey 2012-08-31 00:46:33 -0700 Created attachment 161629 Patch 709412 2 161629 webkit.review.bot 2012-08-31 02:14:21 -0700 Comment on attachment 161629 Patch Clearing flags on attachment: 161629 Committed r127239: <http://trac.webkit.org/changeset/127239> 709413 3 webkit.review.bot 2012-08-31 02:14:24 -0700 All reviewed patches have been landed. Closing bug. 161629 2012-08-31 00:46:33 -0700 2012-08-31 02:14:21 -0700 Patch bug-95533-20120831114620.patch text/plain 15890 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwNTlhMmNiNjZmZWJl NjZmNjY3NmI1ZTlhZWY2M2MxZmRlYjM4My4uZDUyMzc0YTk2ZTZiNTAwNmQwN2FjZGE4YjgyZTFk ZjkzYTJjYjU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTMxICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJHTF0gTWFrZSB3cmFwIGZ1bmN0aW9ucyBpbml0aWFsaXphdGlvbiBsYXp5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTUzMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYkdMIHdyYXAgZnVu Y3Rpb25zIGluaXRpYWxpemF0aW9uIGlzIG5vdCBhbHdheXMgbmVlZGVkIHRvIGJlIGV4ZWN1dGVk OiBmb3IgZXhhbXBsZSwgd2hlbiB3ZSB3aWxsIGluc3RydW1lbnQgYSAyRCBjYW52YXMuCisgICAg ICAgIERyaXZlLWJ5OiBmaXhlZCB2YXJpYWJsZSBuYW1pbmdzLCBtb3ZlZCBkdXBsaWNhdGVkIGNv ZGUgaW50byBhIHNtYWxsIGF1eGlsaWFyeSBmdW5jdGlvbi4KKworICAgICAgICAqIGluc3BlY3Rv ci9JbmplY3RlZFNjcmlwdFdlYkdMTW9kdWxlU291cmNlLmpzOgorICAgICAgICAoLik6CisKIDIw MTItMDgtMzAgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgQnVpbGQgZml4IGZvciBXaW5DRSBhZnRlciByMTI2OTc0LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0V2ViR0xNb2R1bGVTb3VyY2UuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRXZWJHTE1vZHVsZVNvdXJjZS5q cwppbmRleCAyNGUyOTVmNzU5NjljZmNkZGIzYTA3YzhmMTFkZWE1Y2U1OGY1MTYzLi5iOTM1ODZh MDg4NmMwMmNiMjZkNzI4YzNlMTFmNjVlMmZjODI0NTQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRXZWJHTE1vZHVsZVNvdXJjZS5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRXZWJHTE1vZHVsZVNvdXJjZS5q cwpAQCAtNDAsNyArNDAsNyBAQCB2YXIgVHlwZVV0aWxzID0gewogICAgICAqIGh0dHA6Ly93d3cu a2hyb25vcy5vcmcvcmVnaXN0cnkvdHlwZWRhcnJheS9zcGVjcy9sYXRlc3QvIzcKICAgICAgKiBA dHlwZSB7QXJyYXkuPEZ1bmN0aW9uPn0KICAgICAgKi8KLSAgICB0eXBlZEFycmF5Q2xhc3Nlczog KGZ1bmN0aW9uKHR5cGVOYW1lcykgeworICAgIF90eXBlZEFycmF5Q2xhc3NlczogKGZ1bmN0aW9u KHR5cGVOYW1lcykgewogICAgICAgICB2YXIgcmVzdWx0ID0gW107CiAgICAgICAgIGZvciAodmFy IGkgPSAwLCBuID0gdHlwZU5hbWVzLmxlbmd0aDsgaSA8IG47ICsraSkgewogICAgICAgICAgICAg aWYgKGluc3BlY3RlZFdpbmRvd1t0eXBlTmFtZXNbaV1dKQpAQCAtNTUsNyArNTUsNyBAQCB2YXIg VHlwZVV0aWxzID0gewogICAgICAqLwogICAgIHR5cGVkQXJyYXlDbGFzczogZnVuY3Rpb24oYXJy YXkpCiAgICAgewotICAgICAgICB2YXIgY2xhc3NlcyA9IFR5cGVVdGlscy50eXBlZEFycmF5Q2xh c3NlczsKKyAgICAgICAgdmFyIGNsYXNzZXMgPSBUeXBlVXRpbHMuX3R5cGVkQXJyYXlDbGFzc2Vz OwogICAgICAgICBmb3IgKHZhciBpID0gMCwgbiA9IGNsYXNzZXMubGVuZ3RoOyBpIDwgbjsgKytp KSB7CiAgICAgICAgICAgICBpZiAoYXJyYXkgaW5zdGFuY2VvZiBjbGFzc2VzW2ldKQogICAgICAg ICAgICAgICAgIHJldHVybiBjbGFzc2VzW2ldOwpAQCAtOTMsNyArOTMsNyBAQCB2YXIgVHlwZVV0 aWxzID0gewogCiAgICAgICAgIGlmIChvYmogaW5zdGFuY2VvZiBIVE1MQ2FudmFzRWxlbWVudCkg ewogICAgICAgICAgICAgdmFyIHJlc3VsdCA9IG9iai5jbG9uZU5vZGUodHJ1ZSk7Ci0gICAgICAg ICAgICB2YXIgY29udGV4dCA9IHJlc3VsdC5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAg dmFyIGNvbnRleHQgPSBSZXNvdXJjZS53cmFwcGVkT2JqZWN0KHJlc3VsdC5nZXRDb250ZXh0KCIy ZCIpKTsKICAgICAgICAgICAgIGNvbnRleHQuZHJhd0ltYWdlKG9iaiwgMCwgMCk7CiAgICAgICAg ICAgICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9CkBAIC0xMjEsMTQgKzEyMSwxMSBAQCB2YXIg VHlwZVV0aWxzID0gewogICAgICAqLwogICAgIF9kdW1teUNhbnZhczJkQ29udGV4dDogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRleHQgPSBUeXBlVXRpbHMuX2R1bW15Q2FudmFz MmRDb250ZXh0OworICAgICAgICB2YXIgY29udGV4dCA9IFR5cGVVdGlscy5fZHVtbXlDYW52YXMy ZENvbnRleHRJbnN0YW5jZTsKICAgICAgICAgaWYgKCFjb250ZXh0KSB7CiAgICAgICAgICAgICB2 YXIgY2FudmFzID0gaW5zcGVjdGVkV2luZG93LmRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImNhbnZh cyIpOwotICAgICAgICAgICAgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOwotICAg ICAgICAgICAgdmFyIGNvbnRleHRSZXNvdXJjZSA9IFJlc291cmNlLmZvck9iamVjdChjb250ZXh0 KTsKLSAgICAgICAgICAgIGlmIChjb250ZXh0UmVzb3VyY2UpCi0gICAgICAgICAgICAgICAgY29u dGV4dCA9IGNvbnRleHRSZXNvdXJjZS53cmFwcGVkT2JqZWN0KCk7Ci0gICAgICAgICAgICBUeXBl VXRpbHMuX2R1bW15Q2FudmFzMmRDb250ZXh0ID0gY29udGV4dDsKKyAgICAgICAgICAgIGNvbnRl eHQgPSAvKiogQHR5cGUge0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRH0gKi8gUmVzb3VyY2Uud3Jh cHBlZE9iamVjdChjYW52YXMuZ2V0Q29udGV4dCgiMmQiKSk7CisgICAgICAgICAgICBUeXBlVXRp bHMuX2R1bW15Q2FudmFzMmRDb250ZXh0SW5zdGFuY2UgPSBjb250ZXh0OwogICAgICAgICB9CiAg ICAgICAgIHJldHVybiBjb250ZXh0OwogICAgIH0KQEAgLTM4NCw2ICszODEsMTYgQEAgUmVzb3Vy Y2UuZm9yT2JqZWN0ID0gZnVuY3Rpb24ob2JqKQogCiAvKioKICAqIEBwYXJhbSB7UmVzb3VyY2V8 Kn0gb2JqCisgKiBAcmV0dXJuIHsqfQorICovCitSZXNvdXJjZS53cmFwcGVkT2JqZWN0ID0gZnVu Y3Rpb24ob2JqKQoreworICAgIHZhciByZXNvdXJjZSA9IFJlc291cmNlLmZvck9iamVjdChvYmop OworICAgIHJldHVybiByZXNvdXJjZSA/IHJlc291cmNlLndyYXBwZWRPYmplY3QoKSA6IG9iajsK K30KKworLyoqCisgKiBAcGFyYW0ge1Jlc291cmNlfCp9IG9iagogICogQHBhcmFtIHtDYWNoZX0g Y2FjaGUKICAqIEByZXR1cm4ge1JlcGxheWFibGVSZXNvdXJjZXwqfQogICovCkBAIC03NTMsMTEg Kzc2MCw2IEBAIGZ1bmN0aW9uIFdlYkdMUHJvZ3JhbVJlc291cmNlKHdyYXBwZWRPYmplY3QpCiAg ICAgUmVzb3VyY2UuY2FsbCh0aGlzLCB3cmFwcGVkT2JqZWN0KTsKIH0KIAotLyoqCi0gKiBAdHlw ZSB7T2JqZWN0LjxudW1iZXIsc3RyaW5nPn0KLSAqLwotV2ViR0xQcm9ncmFtUmVzb3VyY2UuVW5p Zm9ybU1ldGhvZE5hbWVzID0gbnVsbDsKLQogV2ViR0xQcm9ncmFtUmVzb3VyY2UucHJvdG90eXBl ID0gewogICAgIC8qKgogICAgICAqIEBvdmVycmlkZQpAQCAtNzY2LDcgKzc2OCw4IEBAIFdlYkdM UHJvZ3JhbVJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfcG9wdWxhdGVSZXBs YXlhYmxlRGF0YTogZnVuY3Rpb24oZGF0YSwgY2FjaGUpCiAgICAgewotICAgICAgICB2YXIgZ2wg PSBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5mb3JPYmplY3QodGhpcykud3JhcHBlZE9i amVjdCgpOworICAgICAgICB2YXIgZ2xSZXNvdXJjZSA9IFdlYkdMUmVuZGVyaW5nQ29udGV4dFJl c291cmNlLmZvck9iamVjdCh0aGlzKTsKKyAgICAgICAgdmFyIGdsID0gZ2xSZXNvdXJjZS53cmFw cGVkT2JqZWN0KCk7CiAgICAgICAgIHZhciBwcm9ncmFtID0gdGhpcy53cmFwcGVkT2JqZWN0KCk7 CiAKICAgICAgICAgdmFyIHVuaWZvcm1zID0gW107CkBAIC04MjgsNyArODMxLDcgQEAgV2ViR0xQ cm9ncmFtUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF91bmlmb3JtTWV0aG9k TmFtZUJ5VHlwZTogZnVuY3Rpb24oZ2wsIHR5cGUpCiAgICAgewotICAgICAgICB2YXIgdW5pZm9y bU1ldGhvZE5hbWVzID0gV2ViR0xQcm9ncmFtUmVzb3VyY2UuVW5pZm9ybU1ldGhvZE5hbWVzOwor ICAgICAgICB2YXIgdW5pZm9ybU1ldGhvZE5hbWVzID0gV2ViR0xQcm9ncmFtUmVzb3VyY2UuX3Vu aWZvcm1NZXRob2ROYW1lczsKICAgICAgICAgaWYgKCF1bmlmb3JtTWV0aG9kTmFtZXMpIHsKICAg ICAgICAgICAgIHVuaWZvcm1NZXRob2ROYW1lcyA9IHt9OwogICAgICAgICAgICAgdW5pZm9ybU1l dGhvZE5hbWVzW2dsLkZMT0FUXSA9ICJ1bmlmb3JtMWYiOwpAQCAtODQ4LDcgKzg1MSw3IEBAIFdl YkdMUHJvZ3JhbVJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVuaWZvcm1NZXRo b2ROYW1lc1tnbC5GTE9BVF9NQVQyXSA9ICJ1bmlmb3JtTWF0cml4MmZ2IjsKICAgICAgICAgICAg IHVuaWZvcm1NZXRob2ROYW1lc1tnbC5GTE9BVF9NQVQzXSA9ICJ1bmlmb3JtTWF0cml4M2Z2IjsK ICAgICAgICAgICAgIHVuaWZvcm1NZXRob2ROYW1lc1tnbC5GTE9BVF9NQVQ0XSA9ICJ1bmlmb3Jt TWF0cml4NGZ2IjsKLSAgICAgICAgICAgIFdlYkdMUHJvZ3JhbVJlc291cmNlLlVuaWZvcm1NZXRo b2ROYW1lcyA9IHVuaWZvcm1NZXRob2ROYW1lczsKKyAgICAgICAgICAgIFdlYkdMUHJvZ3JhbVJl c291cmNlLl91bmlmb3JtTWV0aG9kTmFtZXMgPSB1bmlmb3JtTWV0aG9kTmFtZXM7CiAgICAgICAg IH0KICAgICAgICAgY29uc29sZS5hc3NlcnQodW5pZm9ybU1ldGhvZE5hbWVzW3R5cGVdLCAiVW5r bm93biB1bmlmb3JtIHR5cGUgIiArIHR5cGUpOwogICAgICAgICByZXR1cm4gdW5pZm9ybU1ldGhv ZE5hbWVzW3R5cGVdOwpAQCAtOTcxLDggKzk3NCwxMCBAQCBXZWJHTFJlbmRlcmJ1ZmZlclJlc291 cmNlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJHTEJvdW5kUmVzb3VyY2UucHJvdG90eXBlOwog ZnVuY3Rpb24gV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UoZ2xDb250ZXh0LCByZXBsYXlD b250ZXh0Q2FsbGJhY2spCiB7CiAgICAgUmVzb3VyY2UuY2FsbCh0aGlzLCBnbENvbnRleHQpOwot ICAgIHRoaXMuX3Byb3h5T2JqZWN0ID0gbnVsbDsKICAgICB0aGlzLl9yZXBsYXlDb250ZXh0Q2Fs bGJhY2sgPSByZXBsYXlDb250ZXh0Q2FsbGJhY2s7CisgICAgdGhpcy5fcHJveHlPYmplY3QgPSBu dWxsOworICAgIC8qKiBAdHlwZSB7T2JqZWN0LjxudW1iZXIsIGJvb2xlYW4+fSAqLworICAgIHRo aXMuX2N1c3RvbUVycm9ycyA9IG51bGw7CiB9CiAKIC8qKgpAQCAtMTE0NywxMiArMTE1MiwxMSBA QCBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgX2RvUmVwbGF5Q2FsbHM6IGZ1bmN0aW9uKGRhdGEsIGNhY2hlKQogICAgIHsKLSAgICAgICAg dGhpcy5fcHJveHlPYmplY3QgPSBudWxsOwogICAgICAgICB0aGlzLl9yZXBsYXlDb250ZXh0Q2Fs bGJhY2sgPSBkYXRhLnJlcGxheUNvbnRleHRDYWxsYmFjazsKKyAgICAgICAgdGhpcy5fcHJveHlP YmplY3QgPSBudWxsOworICAgICAgICB0aGlzLl9jdXN0b21FcnJvcnMgPSBudWxsOwogCi0gICAg ICAgIHZhciBjb250ZXh0ID0gdGhpcy5fcmVwbGF5Q29udGV4dENhbGxiYWNrKCk7Ci0gICAgICAg IHZhciBjb250ZXh0UmVzb3VyY2UgPSBSZXNvdXJjZS5mb3JPYmplY3QoY29udGV4dCk7Ci0gICAg ICAgIHZhciBnbCA9IGNvbnRleHRSZXNvdXJjZSA/IGNvbnRleHRSZXNvdXJjZS53cmFwcGVkT2Jq ZWN0KCkgOiBjb250ZXh0OworICAgICAgICB2YXIgZ2wgPSBSZXNvdXJjZS53cmFwcGVkT2JqZWN0 KHRoaXMuX3JlcGxheUNvbnRleHRDYWxsYmFjaygpKTsKICAgICAgICAgdGhpcy5zZXRXcmFwcGVk T2JqZWN0KGdsKTsKIAogICAgICAgICB2YXIgZ2xTdGF0ZSA9IGRhdGEuZ2xTdGF0ZTsKQEAgLTEy OTEsMzYgKzEyOTUsMzggQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UucHJvdG90eXBl ID0gewogICAgICAqLwogICAgIF93cmFwT2JqZWN0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAg ICB2YXIgZ2xDb250ZXh0ID0gdGhpcy53cmFwcGVkT2JqZWN0KCk7Ci0gICAgICAgIHZhciBwcm94 eSA9IE9iamVjdC5jcmVhdGUoZ2xDb250ZXh0Ll9fcHJvdG9fXyk7IC8vIEluIG9yZGVyIHRvIGVt dWxhdGUgImluc3RhbmNlb2YiLgorICAgICAgICB2YXIgZ2wgPSB0aGlzLndyYXBwZWRPYmplY3Qo KTsKKyAgICAgICAgdmFyIHByb3h5ID0gT2JqZWN0LmNyZWF0ZShnbC5fX3Byb3RvX18pOyAvLyBJ biBvcmRlciB0byBlbXVsYXRlICJpbnN0YW5jZW9mIi4KIAogICAgICAgICB2YXIgc2VsZiA9IHRo aXM7CisgICAgICAgIHZhciBjdXN0b21XcmFwRnVuY3Rpb25zID0gV2ViR0xSZW5kZXJpbmdDb250 ZXh0UmVzb3VyY2Uud3JhcEZ1bmN0aW9ucygpOwogICAgICAgICBmdW5jdGlvbiBwcm9jZXNzUHJv cGVydHkocHJvcGVydHkpCiAgICAgICAgIHsKLSAgICAgICAgICAgIGlmICh0eXBlb2YgZ2xDb250 ZXh0W3Byb3BlcnR5XSA9PT0gImZ1bmN0aW9uIikgewotICAgICAgICAgICAgICAgIHZhciBjdXN0 b21XcmFwRnVuY3Rpb24gPSBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5XcmFwRnVuY3Rp b25zW3Byb3BlcnR5XTsKKyAgICAgICAgICAgIGlmICh0eXBlb2YgZ2xbcHJvcGVydHldID09PSAi ZnVuY3Rpb24iKSB7CisgICAgICAgICAgICAgICAgdmFyIGN1c3RvbVdyYXBGdW5jdGlvbiA9IGN1 c3RvbVdyYXBGdW5jdGlvbnNbcHJvcGVydHldOwogICAgICAgICAgICAgICAgIGlmIChjdXN0b21X cmFwRnVuY3Rpb24pCi0gICAgICAgICAgICAgICAgICAgIHByb3h5W3Byb3BlcnR5XSA9IHNlbGYu X3dyYXBDdXN0b21GdW5jdGlvbihzZWxmLCBnbENvbnRleHQsIGdsQ29udGV4dFtwcm9wZXJ0eV0s IHByb3BlcnR5LCBjdXN0b21XcmFwRnVuY3Rpb24pOworICAgICAgICAgICAgICAgICAgICBwcm94 eVtwcm9wZXJ0eV0gPSBzZWxmLl93cmFwQ3VzdG9tRnVuY3Rpb24oc2VsZiwgZ2wsIGdsW3Byb3Bl cnR5XSwgcHJvcGVydHksIGN1c3RvbVdyYXBGdW5jdGlvbik7CiAgICAgICAgICAgICAgICAgZWxz ZQotICAgICAgICAgICAgICAgICAgICBwcm94eVtwcm9wZXJ0eV0gPSBzZWxmLl93cmFwRnVuY3Rp b24oc2VsZiwgZ2xDb250ZXh0LCBnbENvbnRleHRbcHJvcGVydHldLCBwcm9wZXJ0eSk7CisgICAg ICAgICAgICAgICAgICAgIHByb3h5W3Byb3BlcnR5XSA9IHNlbGYuX3dyYXBGdW5jdGlvbihzZWxm LCBnbCwgZ2xbcHJvcGVydHldLCBwcm9wZXJ0eSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKC9e W0EtWjAtOV9dKyQvLnRlc3QocHJvcGVydHkpKSB7CiAgICAgICAgICAgICAgICAgLy8gRmFzdCBh Y2Nlc3MgdG8gZW51bXMgYW5kIGNvbnN0YW50cy4KLSAgICAgICAgICAgICAgICBwcm94eVtwcm9w ZXJ0eV0gPSBnbENvbnRleHRbcHJvcGVydHldOworICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KHR5cGVvZiBnbFtwcm9wZXJ0eV0gPT09ICJudW1iZXIiLCAiRXhwZWN0ZWQgYSBudW1iZXIg Zm9yIHByb3BlcnR5ICIgKyBwcm9wZXJ0eSk7CisgICAgICAgICAgICAgICAgcHJveHlbcHJvcGVy dHldID0gZ2xbcHJvcGVydHldOwogICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAg ICBPYmplY3QuZGVmaW5lUHJvcGVydHkocHJveHksIHByb3BlcnR5LCB7CiAgICAgICAgICAgICAg ICAgICAgIGdldDogZnVuY3Rpb24oKQogICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgICAgICAgICByZXR1cm4gZ2xDb250ZXh0W3Byb3BlcnR5XTsKKyAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBnbFtwcm9wZXJ0eV07CiAgICAgICAgICAgICAgICAgICAgIH0sCiAg ICAgICAgICAgICAgICAgICAgIHNldDogZnVuY3Rpb24odmFsdWUpCiAgICAgICAgICAgICAgICAg ICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGdsQ29udGV4dFtwcm9wZXJ0eV0gPSB2YWx1 ZTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGdsW3Byb3BlcnR5XSA9IHZhbHVlOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAotICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eSBpbiBnbENvbnRleHQpCisgICAgICAg IGZvciAodmFyIHByb3BlcnR5IGluIGdsKQogICAgICAgICAgICAgcHJvY2Vzc1Byb3BlcnR5KHBy b3BlcnR5KTsKIAogICAgICAgICByZXR1cm4gcHJveHk7CkBAIC0xMzMyLDcgKzEzMzgsNyBAQCBX ZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICogQHBhcmFt IHtGdW5jdGlvbn0gb3JpZ2luYWxGdW5jdGlvbgogICAgICAqIEBwYXJhbSB7c3RyaW5nfSBmdW5j dGlvbk5hbWUKICAgICAgKiBAcGFyYW0ge0Z1bmN0aW9ufSBjdXN0b21XcmFwRnVuY3Rpb24KLSAg ICAgKiBAcmV0dXJuIHsqfQorICAgICAqIEByZXR1cm4ge0Z1bmN0aW9ufQogICAgICAqLwogICAg IF93cmFwQ3VzdG9tRnVuY3Rpb246IGZ1bmN0aW9uKHJlc291cmNlLCBvcmlnaW5hbE9iamVjdCwg b3JpZ2luYWxGdW5jdGlvbiwgZnVuY3Rpb25OYW1lLCBjdXN0b21XcmFwRnVuY3Rpb24pCiAgICAg ewpAQCAtMTM1NCw3ICsxMzYwLDcgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UucHJv dG90eXBlID0gewogICAgICAqIEBwYXJhbSB7V2ViR0xSZW5kZXJpbmdDb250ZXh0fSBvcmlnaW5h bE9iamVjdAogICAgICAqIEBwYXJhbSB7RnVuY3Rpb259IG9yaWdpbmFsRnVuY3Rpb24KICAgICAg KiBAcGFyYW0ge3N0cmluZ30gZnVuY3Rpb25OYW1lCi0gICAgICogQHJldHVybiB7Kn0KKyAgICAg KiBAcmV0dXJuIHtGdW5jdGlvbn0KICAgICAgKi8KICAgICBfd3JhcEZ1bmN0aW9uOiBmdW5jdGlv bihyZXNvdXJjZSwgb3JpZ2luYWxPYmplY3QsIG9yaWdpbmFsRnVuY3Rpb24sIGZ1bmN0aW9uTmFt ZSkKICAgICB7CkBAIC0xNDE0LDc4ICsxNDIwLDg4IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJl c291cmNlLldyYXBGdW5jdGlvbi5wcm90b3R5cGUgPSB7CiAgICAgfQogfQogCi1XZWJHTFJlbmRl cmluZ0NvbnRleHRSZXNvdXJjZS5XcmFwRnVuY3Rpb25zID0gewotICAgIF9fcHJvdG9fXzogbnVs bAotfQotCi0vKioKLSAqIEBwYXJhbSB7c3RyaW5nfSBtZXRob2ROYW1lCi0gKiBAcGFyYW0ge0Z1 bmN0aW9ufSByZXNvdXJjZUNvbnN0cnVjdG9yCi0gKi8KLWZ1bmN0aW9uIGNyZWF0ZVJlc291cmNl V3JhcEZ1bmN0aW9uKG1ldGhvZE5hbWUsIHJlc291cmNlQ29uc3RydWN0b3IpCi17Ci0gICAgLyoq IEB0aGlzIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLldyYXBGdW5jdGlvbiAqLwotICAg IFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLldyYXBGdW5jdGlvbnNbbWV0aG9kTmFtZV0g PSBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgd3JhcHBlZE9iamVjdCA9IHRoaXMucmVz dWx0KCk7Ci0gICAgICAgIGlmICghd3JhcHBlZE9iamVjdCkKLSAgICAgICAgICAgIHJldHVybjsK LSAgICAgICAgdmFyIHJlc291cmNlID0gbmV3IHJlc291cmNlQ29uc3RydWN0b3Iod3JhcHBlZE9i amVjdCk7Ci0gICAgICAgIHZhciBtYW5hZ2VyID0gdGhpcy5fZ2xSZXNvdXJjZS5tYW5hZ2VyKCk7 Ci0gICAgICAgIGlmIChtYW5hZ2VyKQotICAgICAgICAgICAgbWFuYWdlci5yZWdpc3RlclJlc291 cmNlKHJlc291cmNlKTsKLSAgICAgICAgcmVzb3VyY2UucHVzaENhbGwodGhpcy5jYWxsKCkpOwot ICAgIH0KLX0KLWNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKCJjcmVhdGVCdWZmZXIiLCBXZWJH TEJ1ZmZlclJlc291cmNlKTsKLWNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKCJjcmVhdGVTaGFk ZXIiLCBXZWJHTFNoYWRlclJlc291cmNlKTsKLWNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKCJj cmVhdGVQcm9ncmFtIiwgV2ViR0xQcm9ncmFtUmVzb3VyY2UpOwotY3JlYXRlUmVzb3VyY2VXcmFw RnVuY3Rpb24oImNyZWF0ZVRleHR1cmUiLCBXZWJHTFRleHR1cmVSZXNvdXJjZSk7Ci1jcmVhdGVS ZXNvdXJjZVdyYXBGdW5jdGlvbigiY3JlYXRlRnJhbWVidWZmZXIiLCBXZWJHTEZyYW1lYnVmZmVy UmVzb3VyY2UpOwotY3JlYXRlUmVzb3VyY2VXcmFwRnVuY3Rpb24oImNyZWF0ZVJlbmRlcmJ1ZmZl ciIsIFdlYkdMUmVuZGVyYnVmZmVyUmVzb3VyY2UpOwotY3JlYXRlUmVzb3VyY2VXcmFwRnVuY3Rp b24oImdldFVuaWZvcm1Mb2NhdGlvbiIsIFJlc291cmNlKTsKLQogLyoqCi0gKiBAcGFyYW0ge3N0 cmluZ30gbWV0aG9kTmFtZQorICogQHJldHVybiB7T2JqZWN0LjxzdHJpbmcsIEZ1bmN0aW9uPn0K ICAqLwotZnVuY3Rpb24gY3VzdG9tV3JhcEZ1bmN0aW9uKG1ldGhvZE5hbWUpCitXZWJHTFJlbmRl cmluZ0NvbnRleHRSZXNvdXJjZS53cmFwRnVuY3Rpb25zID0gZnVuY3Rpb24oKQogewotICAgIHZh ciBjdXN0b21QdXNoQ2FsbCA9ICJwdXNoQ2FsbF8iICsgbWV0aG9kTmFtZTsKLSAgICAvKioKLSAg ICAgKiBAcGFyYW0ge09iamVjdHxudW1iZXJ9IHRhcmdldAotICAgICAqIEB0aGlzIFdlYkdMUmVu ZGVyaW5nQ29udGV4dFJlc291cmNlLldyYXBGdW5jdGlvbgotICAgICAqLwotICAgIFdlYkdMUmVu ZGVyaW5nQ29udGV4dFJlc291cmNlLldyYXBGdW5jdGlvbnNbbWV0aG9kTmFtZV0gPSBmdW5jdGlv bih0YXJnZXQpCi0gICAgewotICAgICAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLl9nbFJlc291cmNl LmN1cnJlbnRCaW5kaW5nKHRhcmdldCk7Ci0gICAgICAgIGlmICghcmVzb3VyY2UpCi0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIGlmIChyZXNvdXJjZVtjdXN0b21QdXNoQ2FsbF0pCi0gICAg ICAgICAgICByZXNvdXJjZVtjdXN0b21QdXNoQ2FsbF0uY2FsbChyZXNvdXJjZSwgdGhpcy5jYWxs KCkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXNvdXJjZS5wdXNoQ2FsbCh0aGlzLmNh bGwoKSk7CisgICAgdmFyIHdyYXBGdW5jdGlvbnMgPSBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNv dXJjZS5fd3JhcEZ1bmN0aW9uczsKKyAgICBpZiAoIXdyYXBGdW5jdGlvbnMpIHsKKyAgICAgICAg d3JhcEZ1bmN0aW9ucyA9IE9iamVjdC5jcmVhdGUobnVsbCk7CisKKyAgICAgICAgLyoqCisgICAg ICAgICAqIEBwYXJhbSB7c3RyaW5nfSBtZXRob2ROYW1lCisgICAgICAgICAqIEBwYXJhbSB7RnVu Y3Rpb259IHJlc291cmNlQ29uc3RydWN0b3IKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9u IGNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKG1ldGhvZE5hbWUsIHJlc291cmNlQ29uc3RydWN0 b3IpCisgICAgICAgIHsKKyAgICAgICAgICAgIC8qKiBAdGhpcyBXZWJHTFJlbmRlcmluZ0NvbnRl eHRSZXNvdXJjZS5XcmFwRnVuY3Rpb24gKi8KKyAgICAgICAgICAgIHdyYXBGdW5jdGlvbnNbbWV0 aG9kTmFtZV0gPSBmdW5jdGlvbigpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdmFy IHdyYXBwZWRPYmplY3QgPSB0aGlzLnJlc3VsdCgpOworICAgICAgICAgICAgICAgIGlmICghd3Jh cHBlZE9iamVjdCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IHZhciByZXNvdXJjZSA9IG5ldyByZXNvdXJjZUNvbnN0cnVjdG9yKHdyYXBwZWRPYmplY3QpOwor ICAgICAgICAgICAgICAgIHZhciBtYW5hZ2VyID0gdGhpcy5fZ2xSZXNvdXJjZS5tYW5hZ2VyKCk7 CisgICAgICAgICAgICAgICAgaWYgKG1hbmFnZXIpCisgICAgICAgICAgICAgICAgICAgIG1hbmFn ZXIucmVnaXN0ZXJSZXNvdXJjZShyZXNvdXJjZSk7CisgICAgICAgICAgICAgICAgcmVzb3VyY2Uu cHVzaENhbGwodGhpcy5jYWxsKCkpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAg IGNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKCJjcmVhdGVCdWZmZXIiLCBXZWJHTEJ1ZmZlclJl c291cmNlKTsKKyAgICAgICAgY3JlYXRlUmVzb3VyY2VXcmFwRnVuY3Rpb24oImNyZWF0ZVNoYWRl ciIsIFdlYkdMU2hhZGVyUmVzb3VyY2UpOworICAgICAgICBjcmVhdGVSZXNvdXJjZVdyYXBGdW5j dGlvbigiY3JlYXRlUHJvZ3JhbSIsIFdlYkdMUHJvZ3JhbVJlc291cmNlKTsKKyAgICAgICAgY3Jl YXRlUmVzb3VyY2VXcmFwRnVuY3Rpb24oImNyZWF0ZVRleHR1cmUiLCBXZWJHTFRleHR1cmVSZXNv dXJjZSk7CisgICAgICAgIGNyZWF0ZVJlc291cmNlV3JhcEZ1bmN0aW9uKCJjcmVhdGVGcmFtZWJ1 ZmZlciIsIFdlYkdMRnJhbWVidWZmZXJSZXNvdXJjZSk7CisgICAgICAgIGNyZWF0ZVJlc291cmNl V3JhcEZ1bmN0aW9uKCJjcmVhdGVSZW5kZXJidWZmZXIiLCBXZWJHTFJlbmRlcmJ1ZmZlclJlc291 cmNlKTsKKyAgICAgICAgY3JlYXRlUmVzb3VyY2VXcmFwRnVuY3Rpb24oImdldFVuaWZvcm1Mb2Nh dGlvbiIsIFJlc291cmNlKTsKKworICAgICAgICAvKioKKyAgICAgICAgICogQHBhcmFtIHtzdHJp bmd9IG1ldGhvZE5hbWUKKyAgICAgICAgICovCisgICAgICAgIGZ1bmN0aW9uIGN1c3RvbVdyYXBG dW5jdGlvbihtZXRob2ROYW1lKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgY3VzdG9tUHVz aENhbGwgPSAicHVzaENhbGxfIiArIG1ldGhvZE5hbWU7CisgICAgICAgICAgICAvKioKKyAgICAg ICAgICAgICAqIEBwYXJhbSB7T2JqZWN0fG51bWJlcn0gdGFyZ2V0CisgICAgICAgICAgICAgKiBA dGhpcyBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5XcmFwRnVuY3Rpb24KKyAgICAgICAg ICAgICAqLworICAgICAgICAgICAgd3JhcEZ1bmN0aW9uc1ttZXRob2ROYW1lXSA9IGZ1bmN0aW9u KHRhcmdldCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0 aGlzLl9nbFJlc291cmNlLmN1cnJlbnRCaW5kaW5nKHRhcmdldCk7CisgICAgICAgICAgICAgICAg aWYgKCFyZXNvdXJjZSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg ICAgIGlmIChyZXNvdXJjZVtjdXN0b21QdXNoQ2FsbF0pCisgICAgICAgICAgICAgICAgICAgIHJl c291cmNlW2N1c3RvbVB1c2hDYWxsXS5jYWxsKHJlc291cmNlLCB0aGlzLmNhbGwoKSk7CisgICAg ICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICByZXNvdXJjZS5wdXNoQ2FsbCh0 aGlzLmNhbGwoKSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgY3VzdG9tV3Jh cEZ1bmN0aW9uKCJhdHRhY2hTaGFkZXIiKTsKKyAgICAgICAgY3VzdG9tV3JhcEZ1bmN0aW9uKCJi aW5kQXR0cmliTG9jYXRpb24iKTsKKyAgICAgICAgY3VzdG9tV3JhcEZ1bmN0aW9uKCJjb21waWxl U2hhZGVyIik7CisgICAgICAgIGN1c3RvbVdyYXBGdW5jdGlvbigiZGV0YWNoU2hhZGVyIik7Cisg ICAgICAgIGN1c3RvbVdyYXBGdW5jdGlvbigibGlua1Byb2dyYW0iKTsKKyAgICAgICAgY3VzdG9t V3JhcEZ1bmN0aW9uKCJzaGFkZXJTb3VyY2UiKTsKKyAgICAgICAgY3VzdG9tV3JhcEZ1bmN0aW9u KCJidWZmZXJEYXRhIik7CisgICAgICAgIGN1c3RvbVdyYXBGdW5jdGlvbigiYnVmZmVyU3ViRGF0 YSIpOworICAgICAgICBjdXN0b21XcmFwRnVuY3Rpb24oImNvbXByZXNzZWRUZXhJbWFnZTJEIik7 CisgICAgICAgIGN1c3RvbVdyYXBGdW5jdGlvbigiY29tcHJlc3NlZFRleFN1YkltYWdlMkQiKTsK KyAgICAgICAgY3VzdG9tV3JhcEZ1bmN0aW9uKCJjb3B5VGV4SW1hZ2UyRCIpOworICAgICAgICBj dXN0b21XcmFwRnVuY3Rpb24oImNvcHlUZXhTdWJJbWFnZTJEIik7CisgICAgICAgIGN1c3RvbVdy YXBGdW5jdGlvbigiZ2VuZXJhdGVNaXBtYXAiKTsKKyAgICAgICAgY3VzdG9tV3JhcEZ1bmN0aW9u KCJ0ZXhJbWFnZTJEIik7CisgICAgICAgIGN1c3RvbVdyYXBGdW5jdGlvbigidGV4U3ViSW1hZ2Uy RCIpOworICAgICAgICBjdXN0b21XcmFwRnVuY3Rpb24oInRleFBhcmFtZXRlcmYiKTsKKyAgICAg ICAgY3VzdG9tV3JhcEZ1bmN0aW9uKCJ0ZXhQYXJhbWV0ZXJpIik7CisgICAgICAgIGN1c3RvbVdy YXBGdW5jdGlvbigiZnJhbWVidWZmZXJSZW5kZXJidWZmZXIiKTsKKyAgICAgICAgY3VzdG9tV3Jh cEZ1bmN0aW9uKCJmcmFtZWJ1ZmZlclRleHR1cmUyRCIpOworICAgICAgICBjdXN0b21XcmFwRnVu Y3Rpb24oInJlbmRlcmJ1ZmZlclN0b3JhZ2UiKTsKKworICAgICAgICBXZWJHTFJlbmRlcmluZ0Nv bnRleHRSZXNvdXJjZS5fd3JhcEZ1bmN0aW9ucyA9IHdyYXBGdW5jdGlvbnM7CiAgICAgfQorICAg IHJldHVybiB3cmFwRnVuY3Rpb25zOwogfQotY3VzdG9tV3JhcEZ1bmN0aW9uKCJhdHRhY2hTaGFk ZXIiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigiYmluZEF0dHJpYkxvY2F0aW9uIik7Ci1jdXN0b21X cmFwRnVuY3Rpb24oImNvbXBpbGVTaGFkZXIiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigiZGV0YWNo U2hhZGVyIik7Ci1jdXN0b21XcmFwRnVuY3Rpb24oImxpbmtQcm9ncmFtIik7Ci1jdXN0b21XcmFw RnVuY3Rpb24oInNoYWRlclNvdXJjZSIpOwotY3VzdG9tV3JhcEZ1bmN0aW9uKCJidWZmZXJEYXRh Iik7Ci1jdXN0b21XcmFwRnVuY3Rpb24oImJ1ZmZlclN1YkRhdGEiKTsKLWN1c3RvbVdyYXBGdW5j dGlvbigiY29tcHJlc3NlZFRleEltYWdlMkQiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigiY29tcHJl c3NlZFRleFN1YkltYWdlMkQiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigiY29weVRleEltYWdlMkQi KTsKLWN1c3RvbVdyYXBGdW5jdGlvbigiY29weVRleFN1YkltYWdlMkQiKTsKLWN1c3RvbVdyYXBG dW5jdGlvbigiZ2VuZXJhdGVNaXBtYXAiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigidGV4SW1hZ2Uy RCIpOwotY3VzdG9tV3JhcEZ1bmN0aW9uKCJ0ZXhTdWJJbWFnZTJEIik7Ci1jdXN0b21XcmFwRnVu Y3Rpb24oInRleFBhcmFtZXRlcmYiKTsKLWN1c3RvbVdyYXBGdW5jdGlvbigidGV4UGFyYW1ldGVy aSIpOwotY3VzdG9tV3JhcEZ1bmN0aW9uKCJmcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlciIpOwotY3Vz dG9tV3JhcEZ1bmN0aW9uKCJmcmFtZWJ1ZmZlclRleHR1cmUyRCIpOwotY3VzdG9tV3JhcEZ1bmN0 aW9uKCJyZW5kZXJidWZmZXJTdG9yYWdlIik7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCkBAIC0x ODA4LDcgKzE4MjQsNyBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB2YXIgY2FudmFzID0gb3JpZ2luYWxHbENvbnRleHQuY2FudmFzLmNsb25lTm9kZSh0cnVlKTsK ICAgICAgICAgICAgIC8vIEZJWE1FOiBQYXNzIG9yaWdpbmFsIGNvbnRleHQgaWQgaW5zdGVhZCBv ZiAiZXhwZXJpbWVudGFsLXdlYmdsIi4KICAgICAgICAgICAgIC8vIEZJWE1FOiBQYXNzIG9yaWdp bmFsIENvbnRleHRBdHRyaWJ1dGVzIHRvIHRoZSBnZXRDb250ZXh0KCkgbWV0aG9kLgotICAgICAg ICAgICAgcmVwbGF5Q29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCJleHBlcmltZW50YWwtd2Vi Z2wiKTsKKyAgICAgICAgICAgIHJlcGxheUNvbnRleHQgPSAvKiogQHR5cGUge1dlYkdMUmVuZGVy aW5nQ29udGV4dH0gKi8gUmVzb3VyY2Uud3JhcHBlZE9iamVjdChjYW52YXMuZ2V0Q29udGV4dCgi ZXhwZXJpbWVudGFsLXdlYmdsIikpOwogICAgICAgICAgICAgb3JpZ2luYWxHbENvbnRleHRbIl9f cmVwbGF5Q29udGV4dCJdID0gcmVwbGF5Q29udGV4dDsKICAgICAgICAgICAgIHRoaXMuX3JlcGxh eUNvbnRleHQgPSByZXBsYXlDb250ZXh0OwogICAgICAgICB9IGVsc2Ugewo=