85280 2012-05-01 06:59:09 -0700 [CG] Minor refactor of ImageBuffer::CGImageToDataURL and its callers 2012-05-07 01:08:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 noel.gordon noel.gordon eric kbr mitz thorton webkit.review.bot oldest_to_newest 613370 0 noel.gordon 2012-05-01 06:59:09 -0700 [CG] Minor refactor of ImageBuffer::CGImageToDataURL and its callers 613371 1 139621 noel.gordon 2012-05-01 07:05:09 -0700 Created attachment 139621 Patch 615953 2 140157 noel.gordon 2012-05-03 22:15:49 -0700 Created attachment 140157 Patch 615954 3 noel.gordon 2012-05-03 22:16:39 -0700 Adding Kenneth for the webgl aspect. 615965 4 noel.gordon 2012-05-03 22:45:00 -0700 canvas/philip/tests/toDataURL* and fast/canvas/webgl/premultiplyalpha-test.html are passing locally for me with this change. 616582 5 140157 kbr 2012-05-04 13:29:16 -0700 Comment on attachment 140157 Patch Looks fine. r=me 616833 6 140157 webkit.review.bot 2012-05-04 17:49:00 -0700 Comment on attachment 140157 Patch Clearing flags on attachment: 140157 Committed r116196: <http://trac.webkit.org/changeset/116196> 616834 7 webkit.review.bot 2012-05-04 17:49:04 -0700 All reviewed patches have been landed. Closing bug. 617443 8 noel.gordon 2012-05-07 01:08:11 -0700 Noticed the alpha channel stuffing to 255 similar to bug 84319. Again we could tell the CG JPEG image encoder to just ignore the alpha channel. Filed bug 85779 about that. 139621 2012-05-01 07:05:09 -0700 2012-05-03 22:15:42 -0700 Patch bug-85280-20120502000506.patch text/plain 5732 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1NzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTg3NzQ0MGUwYTdjYjM3 NjM4ZjVhYzBjZDQ4NzJjYTk3YmIzZDUyZS4uZWRlNGQ4OTk0NWU5NDJkNWJlZGZjN2M0NGMwNDIz ZTM5NDFjYjNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTAxICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBbQ0ddIE1pbm9yIHJl ZmFjdG9yIG9mIEltYWdlQnVmZmVyOjpDR0ltYWdlVG9EYXRhVVJMIGFuZCBpdHMgY2FsbGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUyODAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IG1lYW5zIHRvIHNpbXBsaWZ5IHRoZSBkaWZmIG9mIGFuIHVwY29taW5nIHBhdGNoLiBSZWZhY3Rv cmluZworICAgICAgICBoZXJlIGluIHByZXBhcmF0aW9uIGZvciB0aGF0IHBhdGNoLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICogcGxh dGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD R0ltYWdlVG9EYXRhVVJMKTogTW92ZSB0aGUgaW52YWxpZCBpbWFnZSAoIWltYWdlKSB0ZXN0IGhl cmUuCisgICAgICAgIFRoZSBjb21tZW50cyBhcmUgYWJvdXQgSlBFRyBpbWFnZXM7IHNheSB0aGF0 LiBSZW5hbWUgb3V0IHRvIGJhc2U2NERhdGEuCisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZl cjo6dG9EYXRhVVJMKTogUmVtb3ZlIHRoZSAhaW1hZ2UgdGVzdC4KKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlRGF0YVRvRGF0YVVSTCk6IE1vdmUgYW5kIGRlZmluZSB2YXJpYWJsZXMgd2hlcmUgdXNl ZCBhbmQKKyAgICAgICAgbWFrZSB0aGUgY29kZSBmbG93IHJlYWQgc2ltaWxhcmx5IHRvIHRvRGF0 YVVSTC4gUmVtb3ZlIHRoZSAhaW1hZ2UgdGVzdC4KKwogMjAxMi0wNS0wMSAgRGFuYSBKYW5zZW5z ICA8ZGFuYWtqQGNocm9taXVtLm9yZz4KIAogICAgICAgICBFYXJseS1vdXQgZm9yIHN1YnRyYWN0 aW5nIGEgbm9uLWludGVyc2VjdGluZyByZWdpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NnL0ltYWdlQnVmZmVyQ0cuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAKaW5kZXggNzQ1ZjRhMDQ3ZWNk OTMxMzVjMGZiZmQwNjljYjVmMTRkMzc5YWFmMy4uMmY4Yzg1NzllYzA2Nzc4YWVmZDdiYzZjMWU4 MTgzODgwMDhiZmJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAKQEAgLTQwMSw2ICs0MDEsOSBAQCBzdGF0aWMgUmV0 YWluUHRyPENGU3RyaW5nUmVmPiB1dGlGcm9tTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlw ZSkKIAogc3RhdGljIFN0cmluZyBDR0ltYWdlVG9EYXRhVVJMKENHSW1hZ2VSZWYgaW1hZ2UsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IGRvdWJsZSogcXVhbGl0eSkKIHsKKyAgICBpZiAo IWltYWdlKQorICAgICAgICByZXR1cm4gImRhdGE6LCI7CisKICAgICBSZXRhaW5QdHI8Q0ZNdXRh YmxlRGF0YVJlZj4gZGF0YShBZG9wdENGLCBDRkRhdGFDcmVhdGVNdXRhYmxlKGtDRkFsbG9jYXRv ckRlZmF1bHQsIDApKTsKICAgICBpZiAoIWRhdGEpCiAgICAgICAgIHJldHVybiAiZGF0YTosIjsK QEAgLTQxNCwyMyArNDE3LDIzIEBAIHN0YXRpYyBTdHJpbmcgQ0dJbWFnZVRvRGF0YVVSTChDR0lt YWdlUmVmIGltYWdlLCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBkCiAKICAgICBSZXRh aW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBpbWFnZVByb3BlcnRpZXMgPSAwOwogICAgIGlmIChDRkVx dWFsKHV0aS5nZXQoKSwganBlZ1VUSSgpKSAmJiBxdWFsaXR5ICYmICpxdWFsaXR5ID49IDAuMCAm JiAqcXVhbGl0eSA8PSAxLjApIHsKLSAgICAgICAgLy8gQXBwbHkgdGhlIGNvbXByZXNzaW9uIHF1 YWxpdHkgdG8gdGhlIGltYWdlIGRlc3RpbmF0aW9uLgorICAgICAgICAvLyBBcHBseSB0aGUgY29t cHJlc3Npb24gcXVhbGl0eSB0byB0aGUgSlBFRyBpbWFnZSBkZXN0aW5hdGlvbi4KICAgICAgICAg UmV0YWluUHRyPENGTnVtYmVyUmVmPiBjb21wcmVzc2lvblF1YWxpdHkoQWRvcHRDRiwgQ0ZOdW1i ZXJDcmVhdGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwga0NGTnVtYmVyRG91YmxlVHlwZSwgcXVhbGl0 eSkpOwogICAgICAgICBjb25zdCB2b2lkKiBrZXkgPSBrQ0dJbWFnZURlc3RpbmF0aW9uTG9zc3lD b21wcmVzc2lvblF1YWxpdHk7CiAgICAgICAgIGNvbnN0IHZvaWQqIHZhbHVlID0gY29tcHJlc3Np b25RdWFsaXR5LmdldCgpOwogICAgICAgICBpbWFnZVByb3BlcnRpZXMuYWRvcHRDRihDRkRpY3Rp b25hcnlDcmVhdGUoMCwgJmtleSwgJnZhbHVlLCAxLCAma0NGVHlwZURpY3Rpb25hcnlLZXlDYWxs QmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKSk7CiAgICAgfQogCi0gICAg Ly8gU2V0dGluZyBrQ0dJbWFnZURlc3RpbmF0aW9uQmFja2dyb3VuZENvbG9yIHRvIGJsYWNrIGlu IGltYWdlUHJvcGVydGllcyB3b3VsZCBhbGxvdyBzYXZpbmcgc29tZSBtYXRoIGluIHRoZQotICAg IC8vIGNhbGxpbmcgZnVuY3Rpb25zLCBidXQgaXQgZG9lc24ndCBzZWVtIHRvIHdvcmsuCisgICAg Ly8gU2V0dGluZyBrQ0dJbWFnZURlc3RpbmF0aW9uQmFja2dyb3VuZENvbG9yIHRvIGJsYWNrIGZv ciBKUEVHIGltYWdlcyBpbiBpbWFnZVByb3BlcnRpZXMgd291bGQgc2F2ZSBzb21lIG1hdGgKKyAg ICAvLyBpbiB0aGUgY2FsbGluZyBmdW5jdGlvbnMsIGJ1dCBpdCBkb2Vzbid0IHNlZW0gdG8gd29y ay4KIAogICAgIENHSW1hZ2VEZXN0aW5hdGlvbkFkZEltYWdlKGRlc3RpbmF0aW9uLmdldCgpLCBp bWFnZSwgaW1hZ2VQcm9wZXJ0aWVzLmdldCgpKTsKICAgICBDR0ltYWdlRGVzdGluYXRpb25GaW5h bGl6ZShkZXN0aW5hdGlvbi5nZXQoKSk7CiAKLSAgICBWZWN0b3I8Y2hhcj4gb3V0OwotICAgIGJh c2U2NEVuY29kZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihDRkRhdGFHZXRCeXRlUHRy KGRhdGEuZ2V0KCkpKSwgQ0ZEYXRhR2V0TGVuZ3RoKGRhdGEuZ2V0KCkpLCBvdXQpOworICAgIFZl Y3RvcjxjaGFyPiBiYXNlNjRkYXRhOworICAgIGJhc2U2NEVuY29kZShyZWludGVycHJldF9jYXN0 PGNvbnN0IGNoYXIqPihDRkRhdGFHZXRCeXRlUHRyKGRhdGEuZ2V0KCkpKSwgQ0ZEYXRhR2V0TGVu Z3RoKGRhdGEuZ2V0KCkpLCBiYXNlNjRkYXRhKTsKIAotICAgIHJldHVybiAiZGF0YToiICsgbWlt ZVR5cGUgKyAiO2Jhc2U2NCwiICsgb3V0OworICAgIHJldHVybiAiZGF0YToiICsgbWltZVR5cGUg KyAiO2Jhc2U2NCwiICsgYmFzZTY0ZGF0YTsKIH0KIAogU3RyaW5nIEltYWdlQnVmZmVyOjp0b0Rh dGFVUkwoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91YmxlKiBxdWFsaXR5LCBDb29y ZGluYXRlU3lzdGVtKSBjb25zdApAQCAtNDY3LDIzICs0NzAsMTkgQEAgU3RyaW5nIEltYWdlQnVm ZmVyOjp0b0RhdGFVUkwoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91YmxlKiBxdWFs aXR5LCBDb28KICAgICAgICAgaW1hZ2UuYWRvcHRDRihDR0JpdG1hcENvbnRleHRDcmVhdGVJbWFn ZShjb250ZXh0LmdldCgpKSk7CiAgICAgfQogCi0gICAgaWYgKCFpbWFnZSkKLSAgICAgICAgcmV0 dXJuICJkYXRhOiwiOwotCiAgICAgcmV0dXJuIENHSW1hZ2VUb0RhdGFVUkwoaW1hZ2UuZ2V0KCks IG1pbWVUeXBlLCBxdWFsaXR5KTsKIH0KIAogU3RyaW5nIEltYWdlRGF0YVRvRGF0YVVSTChjb25z dCBJbWFnZURhdGEmIHNvdXJjZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91Ymxl KiBxdWFsaXR5KQogewogICAgIEFTU0VSVChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZElt YWdlTUlNRVR5cGVGb3JFbmNvZGluZyhtaW1lVHlwZSkpOwotICAgICAgICAKLSAgICBSZXRhaW5Q dHI8Q0dJbWFnZVJlZj4gaW1hZ2U7Ci0gICAgUmV0YWluUHRyPENHRGF0YVByb3ZpZGVyUmVmPiBk YXRhUHJvdmlkZXI7CiAKLSAgICB1bnNpZ25lZCBjaGFyKiBkYXRhID0gc291cmNlLmRhdGEoKS0+ ZGF0YSgpOwogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gdXRpID0gdXRpRnJvbU1JTUVUeXBl KG1pbWVUeXBlKTsKICAgICBBU1NFUlQodXRpKTsKKworICAgIHVuc2lnbmVkIGNoYXIqIGRhdGEg PSBzb3VyY2UuZGF0YSgpLT5kYXRhKCk7CiAgICAgVmVjdG9yPHVpbnQ4X3Q+IGRhdGFWZWN0b3I7 CisKICAgICBpZiAoQ0ZFcXVhbCh1dGkuZ2V0KCksIGpwZWdVVEkoKSkpIHsKICAgICAgICAgLy8g SlBFR3MgZG9uJ3QgaGF2ZSBhbiBhbHBoYSBjaGFubmVsLCBzbyB3ZSBoYXZlIHRvIG1hbnVhbGx5 IGNvbXBvc2l0ZSBvbiB0b3Agb2YgYmxhY2suCiAgICAgICAgIGRhdGFWZWN0b3IucmVzaXplKDQg KiBzb3VyY2Uud2lkdGgoKSAqIHNvdXJjZS5oZWlnaHQoKSk7CkBAIC01MDYsMjEgKzUwNSwxOCBA QCBTdHJpbmcgSW1hZ2VEYXRhVG9EYXRhVVJMKGNvbnN0IEltYWdlRGF0YSYgc291cmNlLCBjb25z dCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdAogCiAgICAgICAgIGRhdGEgPSBvdXQ7CiAgICAgfQot ICAgIAotICAgIGRhdGFQcm92aWRlci5hZG9wdENGKENHRGF0YVByb3ZpZGVyQ3JlYXRlV2l0aERh dGEoMCwgZGF0YSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDQgKiBzb3VyY2Uud2lkdGgoKSAqIHNvdXJjZS5oZWlnaHQoKSwgMCkpOwotICAg IAorCisgICAgUmV0YWluUHRyPENHRGF0YVByb3ZpZGVyUmVmPiBkYXRhUHJvdmlkZXI7CisgICAg ZGF0YVByb3ZpZGVyLmFkb3B0Q0YoQ0dEYXRhUHJvdmlkZXJDcmVhdGVXaXRoRGF0YSgwLCBkYXRh LCA0ICogc291cmNlLndpZHRoKCkgKiBzb3VyY2UuaGVpZ2h0KCksIDApKTsKICAgICBpZiAoIWRh dGFQcm92aWRlcikKICAgICAgICAgcmV0dXJuICJkYXRhOiwiOwogCisgICAgUmV0YWluUHRyPENH SW1hZ2VSZWY+IGltYWdlOwogICAgIGltYWdlLmFkb3B0Q0YoQ0dJbWFnZUNyZWF0ZShzb3VyY2Uu d2lkdGgoKSwgc291cmNlLmhlaWdodCgpLCA4LCAzMiwgNCAqIHNvdXJjZS53aWR0aCgpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZXZpY2VSR0JDb2xvclNwYWNlUmVmKCksIGtD R0JpdG1hcEJ5dGVPcmRlckRlZmF1bHQgfCBrQ0dJbWFnZUFscGhhTGFzdCwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGF0YVByb3ZpZGVyLmdldCgpLCAwLCBmYWxzZSwga0NHUmVu ZGVyaW5nSW50ZW50RGVmYXVsdCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK LSAgICAgICAgCi0gICAgaWYgKCFpbWFnZSkKLSAgICAgICAgcmV0dXJuICJkYXRhOiwiOwogCiAg ICAgcmV0dXJuIENHSW1hZ2VUb0RhdGFVUkwoaW1hZ2UuZ2V0KCksIG1pbWVUeXBlLCBxdWFsaXR5 KTsKIH0KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 140157 2012-05-03 22:15:49 -0700 2012-05-04 17:48:59 -0700 Patch bug-85280-20120504151547.patch text/plain 5863 noel.gordon U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJhNjExZDQ5ZmM2OWI4 MTUxNDI0NWVmMWFmOTkwYjg4M2E3YTczNy4uNjMxN2U1ZDIyZGUwNTlhODNlZWIzMzc3ZTg3YWFh ZjFkM2JjYWNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTAzICBOb2Vs IEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4KKworICAgICAgICBbQ0ddIE1pbm9yIHJl ZmFjdG9yIG9mIEltYWdlQnVmZmVyOjpDR0ltYWdlVG9EYXRhVVJMIGFuZCBpdHMgY2FsbGVycwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUyODAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNo IG1lYW5zIHRvIHNpbXBsaWZ5IHRoZSBkaWZmIG9mIGFuIHVwY29taW5nIHBhdGNoLiBSZWZhY3Rv cmluZworICAgICAgICBoZXJlIGluIHByZXBhcmF0aW9uIGZvciB0aGF0IHBhdGNoLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gTm8gYmVoYXZpb3JhbCBjaGFuZ2UuIENvdmVyZWQgYnkgY2FudmFz IDJkIGFuZCAzZCB0ZXN0czoKKyAgICAgICAgICBjYW52YXMvcGhpbGlwL3Rlc3RzLyp0b0RhdGFV UkwqLmh0bWwKKyAgICAgICAgICBmYXN0L2NhbnZhcy93ZWJnbC9wcmVtdWx0aXBseWFscGhhLXRl c3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDR0ltYWdlVG9EYXRhVVJMKTogTW92ZSB0aGUgaW52YWxp ZCBpbWFnZSAoIWltYWdlKSB0ZXN0IGhlcmUuCisgICAgICAgIFRoZSBjb21tZW50cyBhcmUgYWJv dXQgSlBFRyBpbWFnZXM7IHNheSB0aGF0LiBSZW5hbWUgb3V0IHRvIGJhc2U2NERhdGEuCisgICAg ICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6dG9EYXRhVVJMKTogUmVtb3ZlIHRoZSAhaW1hZ2Ug dGVzdC4KKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGF0YVRvRGF0YVVSTCk6IE1vdmUgYW5kIGRl ZmluZSB2YXJpYWJsZXMgd2hlcmUgdXNlZCBhbmQKKyAgICAgICAgbWFrZSB0aGUgY29kZSBmbG93 IHJlYWQgc2ltaWxhcmx5IHRvIHRvRGF0YVVSTC4gUmVtb3ZlIHRoZSAhaW1hZ2UgdGVzdC4KKwog MjAxMi0wNS0wMyAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgogCiAgICAgICAgIENT UDogRXZhbCBpc24ndCBibG9ja2VkIGluIGFib3V0OmJsYW5rIHN1YmZyYW1lcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcApp bmRleCA3NDVmNGEwNDdlY2Q5MzEzNWMwZmJmZDA2OWNiNWYxNGQzNzlhYWYzLi4zMGVjZTFlZTMz NWUwZDU5YWMwZGJkNTdjZWQ1MTQ1YTlhOGQ2MzYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcApAQCAtNDAxLDYgKzQw MSw5IEBAIHN0YXRpYyBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHV0aUZyb21NSU1FVHlwZShjb25z dCBTdHJpbmcmIG1pbWVUeXBlKQogCiBzdGF0aWMgU3RyaW5nIENHSW1hZ2VUb0RhdGFVUkwoQ0dJ bWFnZVJlZiBpbWFnZSwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgZG91YmxlKiBxdWFs aXR5KQogeworICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiAiZGF0YTosIjsKKwogICAg IFJldGFpblB0cjxDRk11dGFibGVEYXRhUmVmPiBkYXRhKEFkb3B0Q0YsIENGRGF0YUNyZWF0ZU11 dGFibGUoa0NGQWxsb2NhdG9yRGVmYXVsdCwgMCkpOwogICAgIGlmICghZGF0YSkKICAgICAgICAg cmV0dXJuICJkYXRhOiwiOwpAQCAtNDE0LDIzICs0MTcsMjMgQEAgc3RhdGljIFN0cmluZyBDR0lt YWdlVG9EYXRhVVJMKENHSW1hZ2VSZWYgaW1hZ2UsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNv bnN0IGQKIAogICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IGltYWdlUHJvcGVydGllcyA9 IDA7CiAgICAgaWYgKENGRXF1YWwodXRpLmdldCgpLCBqcGVnVVRJKCkpICYmIHF1YWxpdHkgJiYg KnF1YWxpdHkgPj0gMC4wICYmICpxdWFsaXR5IDw9IDEuMCkgewotICAgICAgICAvLyBBcHBseSB0 aGUgY29tcHJlc3Npb24gcXVhbGl0eSB0byB0aGUgaW1hZ2UgZGVzdGluYXRpb24uCisgICAgICAg IC8vIEFwcGx5IHRoZSBjb21wcmVzc2lvbiBxdWFsaXR5IHRvIHRoZSBKUEVHIGltYWdlIGRlc3Rp bmF0aW9uLgogICAgICAgICBSZXRhaW5QdHI8Q0ZOdW1iZXJSZWY+IGNvbXByZXNzaW9uUXVhbGl0 eShBZG9wdENGLCBDRk51bWJlckNyZWF0ZShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBrQ0ZOdW1iZXJE b3VibGVUeXBlLCBxdWFsaXR5KSk7CiAgICAgICAgIGNvbnN0IHZvaWQqIGtleSA9IGtDR0ltYWdl RGVzdGluYXRpb25Mb3NzeUNvbXByZXNzaW9uUXVhbGl0eTsKICAgICAgICAgY29uc3Qgdm9pZCog dmFsdWUgPSBjb21wcmVzc2lvblF1YWxpdHkuZ2V0KCk7CiAgICAgICAgIGltYWdlUHJvcGVydGll cy5hZG9wdENGKENGRGljdGlvbmFyeUNyZWF0ZSgwLCAma2V5LCAmdmFsdWUsIDEsICZrQ0ZUeXBl RGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFsdWVDYWxsQmFja3Mp KTsKICAgICB9CiAKLSAgICAvLyBTZXR0aW5nIGtDR0ltYWdlRGVzdGluYXRpb25CYWNrZ3JvdW5k Q29sb3IgdG8gYmxhY2sgaW4gaW1hZ2VQcm9wZXJ0aWVzIHdvdWxkIGFsbG93IHNhdmluZyBzb21l IG1hdGggaW4gdGhlCi0gICAgLy8gY2FsbGluZyBmdW5jdGlvbnMsIGJ1dCBpdCBkb2Vzbid0IHNl ZW0gdG8gd29yay4KKyAgICAvLyBTZXR0aW5nIGtDR0ltYWdlRGVzdGluYXRpb25CYWNrZ3JvdW5k Q29sb3IgdG8gYmxhY2sgZm9yIEpQRUcgaW1hZ2VzIGluIGltYWdlUHJvcGVydGllcyB3b3VsZCBz YXZlIHNvbWUgbWF0aAorICAgIC8vIGluIHRoZSBjYWxsaW5nIGZ1bmN0aW9ucywgYnV0IGl0IGRv ZXNuJ3Qgc2VlbSB0byB3b3JrLgogCiAgICAgQ0dJbWFnZURlc3RpbmF0aW9uQWRkSW1hZ2UoZGVz dGluYXRpb24uZ2V0KCksIGltYWdlLCBpbWFnZVByb3BlcnRpZXMuZ2V0KCkpOwogICAgIENHSW1h Z2VEZXN0aW5hdGlvbkZpbmFsaXplKGRlc3RpbmF0aW9uLmdldCgpKTsKIAotICAgIFZlY3Rvcjxj aGFyPiBvdXQ7Ci0gICAgYmFzZTY0RW5jb2RlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+ KENGRGF0YUdldEJ5dGVQdHIoZGF0YS5nZXQoKSkpLCBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQo KSksIG91dCk7CisgICAgVmVjdG9yPGNoYXI+IGJhc2U2NERhdGE7CisgICAgYmFzZTY0RW5jb2Rl KHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KENGRGF0YUdldEJ5dGVQdHIoZGF0YS5nZXQo KSkpLCBDRkRhdGFHZXRMZW5ndGgoZGF0YS5nZXQoKSksIGJhc2U2NERhdGEpOwogCi0gICAgcmV0 dXJuICJkYXRhOiIgKyBtaW1lVHlwZSArICI7YmFzZTY0LCIgKyBvdXQ7CisgICAgcmV0dXJuICJk YXRhOiIgKyBtaW1lVHlwZSArICI7YmFzZTY0LCIgKyBiYXNlNjREYXRhOwogfQogCiBTdHJpbmcg SW1hZ2VCdWZmZXI6OnRvRGF0YVVSTChjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBkb3Vi bGUqIHF1YWxpdHksIENvb3JkaW5hdGVTeXN0ZW0pIGNvbnN0CkBAIC00NjcsMjMgKzQ3MCwxOSBA QCBTdHJpbmcgSW1hZ2VCdWZmZXI6OnRvRGF0YVVSTChjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBj b25zdCBkb3VibGUqIHF1YWxpdHksIENvbwogICAgICAgICBpbWFnZS5hZG9wdENGKENHQml0bWFw Q29udGV4dENyZWF0ZUltYWdlKGNvbnRleHQuZ2V0KCkpKTsKICAgICB9CiAKLSAgICBpZiAoIWlt YWdlKQotICAgICAgICByZXR1cm4gImRhdGE6LCI7Ci0KICAgICByZXR1cm4gQ0dJbWFnZVRvRGF0 YVVSTChpbWFnZS5nZXQoKSwgbWltZVR5cGUsIHF1YWxpdHkpOwogfQogCiBTdHJpbmcgSW1hZ2VE YXRhVG9EYXRhVVJMKGNvbnN0IEltYWdlRGF0YSYgc291cmNlLCBjb25zdCBTdHJpbmcmIG1pbWVU eXBlLCBjb25zdCBkb3VibGUqIHF1YWxpdHkpCiB7CiAgICAgQVNTRVJUKE1JTUVUeXBlUmVnaXN0 cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlwZUZvckVuY29kaW5nKG1pbWVUeXBlKSk7Ci0gICAg ICAgIAotICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBpbWFnZTsKLSAgICBSZXRhaW5QdHI8Q0dE YXRhUHJvdmlkZXJSZWY+IGRhdGFQcm92aWRlcjsKIAotICAgIHVuc2lnbmVkIGNoYXIqIGRhdGEg PSBzb3VyY2UuZGF0YSgpLT5kYXRhKCk7CiAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiB1dGkg PSB1dGlGcm9tTUlNRVR5cGUobWltZVR5cGUpOwogICAgIEFTU0VSVCh1dGkpOworCisgICAgdW5z aWduZWQgY2hhciogZGF0YSA9IHNvdXJjZS5kYXRhKCktPmRhdGEoKTsKICAgICBWZWN0b3I8dWlu dDhfdD4gZGF0YVZlY3RvcjsKKwogICAgIGlmIChDRkVxdWFsKHV0aS5nZXQoKSwganBlZ1VUSSgp KSkgewogICAgICAgICAvLyBKUEVHcyBkb24ndCBoYXZlIGFuIGFscGhhIGNoYW5uZWwsIHNvIHdl IGhhdmUgdG8gbWFudWFsbHkgY29tcG9zaXRlIG9uIHRvcCBvZiBibGFjay4KICAgICAgICAgZGF0 YVZlY3Rvci5yZXNpemUoNCAqIHNvdXJjZS53aWR0aCgpICogc291cmNlLmhlaWdodCgpKTsKQEAg LTUwNiwyMSArNTA1LDE4IEBAIFN0cmluZyBJbWFnZURhdGFUb0RhdGFVUkwoY29uc3QgSW1hZ2VE YXRhJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0CiAKICAgICAgICAgZGF0 YSA9IG91dDsKICAgICB9Ci0gICAgCi0gICAgZGF0YVByb3ZpZGVyLmFkb3B0Q0YoQ0dEYXRhUHJv dmlkZXJDcmVhdGVXaXRoRGF0YSgwLCBkYXRhLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgNCAqIHNvdXJjZS53aWR0aCgpICogc291cmNlLmhl aWdodCgpLCAwKSk7Ci0gICAgCisKKyAgICBSZXRhaW5QdHI8Q0dEYXRhUHJvdmlkZXJSZWY+IGRh dGFQcm92aWRlcjsKKyAgICBkYXRhUHJvdmlkZXIuYWRvcHRDRihDR0RhdGFQcm92aWRlckNyZWF0 ZVdpdGhEYXRhKDAsIGRhdGEsIDQgKiBzb3VyY2Uud2lkdGgoKSAqIHNvdXJjZS5oZWlnaHQoKSwg MCkpOwogICAgIGlmICghZGF0YVByb3ZpZGVyKQogICAgICAgICByZXR1cm4gImRhdGE6LCI7CiAK KyAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gaW1hZ2U7CiAgICAgaW1hZ2UuYWRvcHRDRihDR0lt YWdlQ3JlYXRlKHNvdXJjZS53aWR0aCgpLCBzb3VyY2UuaGVpZ2h0KCksIDgsIDMyLCA0ICogc291 cmNlLndpZHRoKCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRldmljZVJHQkNv bG9yU3BhY2VSZWYoKSwga0NHQml0bWFwQnl0ZU9yZGVyRGVmYXVsdCB8IGtDR0ltYWdlQWxwaGFM YXN0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhUHJvdmlkZXIuZ2V0KCks IDAsIGZhbHNlLCBrQ0dSZW5kZXJpbmdJbnRlbnREZWZhdWx0KSk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIAotICAgICAgICAKLSAgICBpZiAoIWltYWdlKQotICAgICAgICByZXR1 cm4gImRhdGE6LCI7CiAKICAgICByZXR1cm4gQ0dJbWFnZVRvRGF0YVVSTChpbWFnZS5nZXQoKSwg bWltZVR5cGUsIHF1YWxpdHkpOwogfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==