150066 2015-10-12 17:22:20 -0700 Add basic canvas tests 2015-10-12 18:12:56 -0700 1 1 1 Unclassified WebKit Animations WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 149053 1 jonlee jonlee commit-queue dino rniwa sabouhallawa webkit-bug-importer oldest_to_newest 1132595 0 jonlee 2015-10-12 17:22:20 -0700 Add basic canvas tests 1132596 1 webkit-bug-importer 2015-10-12 17:22:38 -0700 <rdar://problem/23081143> 1132601 2 262945 jonlee 2015-10-12 17:38:53 -0700 Created attachment 262945 Patch 1132609 3 262945 sabouhallawa 2015-10-12 17:48:46 -0700 Comment on attachment 262945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262945&action=review > PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js:5 > + var toCenter = stage.randomPosition(stage.size).subtract(new Point(maxSize/2, maxSize/2)); You can use maxSize.center() instead of new Point(maxSize/2, maxSize/2). 1132612 4 262945 jonlee 2015-10-12 17:51:56 -0700 Comment on attachment 262945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262945&action=review >> PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js:5 >> + var toCenter = stage.randomPosition(stage.size).subtract(new Point(maxSize/2, maxSize/2)); > > You can use maxSize.center() instead of new Point(maxSize/2, maxSize/2). maxSize is an int though... 1132615 5 262945 sabouhallawa 2015-10-12 17:57:01 -0700 Comment on attachment 262945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262945&action=review >>> PerformanceTests/Animometer/tests/simple/resources/simple-canvas-paths.js:5 >>> + var toCenter = stage.randomPosition(stage.size).subtract(new Point(maxSize/2, maxSize/2)); >> >> You can use maxSize.center() instead of new Point(maxSize/2, maxSize/2). > > maxSize is an int though... Never mind. I thought maxSize is a rectangle of max width and max height and not a side in a square side. 1132616 6 262945 dino 2015-10-12 18:05:31 -0700 Comment on attachment 262945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262945&action=review > PerformanceTests/Animometer/tests/simple/resources/simple-canvas.js:51 > +} > + > + > +function SimpleCanvasBenchmark(suite, test, options, recordTable, progressBar) { Nit: extra blank line 1132618 7 jonlee 2015-10-12 18:12:56 -0700 Committed r190912: <http://trac.webkit.org/changeset/190912> 262945 2015-10-12 17:38:53 -0700 2015-10-12 18:05:31 -0700 Patch bug-150066-20151012173817.patch text/plain 15168 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwOTA4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0FuaW1vbWV0ZXIvcnVubmVyL3Jlc291cmNlcy90ZXN0cy5qcyBiL1BlcmZvcm1hbmNlVGVzdHMv QW5pbW9tZXRlci9ydW5uZXIvcmVzb3VyY2VzL3Rlc3RzLmpzCmluZGV4IDViNGYwMmM1NjE4M2Yz NzM2MWZkYTk1YzhkNjI0ZGQyZDkwM2ZkMTYuLjY0MzA1ZDdiM2RjNzYxOTdlMTBiZWI2ODBlY2Fi YmRjM2RiYTc0NWQgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9ydW5u ZXIvcmVzb3VyY2VzL3Rlc3RzLmpzCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci9y dW5uZXIvcmVzb3VyY2VzL3Rlc3RzLmpzCkBAIC0xMzYsNiArMTM2LDQzIEBAIFN1aXRlcy5wdXNo KG5ldyBTdWl0ZSgiU1ZHIHN1aXRlIiwKICAgICBdCiApKTsKIAorU3VpdGVzLnB1c2gobmV3IFN1 aXRlKCJCYXNpYyBjYW52YXMgcGF0aCBzdWl0ZSIsCisgICAgWworICAgICAgICB7CisgICAgICAg ICAgICB1cmw6ICJzaW1wbGUvc2ltcGxlLWNhbnZhcy1wYXRocy5odG1sP3BhdGhUeXBlPXF1YWRy YXRpYyIsCisgICAgICAgICAgICBuYW1lOiAiQ2FudmFzIHF1YWRyYXRpYyBzZWdtZW50cyIKKyAg ICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdXJsOiAic2ltcGxlL3NpbXBsZS1jYW52 YXMtcGF0aHMuaHRtbD9wYXRoVHlwZT1iZXppZXIiLAorICAgICAgICAgICAgbmFtZTogIkNhbnZh cyBiZXppZXIgc2VnbWVudHMiCisgICAgICAgIH0sCisgICAgICAgIHsKKyAgICAgICAgICAgIHVy bDogInNpbXBsZS9zaW1wbGUtY2FudmFzLXBhdGhzLmh0bWw/JnBhdGhUeXBlPWFyY1RvIiwKKyAg ICAgICAgICAgIG5hbWU6ICJDYW52YXMgYXJjVG8gc2VnbWVudHMiCisgICAgICAgIH0sCisgICAg ICAgIHsKKyAgICAgICAgICAgIHVybDogInNpbXBsZS9zaW1wbGUtY2FudmFzLXBhdGhzLmh0bWw/ cGF0aFR5cGU9YXJjIiwKKyAgICAgICAgICAgIG5hbWU6ICJDYW52YXMgYXJjIHNlZ21lbnRzIgor ICAgICAgICB9LAorICAgICAgICB7CisgICAgICAgICAgICB1cmw6ICJzaW1wbGUvc2ltcGxlLWNh bnZhcy1wYXRocy5odG1sP3BhdGhUeXBlPXJlY3QiLAorICAgICAgICAgICAgbmFtZTogIkNhbnZh cyByZWN0cyIKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdXJsOiAic2ltcGxl L3NpbXBsZS1jYW52YXMtcGF0aHMuaHRtbD8mcGF0aFR5cGU9YXJjVG9GaWxsIiwKKyAgICAgICAg ICAgIG5hbWU6ICJDYW52YXMgYXJjVG8gc2VnbWVudHMsIGZpbGwiCisgICAgICAgIH0sCisgICAg ICAgIHsKKyAgICAgICAgICAgIHVybDogInNpbXBsZS9zaW1wbGUtY2FudmFzLXBhdGhzLmh0bWw/ cGF0aFR5cGU9YXJjRmlsbCIsCisgICAgICAgICAgICBuYW1lOiAiQ2FudmFzIGFyYyBzZWdtZW50 cywgZmlsbCIKKyAgICAgICAgfSwKKyAgICAgICAgeworICAgICAgICAgICAgdXJsOiAic2ltcGxl L3NpbXBsZS1jYW52YXMtcGF0aHMuaHRtbD9wYXRoVHlwZT1yZWN0RmlsbCIsCisgICAgICAgICAg ICBuYW1lOiAiQ2FudmFzIHJlY3RzLCBmaWxsIgorICAgICAgICB9CisgICAgXQorKSk7CisKIFN1 aXRlcy5wdXNoKG5ldyBTdWl0ZSgiQ29tcGxleCBleGFtcGxlcyIsCiAgICAgWwogICAgICAgICB7 CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2Vz L3N0YWdlLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL3Jlc291cmNlcy9z dGFnZS5qcwppbmRleCA2ZDZlZDI0YzYwYmEwOTFjY2IyZGRlY2UxNmQwNTgzMTg5NTQzZWIwLi40 NzYzNjE5ZTA5N2Y3N2UzY2UzNzVlODdhOWM5YjEyOWQ1YTJkMDIzIDEwMDY0NAotLS0gYS9QZXJm b3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2VzL3N0YWdlLmpzCisrKyBiL1Bl cmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9yZXNvdXJjZXMvc3RhZ2UuanMKQEAgLTU1 LDkgKzU1LDE0IEBAIFN0YWdlLnByb3RvdHlwZSA9CiAgICAgICAgIHJldHVybiAoTWF0aC5yYW5k b20oKSAqIChtYXggLSBtaW4pKSArIG1pbjsKICAgICB9LAogICAgIAorICAgIHJhbmRvbUJvb2w6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiAhIU1hdGgucm91bmQodGhpcy5yYW5k b20oMCwgMSkpOworICAgIH0sCisKICAgICByYW5kb21JbnQ6IGZ1bmN0aW9uKG1pbiwgbWF4KQog ICAgIHsKLSAgICAgICAgcmV0dXJuIE1hdGguZmxvb3IodGhpcy5yYW5kb20obWluLCBtYXgpKTsK KyAgICAgICAgcmV0dXJuIE1hdGgucm91bmQodGhpcy5yYW5kb20obWluLCBtYXgpKTsKICAgICB9 LAogICAgIAogICAgIHJhbmRvbVBvc2l0aW9uOiBmdW5jdGlvbihtYXhQb3NpdGlvbikKZGlmZiAt LWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9zaW1wbGUvcmVzb3VyY2Vz L3NpbXBsZS1jYW52YXMtcGF0aHMuanMgYi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVz dHMvc2ltcGxlL3Jlc291cmNlcy9zaW1wbGUtY2FudmFzLXBhdGhzLmpzCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc5 Yzg1ZDFkMDE1NTg2YjEyM2EyMzk3MGVhMzgyOWM0MTE5NjRiMDgKLS0tIC9kZXYvbnVsbAorKysg Yi9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvc2ltcGxlL3Jlc291cmNlcy9zaW1w bGUtY2FudmFzLXBhdGhzLmpzCkBAIC0wLDAgKzEsMTM4IEBACisvLyA9PT0gUEFJTlQgT0JKRUNU UyA9PT0KKworZnVuY3Rpb24gQ2FudmFzUXVhZHJhdGljU2VnbWVudChzdGFnZSkgeworICAgIHZh ciBtYXhTaXplID0gc3RhZ2UucmFuZG9tSW50KDIwLCAyMDApOworICAgIHZhciB0b0NlbnRlciA9 IHN0YWdlLnJhbmRvbVBvc2l0aW9uKHN0YWdlLnNpemUpLnN1YnRyYWN0KG5ldyBQb2ludChtYXhT aXplLzIsIG1heFNpemUvMikpOworCisgICAgdGhpcy5fcG9pbnQxID0gc3RhZ2UucmFuZG9tUG9z aXRpb24obmV3IFBvaW50KG1heFNpemUsIG1heFNpemUpKS5hZGQodG9DZW50ZXIpOworICAgIHRo aXMuX3BvaW50MiA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKG5ldyBQb2ludChtYXhTaXplLCBtYXhT aXplKSkuYWRkKHRvQ2VudGVyKTsKKyAgICB0aGlzLl9wb2ludDMgPSBzdGFnZS5yYW5kb21Qb3Np dGlvbihuZXcgUG9pbnQobWF4U2l6ZSwgbWF4U2l6ZSkpLmFkZCh0b0NlbnRlcik7CisgICAgdGhp cy5fY29sb3IgPSBzdGFnZS5yYW5kb21Db2xvcigpOworICAgIHRoaXMuX2xpbmVXaWR0aCA9IHN0 YWdlLnJhbmRvbUludCgxLCA1MCk7Cit9OworQ2FudmFzUXVhZHJhdGljU2VnbWVudC5wcm90b3R5 cGUuZHJhdyA9IGZ1bmN0aW9uKGNvbnRleHQpIHsKKyAgICBjb250ZXh0LnN0cm9rZVN0eWxlID0g dGhpcy5fY29sb3I7CisgICAgY29udGV4dC5saW5lV2lkdGggPSB0aGlzLl9saW5lV2lkdGg7Cisg ICAgY29udGV4dC5iZWdpblBhdGgoKTsKKyAgICBjb250ZXh0Lm1vdmVUbyh0aGlzLl9wb2ludDEu eCwgdGhpcy5fcG9pbnQxLnkpOworICAgIGNvbnRleHQucXVhZHJhdGljQ3VydmVUbyh0aGlzLl9w b2ludDIueCwgdGhpcy5fcG9pbnQyLnksIHRoaXMuX3BvaW50My54LCB0aGlzLl9wb2ludDMueSk7 CisgICAgY29udGV4dC5zdHJva2UoKTsKK307CisKK2Z1bmN0aW9uIENhbnZhc0JlemllclNlZ21l bnQoc3RhZ2UpIHsKKyAgICB2YXIgbWF4U2l6ZSA9IHN0YWdlLnJhbmRvbUludCgyMCwgMjAwKTsK KyAgICB2YXIgdG9DZW50ZXIgPSBzdGFnZS5yYW5kb21Qb3NpdGlvbihzdGFnZS5zaXplKS5zdWJ0 cmFjdChuZXcgUG9pbnQobWF4U2l6ZS8yLCBtYXhTaXplLzIpKTsKKworICAgIHRoaXMuX3BvaW50 MSA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKG5ldyBQb2ludChtYXhTaXplLCBtYXhTaXplKSkuYWRk KHRvQ2VudGVyKTsKKyAgICB0aGlzLl9wb2ludDIgPSBzdGFnZS5yYW5kb21Qb3NpdGlvbihuZXcg UG9pbnQobWF4U2l6ZSwgbWF4U2l6ZSkpLmFkZCh0b0NlbnRlcik7CisgICAgdGhpcy5fcG9pbnQz ID0gc3RhZ2UucmFuZG9tUG9zaXRpb24obmV3IFBvaW50KG1heFNpemUsIG1heFNpemUpKS5hZGQo dG9DZW50ZXIpOworICAgIHRoaXMuX3BvaW50NCA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKG5ldyBQ b2ludChtYXhTaXplLCBtYXhTaXplKSkuYWRkKHRvQ2VudGVyKTsKKyAgICB0aGlzLl9jb2xvciA9 IHN0YWdlLnJhbmRvbUNvbG9yKCk7CisgICAgdGhpcy5fbGluZVdpZHRoID0gc3RhZ2UucmFuZG9t SW50KDEsIDUwKTsKK307CitDYW52YXNCZXppZXJTZWdtZW50LnByb3RvdHlwZS5kcmF3ID0gZnVu Y3Rpb24oY29udGV4dCkgeworICAgIGNvbnRleHQuc3Ryb2tlU3R5bGUgPSB0aGlzLl9jb2xvcjsK KyAgICBjb250ZXh0LmxpbmVXaWR0aCA9IHRoaXMuX2xpbmVXaWR0aDsKKyAgICBjb250ZXh0LmJl Z2luUGF0aCgpOworICAgIGNvbnRleHQubW92ZVRvKHRoaXMuX3BvaW50MS54LCB0aGlzLl9wb2lu dDEueSk7CisgICAgY29udGV4dC5iZXppZXJDdXJ2ZVRvKHRoaXMuX3BvaW50Mi54LCB0aGlzLl9w b2ludDIueSwgdGhpcy5fcG9pbnQzLngsIHRoaXMuX3BvaW50My55LCB0aGlzLl9wb2ludDQueCwg dGhpcy5fcG9pbnQ0LnkpOworICAgIGNvbnRleHQuc3Ryb2tlKCk7Cit9OworCitmdW5jdGlvbiBD YW52YXNBcmNUb1NlZ21lbnQoc3RhZ2UpIHsKKyAgICB2YXIgbWF4U2l6ZSA9IHN0YWdlLnJhbmRv bUludCgyMCwgMjAwKTsKKyAgICB2YXIgdG9DZW50ZXIgPSBzdGFnZS5yYW5kb21Qb3NpdGlvbihz dGFnZS5zaXplKS5zdWJ0cmFjdChuZXcgUG9pbnQobWF4U2l6ZS8yLCBtYXhTaXplLzIpKTsKKwor ICAgIHRoaXMuX3BvaW50MSA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKG5ldyBQb2ludChtYXhTaXpl LCBtYXhTaXplKSkuYWRkKHRvQ2VudGVyKTsKKyAgICB0aGlzLl9wb2ludDIgPSBzdGFnZS5yYW5k b21Qb3NpdGlvbihuZXcgUG9pbnQobWF4U2l6ZSwgbWF4U2l6ZSkpLmFkZCh0b0NlbnRlcik7Cisg ICAgdGhpcy5fcG9pbnQzID0gc3RhZ2UucmFuZG9tUG9zaXRpb24obmV3IFBvaW50KG1heFNpemUs IG1heFNpemUpKS5hZGQodG9DZW50ZXIpOworICAgIHRoaXMuX3JhZGl1cyA9IHN0YWdlLnJhbmRv bUludCgyMCwgMjAwKTsKKyAgICB0aGlzLl9jb2xvciA9IHN0YWdlLnJhbmRvbUNvbG9yKCk7Cisg ICAgdGhpcy5fbGluZVdpZHRoID0gc3RhZ2UucmFuZG9tSW50KDEsIDUwKTsKK307CitDYW52YXNB cmNUb1NlZ21lbnQucHJvdG90eXBlLmRyYXcgPSBmdW5jdGlvbihjb250ZXh0KSB7CisgICAgY29u dGV4dC5zdHJva2VTdHlsZSA9IHRoaXMuX2NvbG9yOworICAgIGNvbnRleHQubGluZVdpZHRoID0g dGhpcy5fbGluZVdpZHRoOworICAgIGNvbnRleHQuYmVnaW5QYXRoKCk7CisgICAgY29udGV4dC5t b3ZlVG8odGhpcy5fcG9pbnQxLngsIHRoaXMuX3BvaW50MS55KTsKKyAgICBjb250ZXh0LmFyY1Rv KHRoaXMuX3BvaW50Mi54LCB0aGlzLl9wb2ludDIueSwgdGhpcy5fcG9pbnQzLngsIHRoaXMuX3Bv aW50My55LCB0aGlzLl9yYWRpdXMpOworICAgIGNvbnRleHQuc3Ryb2tlKCk7Cit9OworCitmdW5j dGlvbiBDYW52YXNBcmNTZWdtZW50KHN0YWdlKSB7CisgICAgdmFyIG1heFNpemUgPSBzdGFnZS5y YW5kb21JbnQoMjAsIDIwMCk7CisgICAgdmFyIHRvQ2VudGVyID0gc3RhZ2UucmFuZG9tUG9zaXRp b24oc3RhZ2Uuc2l6ZSkuc3VidHJhY3QobmV3IFBvaW50KG1heFNpemUvMiwgbWF4U2l6ZS8yKSk7 CisKKyAgICB0aGlzLl9wb2ludCA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKG5ldyBQb2ludChtYXhT aXplLCBtYXhTaXplKSkuYWRkKHRvQ2VudGVyKTsKKyAgICB0aGlzLl9yYWRpdXMgPSBzdGFnZS5y YW5kb21JbnQoMjAsIDIwMCk7CisgICAgdGhpcy5fc3RhcnRBbmdsZSA9IHN0YWdlLnJhbmRvbUFu Z2xlKCk7CisgICAgdGhpcy5fZW5kQW5nbGUgPSBzdGFnZS5yYW5kb21BbmdsZSgpOworICAgIHRo aXMuX2NvdW50ZXJjbG9ja3dpc2UgPSBzdGFnZS5yYW5kb21Cb29sKCk7CisgICAgdGhpcy5fY29s b3IgPSBzdGFnZS5yYW5kb21Db2xvcigpOworICAgIHRoaXMuX2xpbmVXaWR0aCA9IHN0YWdlLnJh bmRvbUludCgxLCA1MCk7Cit9OworQ2FudmFzQXJjU2VnbWVudC5wcm90b3R5cGUuZHJhdyA9IGZ1 bmN0aW9uKGNvbnRleHQpIHsKKyAgICBjb250ZXh0LnN0cm9rZVN0eWxlID0gdGhpcy5fY29sb3I7 CisgICAgY29udGV4dC5saW5lV2lkdGggPSB0aGlzLl9saW5lV2lkdGg7CisgICAgY29udGV4dC5i ZWdpblBhdGgoKTsKKyAgICBjb250ZXh0LmFyYyh0aGlzLl9wb2ludC54LCB0aGlzLl9wb2ludC55 LCB0aGlzLl9yYWRpdXMsIHRoaXMuX3N0YXJ0QW5nbGUsIHRoaXMuX2VuZEFuZ2xlLCB0aGlzLl9j b3VudGVyY2xvY2t3aXNlKTsKKyAgICBjb250ZXh0LnN0cm9rZSgpOworfTsKKworZnVuY3Rpb24g Q2FudmFzUmVjdChzdGFnZSkgeworICAgIHRoaXMuX3dpZHRoID0gc3RhZ2UucmFuZG9tSW50KDIw LCAyMDApOworICAgIHRoaXMuX2hlaWdodCA9IHN0YWdlLnJhbmRvbUludCgyMCwgMjAwKTsKKyAg ICB0aGlzLl9wb2ludCA9IHN0YWdlLnJhbmRvbVBvc2l0aW9uKHN0YWdlLnNpemUpLnN1YnRyYWN0 KG5ldyBQb2ludCh0aGlzLl93aWR0aC8yLCB0aGlzLl9oZWlnaHQvMikpOworICAgIHRoaXMuX2Nv bG9yID0gc3RhZ2UucmFuZG9tQ29sb3IoKTsKKyAgICB0aGlzLl9saW5lV2lkdGggPSBzdGFnZS5y YW5kb21JbnQoMSwgMjApOworfQorQ2FudmFzUmVjdC5wcm90b3R5cGUuZHJhdyA9IGZ1bmN0aW9u KGNvbnRleHQpIHsKKyAgICBjb250ZXh0LnN0cm9rZVN0eWxlID0gdGhpcy5fY29sb3I7CisgICAg Y29udGV4dC5saW5lV2lkdGggPSB0aGlzLl9saW5lV2lkdGg7CisgICAgY29udGV4dC5iZWdpblBh dGgoKTsKKyAgICBjb250ZXh0LnJlY3QodGhpcy5fcG9pbnQueCwgdGhpcy5fcG9pbnQueSwgdGhp cy5fd2lkdGgsIHRoaXMuX2hlaWdodCk7CisgICAgY29udGV4dC5zdHJva2UoKTsKK307CisKK2Z1 bmN0aW9uIENhbnZhc1JlY3RGaWxsKHN0YWdlKSB7CisgICAgQ2FudmFzUmVjdC5jYWxsKHRoaXMs IHN0YWdlKTsKK30KK0NhbnZhc1JlY3RGaWxsLnByb3RvdHlwZS5kcmF3ID0gZnVuY3Rpb24oY29u dGV4dCkgeworICAgIGNvbnRleHQuZmlsbFN0eWxlID0gdGhpcy5fY29sb3I7CisgICAgY29udGV4 dC5iZWdpblBhdGgoKTsKKyAgICBjb250ZXh0LnJlY3QodGhpcy5fcG9pbnQueCwgdGhpcy5fcG9p bnQueSwgdGhpcy5fd2lkdGgsIHRoaXMuX2hlaWdodCk7CisgICAgY29udGV4dC5maWxsKCk7Cit9 OworCisvLyA9PT0gQkVOQ0hNQVJLID09PQorCitmdW5jdGlvbiBDYW52YXNQYXRoQmVuY2htYXJr KHN1aXRlLCB0ZXN0LCBvcHRpb25zLCByZWNvcmRUYWJsZSwgcHJvZ3Jlc3NCYXIpIHsKKyAgICBT aW1wbGVDYW52YXNCZW5jaG1hcmsuY2FsbCh0aGlzLCBzdWl0ZSwgdGVzdCwgb3B0aW9ucywgcmVj b3JkVGFibGUsIHByb2dyZXNzQmFyKTsKK30KK0NhbnZhc1BhdGhCZW5jaG1hcmsucHJvdG90eXBl ID0gT2JqZWN0LmNyZWF0ZShTaW1wbGVDYW52YXNCZW5jaG1hcmsucHJvdG90eXBlKTsKK0NhbnZh c1BhdGhCZW5jaG1hcmsucHJvdG90eXBlLmNvbnN0cnVjdG9yID0gQ2FudmFzUGF0aEJlbmNobWFy azsKK0NhbnZhc1BhdGhCZW5jaG1hcmsucHJvdG90eXBlLmNyZWF0ZVN0YWdlID0gZnVuY3Rpb24o ZWxlbWVudCkKK3sKKyAgICBzd2l0Y2ggKHRoaXMuX29wdGlvbnNbInBhdGhUeXBlIl0pIHsKKyAg ICBjYXNlICJxdWFkcmF0aWMiOgorICAgICAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc1N0YWdl KGVsZW1lbnQsIHRoaXMuX29wdGlvbnMsIENhbnZhc1F1YWRyYXRpY1NlZ21lbnQpOworICAgIGNh c2UgImJlemllciI6CisgICAgICAgIHJldHVybiBuZXcgU2ltcGxlQ2FudmFzU3RhZ2UoZWxlbWVu dCwgdGhpcy5fb3B0aW9ucywgQ2FudmFzQmV6aWVyU2VnbWVudCk7CisgICAgY2FzZSAiYXJjVG8i OgorICAgICAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc1N0YWdlKGVsZW1lbnQsIHRoaXMuX29w dGlvbnMsIENhbnZhc0FyY1RvU2VnbWVudCk7CisgICAgY2FzZSAiYXJjIjoKKyAgICAgICAgcmV0 dXJuIG5ldyBTaW1wbGVDYW52YXNTdGFnZShlbGVtZW50LCB0aGlzLl9vcHRpb25zLCBDYW52YXNB cmNTZWdtZW50KTsKKyAgICBjYXNlICJyZWN0IjoKKyAgICAgICAgcmV0dXJuIG5ldyBTaW1wbGVD YW52YXNTdGFnZShlbGVtZW50LCB0aGlzLl9vcHRpb25zLCBDYW52YXNSZWN0KTsKKyAgICBjYXNl ICJhcmNUb0ZpbGwiOgorICAgICAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc1N0YWdlKGVsZW1l bnQsIHRoaXMuX29wdGlvbnMsIENhbnZhc0FyY1RvU2VnbWVudEZpbGwpOworICAgIGNhc2UgImFy Y0ZpbGwiOgorICAgICAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc1N0YWdlKGVsZW1lbnQsIHRo aXMuX29wdGlvbnMsIENhbnZhc0FyY1NlZ21lbnRGaWxsKTsKKyAgICBjYXNlICJyZWN0RmlsbCI6 CisgICAgICAgIHJldHVybiBuZXcgU2ltcGxlQ2FudmFzU3RhZ2UoZWxlbWVudCwgdGhpcy5fb3B0 aW9ucywgQ2FudmFzUmVjdEZpbGwpOworICAgIH0KK30KKword2luZG93LmJlbmNobWFya0NsaWVu dC5jcmVhdGUgPSBmdW5jdGlvbihzdWl0ZSwgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHBy b2dyZXNzQmFyKSB7CisgICAgcmV0dXJuIG5ldyBDYW52YXNQYXRoQmVuY2htYXJrKHN1aXRlLCB0 ZXN0LCBvcHRpb25zLCByZWNvcmRUYWJsZSwgcHJvZ3Jlc3NCYXIpOworfQpkaWZmIC0tZ2l0IGEv UGVyZm9ybWFuY2VUZXN0cy9Bbmltb21ldGVyL3Rlc3RzL3NpbXBsZS9yZXNvdXJjZXMvc2ltcGxl LWNhbnZhcy5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9zaW1wbGUvcmVz b3VyY2VzL3NpbXBsZS1jYW52YXMuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTI2MGE0Zjc2NGE2Y2E3Zjk3MDk5 NmFiNTVhODFkMjdiNzc1MDQ5ZQotLS0gL2Rldi9udWxsCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMv QW5pbW9tZXRlci90ZXN0cy9zaW1wbGUvcmVzb3VyY2VzL3NpbXBsZS1jYW52YXMuanMKQEAgLTAs MCArMSw2MiBAQAorCitmdW5jdGlvbiBTaW1wbGVDYW52YXNTdGFnZShlbGVtZW50LCBvcHRpb25z LCBjYW52YXNPYmplY3QpCit7CisgICAgU3RhZ2UuY2FsbCh0aGlzLCBlbGVtZW50LCBvcHRpb25z KTsKKyAgICB0aGlzLmNvbnRleHQgPSB0aGlzLmVsZW1lbnQuZ2V0Q29udGV4dCgiMmQiKTsKKyAg ICB0aGlzLmNhbnZhc09iamVjdCA9IGNhbnZhc09iamVjdDsKKyAgICB0aGlzLl9vYmplY3RzID0g W107Cit9CitTaW1wbGVDYW52YXNTdGFnZS5wcm90b3R5cGUgPSBPYmplY3QuY3JlYXRlKFN0YWdl LnByb3RvdHlwZSk7CitTaW1wbGVDYW52YXNTdGFnZS5wcm90b3R5cGUuY29uc3RydWN0b3IgPSBT aW1wbGVDYW52YXNTdGFnZTsKK1NpbXBsZUNhbnZhc1N0YWdlLnByb3RvdHlwZS50dW5lID0gZnVu Y3Rpb24oY291bnQpCit7CisgICAgaWYgKGNvdW50ID09IDApCisgICAgICAgIHJldHVybiB0aGlz Ll9vYmplY3RzLmxlbmd0aDsKKworICAgIGlmIChjb3VudCA+IDApIHsKKyAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBjb3VudDsgKytpKSB7CisgICAgICAgICAgICB0aGlzLl9vYmplY3RzLnB1 c2gobmV3IHRoaXMuY2FudmFzT2JqZWN0KHRoaXMpKTsKKyAgICAgICAgfQorICAgICAgICByZXR1 cm4gdGhpcy5fb2JqZWN0cy5sZW5ndGg7CisgICAgfQorCisgICAgY291bnQgPSBNYXRoLm1pbigt Y291bnQsIHRoaXMuX29iamVjdHMubGVuZ3RoKTsKKyAgICB0aGlzLl9vYmplY3RzLnNwbGljZSgt Y291bnQsIGNvdW50KTsKKworICAgIHJldHVybiB0aGlzLl9vYmplY3RzLmxlbmd0aDsKK30KK1Np bXBsZUNhbnZhc1N0YWdlLnByb3RvdHlwZS5hbmltYXRlID0gZnVuY3Rpb24oKQoreworICAgIHZh ciBjb250ZXh0ID0gdGhpcy5jb250ZXh0OworICAgIHRoaXMuX29iamVjdHMuZm9yRWFjaChmdW5j dGlvbihvYmplY3QpIHsKKyAgICAgICAgb2JqZWN0LmRyYXcoY29udGV4dCk7CisgICAgfSk7Cit9 CisKK2Z1bmN0aW9uIFNpbXBsZUNhbnZhc0FuaW1hdG9yKGJlbmNobWFyaykKK3sKKyAgICBTdGFn ZUFuaW1hdG9yLmNhbGwodGhpcywgYmVuY2htYXJrKTsKKyAgICB0aGlzLl9jb250ZXh0ID0gYmVu Y2htYXJrLl9zdGFnZS5jb250ZXh0OworfQorCitTaW1wbGVDYW52YXNBbmltYXRvci5wcm90b3R5 cGUgPSBPYmplY3QuY3JlYXRlKFN0YWdlQW5pbWF0b3IucHJvdG90eXBlKTsKK1NpbXBsZUNhbnZh c0FuaW1hdG9yLnByb3RvdHlwZS5jb25zdHJ1Y3RvciA9IFNpbXBsZUNhbnZhc0FuaW1hdG9yOwor U2ltcGxlQ2FudmFzQW5pbWF0b3IucHJvdG90eXBlLmFuaW1hdGUgPSBmdW5jdGlvbigpCit7Cisg ICAgdGhpcy5fY29udGV4dC5jbGVhclJlY3QoMCwgMCwgdGhpcy5fYmVuY2htYXJrLl9zdGFnZS5z aXplLngsIHRoaXMuX2JlbmNobWFyay5fc3RhZ2Uuc2l6ZS55KTsKKyAgICByZXR1cm4gU3RhZ2VB bmltYXRvci5wcm90b3R5cGUuYW5pbWF0ZS5jYWxsKHRoaXMpOworfQorCisKK2Z1bmN0aW9uIFNp bXBsZUNhbnZhc0JlbmNobWFyayhzdWl0ZSwgdGVzdCwgb3B0aW9ucywgcmVjb3JkVGFibGUsIHBy b2dyZXNzQmFyKSB7CisgICAgb3B0aW9uc1siZ2FpbiJdID0gNjsKKyAgICBvcHRpb25zWyJhZGRM aW1pdCJdID0gMTAwOworICAgIG9wdGlvbnNbInJlbW92ZUxpbWl0Il0gPSAxMDAwOworICAgIFN0 YWdlQmVuY2htYXJrLmNhbGwodGhpcywgc3VpdGUsIHRlc3QsIG9wdGlvbnMsIHJlY29yZFRhYmxl LCBwcm9ncmVzc0Jhcik7Cit9CitTaW1wbGVDYW52YXNCZW5jaG1hcmsucHJvdG90eXBlID0gT2Jq ZWN0LmNyZWF0ZShTdGFnZUJlbmNobWFyay5wcm90b3R5cGUpOworU2ltcGxlQ2FudmFzQmVuY2ht YXJrLnByb3RvdHlwZS5jb25zdHJ1Y3RvciA9IFNpbXBsZUNhbnZhc0JlbmNobWFyazsKK1NpbXBs ZUNhbnZhc0JlbmNobWFyay5wcm90b3R5cGUuY3JlYXRlQW5pbWF0b3IgPSBmdW5jdGlvbigpIHsK KyAgICByZXR1cm4gbmV3IFNpbXBsZUNhbnZhc0FuaW1hdG9yKHRoaXMpOworfQorCmRpZmYgLS1n aXQgYS9QZXJmb3JtYW5jZVRlc3RzL0FuaW1vbWV0ZXIvdGVzdHMvc2ltcGxlL3NpbXBsZS1jYW52 YXMtcGF0aHMuaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMvQW5pbW9tZXRlci90ZXN0cy9zaW1wbGUv c2ltcGxlLWNhbnZhcy1wYXRocy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJmNjE4NDY1MDFjODA4MDNkMmY1 YmVhMmQ5MjViMzI4OTg4ZjRmNDIKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJmb3JtYW5jZVRlc3Rz L0FuaW1vbWV0ZXIvdGVzdHMvc2ltcGxlL3NpbXBsZS1jYW52YXMtcGF0aHMuaHRtbApAQCAtMCww ICsxLDE4IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPGxpbmsgcmVs PSJzdHlsZXNoZWV0IiB0eXBlPSJ0ZXh0L2NzcyIgaHJlZj0iLi4vcmVzb3VyY2VzL3N0YWdlLmNz cyI+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9hbGdvcml0aG0uanMiPjwvc2Ny aXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvc2FtcGxlci5qcyI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9leHRlbnNpb25zLmpzIj48L3Nj cmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21hdGguanMiPjwvc2NyaXB0Pgor ICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdXRpbGl0aWVzLmpzIj48L3NjcmlwdD4KKyAg ICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21haW4uanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQgc3JjPSIuLi9yZXNvdXJjZXMvc3RhZ2UuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3Jj PSJyZXNvdXJjZXMvc2ltcGxlLWNhbnZhcy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9 InJlc291cmNlcy9zaW1wbGUtY2FudmFzLXBhdGhzLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorICAgIDxjYW52YXMgaWQ9InN0YWdlIj48L2NhbnZhcz4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nIGIvUGVyZm9ybWFuY2VUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggZWYxZDY0YzVmM2Y2NzQxYTVmNzU1MTM5NjUzYmFlYTc4ZTRlZDdk NS4uMTA1MWVhYzgyYjJhZDdiY2M2MTdmODNjNjZmOGRmODhiMzBmYmIyZCAxMDA2NDQKLS0tIGEv UGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsNSArMSw1MiBAQAogMjAxNS0xMC0xMiAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5j b20+CiAKKyAgICAgICAgQWRkIGJhc2ljIGNhbnZhcyB0ZXN0cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDY2CisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzIzMDgxMTQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBhZGRzIGEgbmV3IHRlc3Qgc3VpdGUgdGhhdCB3aWxsIGNvdmVyIGFsbCBvZiB0 aGUgcGF0aC1iYXNlZCBjYW52YXMgY2FsbHMuCisgICAgICAgIFRoZSBwYXRjaCB3aWxsIGJlIGRp dmlkZWQgdXAgdG8gY292ZXIgdGVzdHMgd2l0aCBzaW1pbGFyIHRlY2huaXF1ZXMuCisKKyAgICAg ICAgVGhlIHNpbXBsZXN0IHZlcnNpb24gdXNlcyBhIFNpbXBsZUNhbnZhc1N0YWdlLgorCisgICAg ICAgICogQW5pbW9tZXRlci9ydW5uZXIvcmVzb3VyY2VzL3Rlc3RzLmpzOiBBZGQgdGVzdHMgZm9y IHF1YWRyYXRpYywgYmV6aWVyLCBhcmNUbywKKyAgICAgICAgYXJjLCBhbmQgcmVjdCBzZWdtZW50 cy4gQWxzbyBpbmNsdWRlIGFyY1RvLCBhcmMsIGFuZCByZWN0IGZpbGxzLgorICAgICAgICAqIEFu aW1vbWV0ZXIvdGVzdHMvcmVzb3VyY2VzL3N0YWdlLmpzOgorICAgICAgICAoU3RhZ2UucHJvdG90 eXBlLnJhbmRvbUJvb2wpOiBBZGRlZCBmb3IgY291bnRlcmNsb2Nrd2lzZSBwcm9wZXJ0eSBmb3Ig YXJjIHNlZ21lbnRzLgorICAgICAgICAoU3RhZ2UucHJvdG90eXBlLnJhbmRvbUludCk6IEZpeCBo b3cgdmFsdWVzIGFyZSByb3VuZGVkLCB1c2VkIGJ5IHJhbmRvbUJvb2wuIEl0IHNob3VsZAorICAg ICAgICByb3VuZCBpbnN0ZWFkIG9mIGZsb29yaW5nIGV2ZXJ5dGhpbmcuCisgICAgICAgICogQW5p bW9tZXRlci90ZXN0cy9zaW1wbGUvcmVzb3VyY2VzL3NpbXBsZS1jYW52YXMuanM6IEFkZGVkLiBE ZWZpbmVzIGNvbW1vbiBjbGFzc2VzCisgICAgICAgIHVzZWQgYnkgYWxsIHNpbXBsZSBjYW52YXMg dGVzdHMuIFRoZSBwYWdlIHJlYWRzIGJlc3QgYm90dG9tIHRvIHRvcC4KKyAgICAgICAgKFNpbXBs ZUNhbnZhc1N0YWdlKTogQmFzaWMgc3RhZ2UuIFBhc3MgYSBjYW52YXNPYmplY3Qgd2hpY2ggd2ls bCBiZSB1c2VkIHRvIGNyZWF0ZSBuZXcKKyAgICAgICAgb2JqZWN0cyBhcyBuZWVkZWQgaW4gdHVu ZSgpLgorICAgICAgICAoU2ltcGxlQ2FudmFzU3RhZ2UucHJvdG90eXBlLnR1bmUpOiBNb2RlbGVk IG9uIG90aGVyIHRlc3RzLiBBZGRzIGFuZCByZW1vdmVkIG9iamVjdHMKKyAgICAgICAgYXMgc3Bl Y2lmaWVkIGJ5IHRoZSBwcm92aWRlZCB8Y291bnR8LgorICAgICAgICAoU2ltcGxlQ2FudmFzU3Rh Z2UucHJvdG90eXBlLmFuaW1hdGUpOiBJdGVyYXRlIG92ZXIgYWxsIHRoZSBvYmplY3RzIGFuZCBh c2sgdGhlbSB0byBkcmF3LgorICAgICAgICBUaGVyZSBpcyBubyAiYW5pbWF0aW5nIiBvZiB0aGUg b2JqZWN0czsgdGhleSB3aWxsIGp1c3QgcGFpbnQgc3RhdGljYWxseSBvbiB0aGUgY2FudmFzLgor ICAgICAgICAoU2ltcGxlQ2FudmFzQW5pbWF0b3IpOiBCYXNpYyBhbmltYXRvciBjbGVhcnMgdGhl IGNhbnZhcyBwcmlvciB0byBwYWludGluZy4KKyAgICAgICAgKFNpbXBsZUNhbnZhc0JlbmNobWFy ayk6IEhhcmQtY29kZSB0aGUgZmVlZGJhY2sgbG9vcCBwYXJhbWV0ZXJzIGluc3RlYWQgb2YgaW5j bHVkaW5nCisgICAgICAgIHRoZW0gaW4gdGhlIHF1ZXJ5IHBhcmFtZXRlcnMgdG8gdGhlIHRlc3Qg VVJMcy4KKyAgICAgICAgKFNpbXBsZUNhbnZhc0JlbmNobWFyay5wcm90b3R5cGUuY3JlYXRlQW5p bWF0b3IpOgorICAgICAgICAqIEFuaW1vbWV0ZXIvdGVzdHMvc2ltcGxlL3NpbXBsZS1jYW52YXMt cGF0aHMuaHRtbDogQWRkZWQuCisKKyAgICAgICAgKiBBbmltb21ldGVyL3Rlc3RzL3NpbXBsZS9y ZXNvdXJjZXMvc2ltcGxlLWNhbnZhcy1wYXRocy5qczogQWRkZWQuIFRoZXJlIGlzIG5vICJhbmlt YXRpbmciCisgICAgICAgIG9mIHRoZXNlIG9iamVjdHMtLXRoZXkganVzdCBwYWludCBzdGF0aWNh bGx5IG9uIHRoZSBjYW52YXMuCisgICAgICAgIChDYW52YXNRdWFkcmF0aWNTZWdtZW50KTogUGFp bnQgYSBxdWFkcmF0aWMgc2VnbWVudCBzdHJva2UuCisgICAgICAgIChDYW52YXNCZXppZXJTZWdt ZW50KTogUGFpbnQgYSBiZXppZXIgc2VnbWVudCBzdHJva2UuCisgICAgICAgIChDYW52YXNBcmNU b1NlZ21lbnQpOiBQYWludCBhbiBhcmNUbyBzdHJva2UuCisgICAgICAgIChDYW52YXNBcmNTZWdt ZW50KTogUGFpbnQgYW4gYXJjIHN0cm9rZS4KKyAgICAgICAgKENhbnZhc1JlY3QpOiBQYWludCBh IHJlY3QuCisgICAgICAgIChDYW52YXNSZWN0RmlsbCk6IFBhaW50IGEgZmlsbGVkIHJlY3QuCisK KyAgICAgICAgKENhbnZhc1BhdGhCZW5jaG1hcmspOgorICAgICAgICAoQ2FudmFzUGF0aEJlbmNo bWFyay5wcm90b3R5cGUuY3JlYXRlU3RhZ2UpOiBMb29rIGZvciB0aGUgcGF0aFR5cGUgYW5kIGNy ZWF0ZSB0aGUKKyAgICAgICAgc3RhZ2UgdXNpbmcgdGhlIHJpZ2h0IHBhaW50IG9iamVjdC4KKyAg ICAgICAgKHdpbmRvdy5iZW5jaG1hcmtDbGllbnQuY3JlYXRlKToKKworMjAxNS0xMC0xMiAgSm9u IExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKICAgICAgICAgUmVmYWN0b3IgdHVuZSgpIHRvIHBh c3MgaW4gYW4gaW50ZWdlci1iYXNlZCBjb3VudAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMDYwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yMzA3 OTQyNT4K