104119 2012-12-05 07:15:35 -0800 Web Inspector: [WebGL] prevent GC from collecting WebGLObject instances currently bound to the context state 2013-01-11 02:13:45 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 106644 1 aandrey aandrey apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 783715 0 aandrey 2012-12-05 07:15:35 -0800 This is to prevent GC from collecting resources bound to a context (WebGL or 2D). Otherwise, for example in WebGL, subsequent calls to gl.getParameter() may return a recently created instance that is no longer bound to a Resource object (thus, no history to replay it later). Patch to follow. 783719 1 177743 aandrey 2012-12-05 07:22:11 -0800 Created attachment 177743 Patch 783724 2 aandrey 2012-12-05 07:26:36 -0800 W/o this patch the WebGL capturing/replay would not necessarily work on the following example: http://games.greggman.com/downloads/examples/webgl/webgl-2d-image-3x3-convolution.html 787333 3 178551 aandrey 2012-12-10 07:52:01 -0800 Created attachment 178551 Added framebuffer attachment object bound resource 788140 4 178551 webkit.review.bot 2012-12-11 00:59:02 -0800 Comment on attachment 178551 Added framebuffer attachment object bound resource Clearing flags on attachment: 178551 Committed r137262: <http://trac.webkit.org/changeset/137262> 788141 5 webkit.review.bot 2012-12-11 00:59:06 -0800 All reviewed patches have been landed. Closing bug. 177743 2012-12-05 07:22:11 -0800 2012-12-10 07:51:56 -0800 Patch bug-104119-20121205191935.patch text/plain 7046 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NjYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEyZWEyNzk5Zjg0OGUz NGNiNzZmOGI5ZTM5NjdmMGEyZjNiYWVmMC4uYjQ1ZDgwMDRkMjZkYmRiMDRhNjg2NjNhNDk2NzM1 Y2IxOGJiNmE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEyLTA1ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJHTF0gcHJldmVudCBHQyBmcm9tIGNvbGxlY3RpbmcgV2ViR0xPYmplY3QgaW5zdGFu Y2VzIGN1cnJlbnRseSBib3VuZCB0byB0aGUgY29udGV4dCBzdGF0ZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MTE5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyB0byBwcmV2ZW50IEdDIGZy b20gY29sbGVjdGluZyByZXNvdXJjZXMgYm91bmQgdG8gYSBjb250ZXh0IChXZWJHTCBvciAyRCku CisgICAgICAgIE90aGVyd2lzZSwgZm9yIGV4YW1wbGUgaW4gV2ViR0wsIHN1YnNlcXVlbnQgY2Fs bHMgdG8gZ2wuZ2V0UGFyYW1ldGVyKCkgbWF5IHJldHVybiBhIHJlY2VudGx5IGNyZWF0ZWQKKyAg ICAgICAgaW5zdGFuY2UgdGhhdCBpcyBubyBsb25nZXIgYm91bmQgdG8gYSBSZXNvdXJjZSBvYmpl Y3QgKHRodXMsIG5vIGhpc3RvcnkgdG8gcmVwbGF5IGl0IGxhdGVyKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qczoKKyAgICAgICAgKC4p OgorCiAyMDEyLTEyLTA1ICBab2x0YW4gSGVyY3plZyAgPHpoZXJjemVnQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgT3B0aW1pemUgQ29sb3JNYXRyaXggZmlsdGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2Uu anMKaW5kZXggMjZlZTRmNzc4MTlkMjBlMjM0ZjI1YzJlNDVjMDYzNjBmMzFlZmNkNy4uODJmNTNi M2E3OGRjNWZmODgxZmE4YTYwNzllMzgzOWVhMWRhNTE4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJj ZS5qcwpAQCAtMzQ3LDcgKzM0Nyw3IEBAIENhbGwucHJvdG90eXBlID0gewogICAgIH0sCiAgICAg CiAgICAgLyoqCi0gICAgICogQHJldHVybiB7QXJyYXl9CisgICAgICogQHJldHVybiB7IUFycmF5 fQogICAgICAqLwogICAgIGFyZ3M6IGZ1bmN0aW9uKCkKICAgICB7CkBAIC01ODQsNiArNTg0LDE1 IEBAIGZ1bmN0aW9uIFJlc291cmNlKHdyYXBwZWRPYmplY3QpCiAgICAgdGhpcy5fcmVzb3VyY2VN YW5hZ2VyID0gbnVsbDsKICAgICAvKiogQHR5cGUgeyFBcnJheS48Q2FsbD59ICovCiAgICAgdGhp cy5fY2FsbHMgPSBbXTsKKyAgICAvKioKKyAgICAgKiBUaGlzIGlzIHRvIHByZXZlbnQgR0MgZnJv bSBjb2xsZWN0aW5nIGFzc29jaWF0ZWQgcmVzb3VyY2VzLgorICAgICAqIE90aGVyd2lzZSwgZm9y IGV4YW1wbGUgaW4gV2ViR0wsIHN1YnNlcXVlbnQgY2FsbHMgdG8gZ2wuZ2V0UGFyYW1ldGVyKCkK KyAgICAgKiBtYXkgcmV0dXJuIGEgcmVjZW50bHkgY3JlYXRlZCBpbnN0YW5jZSB0aGF0IGlzIG5v IGxvbmdlciBib3VuZCB0byBhCisgICAgICogUmVzb3VyY2Ugb2JqZWN0ICh0aHVzLCBubyBoaXN0 b3J5IHRvIHJlcGxheSBpdCBsYXRlcikuCisgICAgICoKKyAgICAgKiBAdHlwZSB7IU9iamVjdC48 c3RyaW5nLCBSZXNvdXJjZT59CisgICAgICovCisgICAgdGhpcy5fYm91bmRSZXNvdXJjZXMgPSBP YmplY3QuY3JlYXRlKG51bGwpOwogICAgIHRoaXMuc2V0V3JhcHBlZE9iamVjdCh3cmFwcGVkT2Jq ZWN0KTsKIH0KIApAQCAtNzczLDYgKzc4MiwxOSBAQCBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAg ICAgfSwKIAogICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBrZXkKKyAgICAgKiBAcGFy YW0geyp9IG9iagorICAgICAqLworICAgIF9yZWdpc3RlckJvdW5kUmVzb3VyY2U6IGZ1bmN0aW9u KGtleSwgb2JqKQorICAgIHsKKyAgICAgICAgdmFyIHJlc291cmNlID0gUmVzb3VyY2UuZm9yT2Jq ZWN0KG9iaik7CisgICAgICAgIGlmIChyZXNvdXJjZSkKKyAgICAgICAgICAgIHRoaXMuX2JvdW5k UmVzb3VyY2VzW2tleV0gPSByZXNvdXJjZTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX2JvdW5kUmVzb3VyY2VzW2tleV07CisgICAgfSwKKworICAgIC8qKgogICAgICAq IEByZXR1cm4ge09iamVjdH0KICAgICAgKi8KICAgICBfd3JhcE9iamVjdDogZnVuY3Rpb24oKQpA QCAtODgxLDYgKzkwMyw3IEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IHJldHVybiBmdW5jdGlvbih2YWx1ZSkKICAgICAgICAgeworICAgICAgICAgICAgcmVzb3VyY2Uu X3JlZ2lzdGVyQm91bmRSZXNvdXJjZShwcm9wZXJ0eU5hbWUsIHZhbHVlKTsKICAgICAgICAgICAg IHZhciBtYW5hZ2VyID0gcmVzb3VyY2UubWFuYWdlcigpOwogICAgICAgICAgICAgaWYgKCFtYW5h Z2VyIHx8ICFtYW5hZ2VyLmNhcHR1cmluZygpKSB7CiAgICAgICAgICAgICAgICAgb3JpZ2luYWxP YmplY3RbcHJvcGVydHlOYW1lXSA9IFJlc291cmNlLndyYXBwZWRPYmplY3QodmFsdWUpOwpAQCAt MTM3Niw2ICsxMzk5LDE4IEBAIGZ1bmN0aW9uIFdlYkdMU2hhZGVyUmVzb3VyY2Uod3JhcHBlZE9i amVjdCkKIAogV2ViR0xTaGFkZXJSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCisgICAg ICogQHJldHVybiB7bnVtYmVyfQorICAgICAqLworICAgIHR5cGU6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHZhciBjYWxsID0gdGhpcy5fY2FsbHNbMF07CisgICAgICAgIGlmIChjYWxsICYm IGNhbGwuZnVuY3Rpb25OYW1lKCkgPT09ICJjcmVhdGVTaGFkZXIiKQorICAgICAgICAgICAgcmV0 dXJuIGNhbGwuYXJncygpWzBdOworICAgICAgICBjb25zb2xlLmVycm9yKCJBU1NFUlRfTk9UX1JF QUNIRUQ6IEZhaWxlZCB0byByZXN0b3JlIHNoYWRlciB0eXBlIGZyb20gdGhlIGxvZy4iLCBjYWxs KTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBvdmVycmlk ZQogICAgICAqIEBwYXJhbSB7IUNhbGx9IGNhbGwKICAgICAgKi8KQEAgLTE5MjIsNyArMTk1Nyw2 IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHN0YXRlTW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJhdHRhY2hTaGFkZXIiKTsKICAgICAgICAg ICAgIHN0YXRlTW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJiaW5kQXR0cmliTG9jYXRpb24iKTsKICAg ICAgICAgICAgIHN0YXRlTW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJjb21waWxlU2hhZGVyIik7CiAg ICAgICAgICAgICBzdGF0ZU1vZGlmeWluZ1dyYXBGdW5jdGlvbigiZGV0YWNoU2hhZGVyIik7CkBA IC0xOTQ2LDcgKzE5ODAsNyBAQCBXZWJHTFJlbmRlcmluZ0NvbnRleHRSZXNvdXJjZS5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICAvKiogQHRoaXMgUmVzb3VyY2UuV3JhcEZ1bmN0aW9uICovCiAg ICAgICAgICAgICB3cmFwRnVuY3Rpb25zWyJnZXRFcnJvciJdID0gZnVuY3Rpb24oKQogICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgIHZhciBnbCA9IHRoaXMuX29yaWdpbmFsT2JqZWN0Owor ICAgICAgICAgICAgICAgIHZhciBnbCA9IC8qKiBAdHlwZSB7V2ViR0xSZW5kZXJpbmdDb250ZXh0 fSAqLyAodGhpcy5fb3JpZ2luYWxPYmplY3QpOwogICAgICAgICAgICAgICAgIHZhciBlcnJvciA9 IHRoaXMucmVzdWx0KCk7CiAgICAgICAgICAgICAgICAgaWYgKGVycm9yICE9PSBnbC5OT19FUlJP UikKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuY2xlYXJFcnJvcihlcnJvcik7 CkBAIC0xOTY2LDYgKzIwMDAsNjUgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2UucHJv dG90eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLmFkZEV4dGVuc2lvbihu YW1lKTsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgLy8KKyAgICAgICAgICAgIC8vIFJl Z2lzdGVyIGJvdW5kIFdlYkdMIHJlc291cmNlcy4KKyAgICAgICAgICAgIC8vCisKKyAgICAgICAg ICAgIC8qKgorICAgICAgICAgICAgICogQHBhcmFtIHtXZWJHTFByb2dyYW19IHByb2dyYW0KKyAg ICAgICAgICAgICAqIEBwYXJhbSB7V2ViR0xTaGFkZXJ9IHNoYWRlcgorICAgICAgICAgICAgICog QHRoaXMgUmVzb3VyY2UuV3JhcEZ1bmN0aW9uCisgICAgICAgICAgICAgKi8KKyAgICAgICAgICAg IHdyYXBGdW5jdGlvbnNbImF0dGFjaFNoYWRlciJdID0gZnVuY3Rpb24ocHJvZ3JhbSwgc2hhZGVy KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jl c291cmNlLmN1cnJlbnRCaW5kaW5nKHByb2dyYW0pOworICAgICAgICAgICAgICAgIGlmIChyZXNv dXJjZSkgeworICAgICAgICAgICAgICAgICAgICByZXNvdXJjZS5wdXNoQ2FsbCh0aGlzLmNhbGwo KSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBzaGFkZXJSZXNvdXJjZSA9IC8qKiBAdHlwZSB7 V2ViR0xTaGFkZXJSZXNvdXJjZX0gKi8gKFJlc291cmNlLmZvck9iamVjdChzaGFkZXIpKTsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKHNoYWRlclJlc291cmNlKSB7CisgICAgICAgICAgICAgICAg ICAgICAgICB2YXIgc2hhZGVyVHlwZSA9IHNoYWRlclJlc291cmNlLnR5cGUoKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIHJlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3VyY2UoIl9fYXR0YWNo U2hhZGVyXyIgKyBzaGFkZXJUeXBlLCBzaGFkZXJSZXNvdXJjZSk7CisgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICAvKioK KyAgICAgICAgICAgICAqIEBwYXJhbSB7bnVtYmVyfSB0YXJnZXQKKyAgICAgICAgICAgICAqIEBw YXJhbSB7T2JqZWN0fSBvYmoKKyAgICAgICAgICAgICAqIEB0aGlzIFJlc291cmNlLldyYXBGdW5j dGlvbgorICAgICAgICAgICAgICovCisgICAgICAgICAgICB3cmFwRnVuY3Rpb25zWyJiaW5kQnVm ZmVyIl0gPSB3cmFwRnVuY3Rpb25zWyJiaW5kRnJhbWVidWZmZXIiXSA9IHdyYXBGdW5jdGlvbnNb ImJpbmRSZW5kZXJidWZmZXIiXSA9IGZ1bmN0aW9uKHRhcmdldCwgb2JqKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3VyY2Uo Il9fYmluZEJ1ZmZlcl8iICsgdGFyZ2V0LCBvYmopOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgLyoqCisgICAgICAgICAgICAgKiBAcGFyYW0ge251bWJlcn0gdGFyZ2V0CisgICAgICAgICAg ICAgKiBAcGFyYW0ge1dlYkdMVGV4dHVyZX0gb2JqCisgICAgICAgICAgICAgKiBAdGhpcyBSZXNv dXJjZS5XcmFwRnVuY3Rpb24KKyAgICAgICAgICAgICAqLworICAgICAgICAgICAgd3JhcEZ1bmN0 aW9uc1siYmluZFRleHR1cmUiXSA9IGZ1bmN0aW9uKHRhcmdldCwgb2JqKQorICAgICAgICAgICAg eworICAgICAgICAgICAgICAgIHZhciBnbCA9IC8qKiBAdHlwZSB7V2ViR0xSZW5kZXJpbmdDb250 ZXh0fSAqLyAodGhpcy5fb3JpZ2luYWxPYmplY3QpOworICAgICAgICAgICAgICAgIHZhciBjdXJy ZW50VGV4dHVyZUJpbmRpbmcgPSAvKiogQHR5cGUge251bWJlcn0gKi8gKGdsLmdldFBhcmFtZXRl cihnbC5BQ1RJVkVfVEVYVFVSRSkpOworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLl9y ZWdpc3RlckJvdW5kUmVzb3VyY2UoIl9fYmluZFRleHR1cmVfIiArIHRhcmdldCArICJfIiArIGN1 cnJlbnRUZXh0dXJlQmluZGluZywgb2JqKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8q KgorICAgICAgICAgICAgICogQHBhcmFtIHtXZWJHTFByb2dyYW19IHByb2dyYW0KKyAgICAgICAg ICAgICAqIEB0aGlzIFJlc291cmNlLldyYXBGdW5jdGlvbgorICAgICAgICAgICAgICovCisgICAg ICAgICAgICB3cmFwRnVuY3Rpb25zWyJ1c2VQcm9ncmFtIl0gPSBmdW5jdGlvbihwcm9ncmFtKQor ICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLl9yZWdpc3RlckJv dW5kUmVzb3VyY2UoIl9fdXNlUHJvZ3JhbSIsIHByb2dyYW0pOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgLyoqCisgICAgICAgICAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAg ICAgICAgICAqIEB0aGlzIFJlc291cmNlLldyYXBGdW5jdGlvbgorICAgICAgICAgICAgICovCisg ICAgICAgICAgICB3cmFwRnVuY3Rpb25zWyJ2ZXJ0ZXhBdHRyaWJQb2ludGVyIl0gPSBmdW5jdGlv bihpbmRleCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICB2YXIgZ2wgPSAvKiogQHR5 cGUge1dlYkdMUmVuZGVyaW5nQ29udGV4dH0gKi8gKHRoaXMuX29yaWdpbmFsT2JqZWN0KTsKKyAg ICAgICAgICAgICAgICB0aGlzLl9yZXNvdXJjZS5fcmVnaXN0ZXJCb3VuZFJlc291cmNlKCJfX3Zl cnRleEF0dHJpYlBvaW50ZXJfIiArIGluZGV4LCBnbC5nZXRQYXJhbWV0ZXIoZ2wuQVJSQVlfQlVG RkVSX0JJTkRJTkcpKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgV2ViR0xSZW5kZXJp bmdDb250ZXh0UmVzb3VyY2UuX3dyYXBGdW5jdGlvbnMgPSB3cmFwRnVuY3Rpb25zOwogICAgICAg ICB9CiAgICAgICAgIHJldHVybiB3cmFwRnVuY3Rpb25zOwo= 178551 2012-12-10 07:52:01 -0800 2012-12-11 00:59:02 -0800 Added framebuffer attachment object bound resource bug-104119-20121210194922.patch text/plain 8282 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI4YTIzNjhlZjk5YWVj OWE5MjRjOWEwMDBiYjA0NzQwYTNhODMwNy4uMjA2YzkzNjY0NTdmY2RjMmQyZjFjZjA0MjliMzU1 NWFjNGUzMjQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEyLTA1ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtXZWJHTF0gcHJldmVudCBHQyBmcm9tIGNvbGxlY3RpbmcgV2ViR0xPYmplY3QgaW5zdGFu Y2VzIGN1cnJlbnRseSBib3VuZCB0byB0aGUgY29udGV4dCBzdGF0ZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MTE5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyB0byBwcmV2ZW50IEdDIGZy b20gY29sbGVjdGluZyByZXNvdXJjZXMgYm91bmQgdG8gYSBjb250ZXh0IChXZWJHTCBvciAyRCku CisgICAgICAgIE90aGVyd2lzZSwgZm9yIGV4YW1wbGUgaW4gV2ViR0wsIHN1YnNlcXVlbnQgY2Fs bHMgdG8gZ2wuZ2V0UGFyYW1ldGVyKCkgbWF5IHJldHVybiBhIHJlY2VudGx5IGNyZWF0ZWQKKyAg ICAgICAgaW5zdGFuY2UgdGhhdCBpcyBubyBsb25nZXIgYm91bmQgdG8gYSBSZXNvdXJjZSBvYmpl Y3QgKHRodXMsIG5vIGhpc3RvcnkgdG8gcmVwbGF5IGl0IGxhdGVyKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qczoKKyAgICAgICAgKC4p OgorCiAyMDEyLTEyLTA5ICBUYWthc2hpIFNha2Ftb3RvICA8dGFzYWtAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBbU2hhZG93IERPTV06IHJlc2V0LXN0eWxlLWluaGVyaXRhbmNlIGRvZXNuJ3Qgd29y ayBmb3IgaW5zZXJ0aW9uIHBvaW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKaW5kZXggMjZlZTRm Nzc4MTlkMjBlMjM0ZjI1YzJlNDVjMDYzNjBmMzFlZmNkNy4uYzAxMWYxM2QxZDE4Zjk4Zjc5N2Y0 MmVlYWFmMTEwMWZmZmNmNmRkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luamVjdGVkU2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwpAQCAtMzQ3LDcg KzM0Nyw3IEBAIENhbGwucHJvdG90eXBlID0gewogICAgIH0sCiAgICAgCiAgICAgLyoqCi0gICAg ICogQHJldHVybiB7QXJyYXl9CisgICAgICogQHJldHVybiB7IUFycmF5fQogICAgICAqLwogICAg IGFyZ3M6IGZ1bmN0aW9uKCkKICAgICB7CkBAIC01ODQsNiArNTg0LDE1IEBAIGZ1bmN0aW9uIFJl c291cmNlKHdyYXBwZWRPYmplY3QpCiAgICAgdGhpcy5fcmVzb3VyY2VNYW5hZ2VyID0gbnVsbDsK ICAgICAvKiogQHR5cGUgeyFBcnJheS48Q2FsbD59ICovCiAgICAgdGhpcy5fY2FsbHMgPSBbXTsK KyAgICAvKioKKyAgICAgKiBUaGlzIGlzIHRvIHByZXZlbnQgR0MgZnJvbSBjb2xsZWN0aW5nIGFz c29jaWF0ZWQgcmVzb3VyY2VzLgorICAgICAqIE90aGVyd2lzZSwgZm9yIGV4YW1wbGUgaW4gV2Vi R0wsIHN1YnNlcXVlbnQgY2FsbHMgdG8gZ2wuZ2V0UGFyYW1ldGVyKCkKKyAgICAgKiBtYXkgcmV0 dXJuIGEgcmVjZW50bHkgY3JlYXRlZCBpbnN0YW5jZSB0aGF0IGlzIG5vIGxvbmdlciBib3VuZCB0 byBhCisgICAgICogUmVzb3VyY2Ugb2JqZWN0ICh0aHVzLCBubyBoaXN0b3J5IHRvIHJlcGxheSBp dCBsYXRlcikuCisgICAgICoKKyAgICAgKiBAdHlwZSB7IU9iamVjdC48c3RyaW5nLCBSZXNvdXJj ZT59CisgICAgICovCisgICAgdGhpcy5fYm91bmRSZXNvdXJjZXMgPSBPYmplY3QuY3JlYXRlKG51 bGwpOwogICAgIHRoaXMuc2V0V3JhcHBlZE9iamVjdCh3cmFwcGVkT2JqZWN0KTsKIH0KIApAQCAt NzczLDYgKzc4MiwxOSBAQCBSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8q KgorICAgICAqIEBwYXJhbSB7c3RyaW5nfSBrZXkKKyAgICAgKiBAcGFyYW0geyp9IG9iagorICAg ICAqLworICAgIF9yZWdpc3RlckJvdW5kUmVzb3VyY2U6IGZ1bmN0aW9uKGtleSwgb2JqKQorICAg IHsKKyAgICAgICAgdmFyIHJlc291cmNlID0gUmVzb3VyY2UuZm9yT2JqZWN0KG9iaik7CisgICAg ICAgIGlmIChyZXNvdXJjZSkKKyAgICAgICAgICAgIHRoaXMuX2JvdW5kUmVzb3VyY2VzW2tleV0g PSByZXNvdXJjZTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2JvdW5k UmVzb3VyY2VzW2tleV07CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEByZXR1cm4ge09iamVj dH0KICAgICAgKi8KICAgICBfd3JhcE9iamVjdDogZnVuY3Rpb24oKQpAQCAtODgxLDYgKzkwMyw3 IEBAIFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHJldHVybiBmdW5jdGlv bih2YWx1ZSkKICAgICAgICAgeworICAgICAgICAgICAgcmVzb3VyY2UuX3JlZ2lzdGVyQm91bmRS ZXNvdXJjZShwcm9wZXJ0eU5hbWUsIHZhbHVlKTsKICAgICAgICAgICAgIHZhciBtYW5hZ2VyID0g cmVzb3VyY2UubWFuYWdlcigpOwogICAgICAgICAgICAgaWYgKCFtYW5hZ2VyIHx8ICFtYW5hZ2Vy LmNhcHR1cmluZygpKSB7CiAgICAgICAgICAgICAgICAgb3JpZ2luYWxPYmplY3RbcHJvcGVydHlO YW1lXSA9IFJlc291cmNlLndyYXBwZWRPYmplY3QodmFsdWUpOwpAQCAtMTM3Niw2ICsxMzk5LDE4 IEBAIGZ1bmN0aW9uIFdlYkdMU2hhZGVyUmVzb3VyY2Uod3JhcHBlZE9iamVjdCkKIAogV2ViR0xT aGFkZXJSZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgLyoqCisgICAgICogQHJldHVybiB7bnVt YmVyfQorICAgICAqLworICAgIHR5cGU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHZhciBj YWxsID0gdGhpcy5fY2FsbHNbMF07CisgICAgICAgIGlmIChjYWxsICYmIGNhbGwuZnVuY3Rpb25O YW1lKCkgPT09ICJjcmVhdGVTaGFkZXIiKQorICAgICAgICAgICAgcmV0dXJuIGNhbGwuYXJncygp WzBdOworICAgICAgICBjb25zb2xlLmVycm9yKCJBU1NFUlRfTk9UX1JFQUNIRUQ6IEZhaWxlZCB0 byByZXN0b3JlIHNoYWRlciB0eXBlIGZyb20gdGhlIGxvZy4iLCBjYWxsKTsKKyAgICAgICAgcmV0 dXJuIDA7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBvdmVycmlkZQogICAgICAqIEBwYXJh bSB7IUNhbGx9IGNhbGwKICAgICAgKi8KQEAgLTE5MjIsNyArMTk1Nyw2IEBAIFdlYkdMUmVuZGVy aW5nQ29udGV4dFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHN0YXRlTW9kaWZ5 aW5nV3JhcEZ1bmN0aW9uKCJhdHRhY2hTaGFkZXIiKTsKICAgICAgICAgICAgIHN0YXRlTW9kaWZ5 aW5nV3JhcEZ1bmN0aW9uKCJiaW5kQXR0cmliTG9jYXRpb24iKTsKICAgICAgICAgICAgIHN0YXRl TW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJjb21waWxlU2hhZGVyIik7CiAgICAgICAgICAgICBzdGF0 ZU1vZGlmeWluZ1dyYXBGdW5jdGlvbigiZGV0YWNoU2hhZGVyIik7CkBAIC0xOTM5LDE0ICsxOTcz LDEyIEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dFJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHN0YXRlTW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJ0ZXhTdWJJbWFnZTJEIik7CiAgICAg ICAgICAgICBzdGF0ZU1vZGlmeWluZ1dyYXBGdW5jdGlvbigidGV4UGFyYW1ldGVyZiIsIFdlYkdM VGV4dHVyZVJlc291cmNlLnByb3RvdHlwZS5wdXNoQ2FsbF90ZXhQYXJhbWV0ZXIpOwogICAgICAg ICAgICAgc3RhdGVNb2RpZnlpbmdXcmFwRnVuY3Rpb24oInRleFBhcmFtZXRlcmkiLCBXZWJHTFRl eHR1cmVSZXNvdXJjZS5wcm90b3R5cGUucHVzaENhbGxfdGV4UGFyYW1ldGVyKTsKLSAgICAgICAg ICAgIHN0YXRlTW9kaWZ5aW5nV3JhcEZ1bmN0aW9uKCJmcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlciIp OwotICAgICAgICAgICAgc3RhdGVNb2RpZnlpbmdXcmFwRnVuY3Rpb24oImZyYW1lYnVmZmVyVGV4 dHVyZTJEIik7CiAgICAgICAgICAgICBzdGF0ZU1vZGlmeWluZ1dyYXBGdW5jdGlvbigicmVuZGVy YnVmZmVyU3RvcmFnZSIpOwogCiAgICAgICAgICAgICAvKiogQHRoaXMgUmVzb3VyY2UuV3JhcEZ1 bmN0aW9uICovCiAgICAgICAgICAgICB3cmFwRnVuY3Rpb25zWyJnZXRFcnJvciJdID0gZnVuY3Rp b24oKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHZhciBnbCA9IHRoaXMuX29yaWdp bmFsT2JqZWN0OworICAgICAgICAgICAgICAgIHZhciBnbCA9IC8qKiBAdHlwZSB7V2ViR0xSZW5k ZXJpbmdDb250ZXh0fSAqLyAodGhpcy5fb3JpZ2luYWxPYmplY3QpOwogICAgICAgICAgICAgICAg IHZhciBlcnJvciA9IHRoaXMucmVzdWx0KCk7CiAgICAgICAgICAgICAgICAgaWYgKGVycm9yICE9 PSBnbC5OT19FUlJPUikKICAgICAgICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UuY2xlYXJF cnJvcihlcnJvcik7CkBAIC0xOTY2LDYgKzE5OTgsODAgQEAgV2ViR0xSZW5kZXJpbmdDb250ZXh0 UmVzb3VyY2UucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLmFk ZEV4dGVuc2lvbihuYW1lKTsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgLy8KKyAgICAg ICAgICAgIC8vIFJlZ2lzdGVyIGJvdW5kIFdlYkdMIHJlc291cmNlcy4KKyAgICAgICAgICAgIC8v CisKKyAgICAgICAgICAgIC8qKgorICAgICAgICAgICAgICogQHBhcmFtIHtXZWJHTFByb2dyYW19 IHByb2dyYW0KKyAgICAgICAgICAgICAqIEBwYXJhbSB7V2ViR0xTaGFkZXJ9IHNoYWRlcgorICAg ICAgICAgICAgICogQHRoaXMgUmVzb3VyY2UuV3JhcEZ1bmN0aW9uCisgICAgICAgICAgICAgKi8K KyAgICAgICAgICAgIHdyYXBGdW5jdGlvbnNbImF0dGFjaFNoYWRlciJdID0gZnVuY3Rpb24ocHJv Z3JhbSwgc2hhZGVyKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHZhciByZXNvdXJj ZSA9IHRoaXMuX3Jlc291cmNlLmN1cnJlbnRCaW5kaW5nKHByb2dyYW0pOworICAgICAgICAgICAg ICAgIGlmIChyZXNvdXJjZSkgeworICAgICAgICAgICAgICAgICAgICByZXNvdXJjZS5wdXNoQ2Fs bCh0aGlzLmNhbGwoKSk7CisgICAgICAgICAgICAgICAgICAgIHZhciBzaGFkZXJSZXNvdXJjZSA9 IC8qKiBAdHlwZSB7V2ViR0xTaGFkZXJSZXNvdXJjZX0gKi8gKFJlc291cmNlLmZvck9iamVjdChz aGFkZXIpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHNoYWRlclJlc291cmNlKSB7CisgICAg ICAgICAgICAgICAgICAgICAgICB2YXIgc2hhZGVyVHlwZSA9IHNoYWRlclJlc291cmNlLnR5cGUo KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3Vy Y2UoIl9fYXR0YWNoU2hhZGVyXyIgKyBzaGFkZXJUeXBlLCBzaGFkZXJSZXNvdXJjZSk7CisgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAg ICAgICAgICAvKioKKyAgICAgICAgICAgICAqIEBwYXJhbSB7bnVtYmVyfSB0YXJnZXQKKyAgICAg ICAgICAgICAqIEBwYXJhbSB7bnVtYmVyfSBhdHRhY2htZW50CisgICAgICAgICAgICAgKiBAcGFy YW0ge251bWJlcn0gb2JqZWN0VGFyZ2V0CisgICAgICAgICAgICAgKiBAcGFyYW0ge1dlYkdMUmVu ZGVyYnVmZmVyfFdlYkdMVGV4dHVyZX0gb2JqCisgICAgICAgICAgICAgKiBAdGhpcyBSZXNvdXJj ZS5XcmFwRnVuY3Rpb24KKyAgICAgICAgICAgICAqLworICAgICAgICAgICAgd3JhcEZ1bmN0aW9u c1siZnJhbWVidWZmZXJSZW5kZXJidWZmZXIiXSA9IHdyYXBGdW5jdGlvbnNbImZyYW1lYnVmZmVy VGV4dHVyZTJEIl0gPSBmdW5jdGlvbih0YXJnZXQsIGF0dGFjaG1lbnQsIG9iamVjdFRhcmdldCwg b2JqKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMu X3Jlc291cmNlLmN1cnJlbnRCaW5kaW5nKHRhcmdldCk7CisgICAgICAgICAgICAgICAgaWYgKHJl c291cmNlKSB7CisgICAgICAgICAgICAgICAgICAgIHJlc291cmNlLnB1c2hDYWxsKHRoaXMuY2Fs bCgpKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb3VyY2UuX3JlZ2lzdGVyQm91bmRSZXNvdXJj ZSgiX19mcmFtZWJ1ZmZlckF0dGFjaG1lbnRPYmplY3ROYW1lIiwgb2JqKTsKKyAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgICAgICAvKioKKyAgICAgICAgICAgICAqIEBw YXJhbSB7bnVtYmVyfSB0YXJnZXQKKyAgICAgICAgICAgICAqIEBwYXJhbSB7T2JqZWN0fSBvYmoK KyAgICAgICAgICAgICAqIEB0aGlzIFJlc291cmNlLldyYXBGdW5jdGlvbgorICAgICAgICAgICAg ICovCisgICAgICAgICAgICB3cmFwRnVuY3Rpb25zWyJiaW5kQnVmZmVyIl0gPSB3cmFwRnVuY3Rp b25zWyJiaW5kRnJhbWVidWZmZXIiXSA9IHdyYXBGdW5jdGlvbnNbImJpbmRSZW5kZXJidWZmZXIi XSA9IGZ1bmN0aW9uKHRhcmdldCwgb2JqKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IHRoaXMuX3Jlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3VyY2UoIl9fYmluZEJ1ZmZlcl8iICsg dGFyZ2V0LCBvYmopOworICAgICAgICAgICAgfQorICAgICAgICAgICAgLyoqCisgICAgICAgICAg ICAgKiBAcGFyYW0ge251bWJlcn0gdGFyZ2V0CisgICAgICAgICAgICAgKiBAcGFyYW0ge1dlYkdM VGV4dHVyZX0gb2JqCisgICAgICAgICAgICAgKiBAdGhpcyBSZXNvdXJjZS5XcmFwRnVuY3Rpb24K KyAgICAgICAgICAgICAqLworICAgICAgICAgICAgd3JhcEZ1bmN0aW9uc1siYmluZFRleHR1cmUi XSA9IGZ1bmN0aW9uKHRhcmdldCwgb2JqKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IHZhciBnbCA9IC8qKiBAdHlwZSB7V2ViR0xSZW5kZXJpbmdDb250ZXh0fSAqLyAodGhpcy5fb3Jp Z2luYWxPYmplY3QpOworICAgICAgICAgICAgICAgIHZhciBjdXJyZW50VGV4dHVyZUJpbmRpbmcg PSAvKiogQHR5cGUge251bWJlcn0gKi8gKGdsLmdldFBhcmFtZXRlcihnbC5BQ1RJVkVfVEVYVFVS RSkpOworICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3Vy Y2UoIl9fYmluZFRleHR1cmVfIiArIHRhcmdldCArICJfIiArIGN1cnJlbnRUZXh0dXJlQmluZGlu Zywgb2JqKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIC8qKgorICAgICAgICAgICAgICog QHBhcmFtIHtXZWJHTFByb2dyYW19IHByb2dyYW0KKyAgICAgICAgICAgICAqIEB0aGlzIFJlc291 cmNlLldyYXBGdW5jdGlvbgorICAgICAgICAgICAgICovCisgICAgICAgICAgICB3cmFwRnVuY3Rp b25zWyJ1c2VQcm9ncmFtIl0gPSBmdW5jdGlvbihwcm9ncmFtKQorICAgICAgICAgICAgeworICAg ICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLl9yZWdpc3RlckJvdW5kUmVzb3VyY2UoIl9fdXNl UHJvZ3JhbSIsIHByb2dyYW0pOworICAgICAgICAgICAgfQorICAgICAgICAgICAgLyoqCisgICAg ICAgICAgICAgKiBAcGFyYW0ge251bWJlcn0gaW5kZXgKKyAgICAgICAgICAgICAqIEB0aGlzIFJl c291cmNlLldyYXBGdW5jdGlvbgorICAgICAgICAgICAgICovCisgICAgICAgICAgICB3cmFwRnVu Y3Rpb25zWyJ2ZXJ0ZXhBdHRyaWJQb2ludGVyIl0gPSBmdW5jdGlvbihpbmRleCkKKyAgICAgICAg ICAgIHsKKyAgICAgICAgICAgICAgICB2YXIgZ2wgPSAvKiogQHR5cGUge1dlYkdMUmVuZGVyaW5n Q29udGV4dH0gKi8gKHRoaXMuX29yaWdpbmFsT2JqZWN0KTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9yZXNvdXJjZS5fcmVnaXN0ZXJCb3VuZFJlc291cmNlKCJfX3ZlcnRleEF0dHJpYlBvaW50ZXJf IiArIGluZGV4LCBnbC5nZXRQYXJhbWV0ZXIoZ2wuQVJSQVlfQlVGRkVSX0JJTkRJTkcpKTsKKyAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0UmVzb3VyY2Uu X3dyYXBGdW5jdGlvbnMgPSB3cmFwRnVuY3Rpb25zOwogICAgICAgICB9CiAgICAgICAgIHJldHVy biB3cmFwRnVuY3Rpb25zOwo=