29191 2009-09-11 10:03:35 -0700 Add implementation of texImage2D that takes CanvasArray 2009-09-11 11:31:52 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin kbr oliver oldest_to_newest 146619 0 cmarrin 2009-09-11 10:03:35 -0700 This is part of the spec not currently implemented 146622 1 39447 cmarrin 2009-09-11 10:19:26 -0700 Created attachment 39447 Patch 146644 2 39447 oliver 2009-09-11 10:56:39 -0700 Comment on attachment 39447 Patch > + unsigned internalformat = args.at(2).toInt32(exec); > + unsigned width = args.at(3).toInt32(exec); > + unsigned height = args.at(4).toInt32(exec); > + unsigned border = args.at(5).toInt32(exec); > + unsigned format = args.at(6).toInt32(exec); > + unsigned type = args.at(7).toInt32(exec); > + CanvasArray* array = toCanvasArray(args.at(8)); You have no guarantee that this is actually a canvas array, so you need to do a type check and throw a typeerror or whatever. Additionally all of these conversions can throw exceptions so *technically* there should be an exception check following each one. 146661 3 39453 cmarrin 2009-09-11 11:23:56 -0700 Created attachment 39453 Replacement patch 146662 4 39453 oliver 2009-09-11 11:26:48 -0700 Comment on attachment 39453 Replacement patch r=me 146664 5 cmarrin 2009-09-11 11:31:52 -0700 Sending WebCore/ChangeLog Sending WebCore/bindings/js/JSCanvasRenderingContext3DCustom.cpp Sending WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp Transmitting file data ... Committed revision 48310. 39447 2009-09-11 10:19:26 -0700 2009-09-11 11:23:56 -0700 Patch 29191.patch text/plain 4325 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODMwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDktMTEgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIHN1cHBvcnQgZm9yIHRleEltYWdlMkQgd2hpY2ggdGFrZXMgQ2FudmFzQXJyYXkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTkxCisKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4SW1hZ2UyRCk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4dDNETWFjLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjp0ZXhJbWFnZTJEKToKKwog MjAwOS0wOS0xMSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHAJKHJldmlzaW9u IDQ4MjE2KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQz REN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDEzICs4MywzNCBAQCBKU1ZhbHVlIEpT Q2FudmFzUmVuZGVyaW5nQ29udGV4dDNEOjpidWZmCiAvLyB2b2lkIHRleEltYWdlMkRIVE1MKGlu IHVuc2lnbmVkIGxvbmcgdGFyZ2V0LCBpbiB1bnNpZ25lZCBsb25nIGxldmVsLCBpbiBIVE1MSW1h Z2VFbGVtZW50IGltYWdlKTsKIEpTVmFsdWUgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Q6OnRl eEltYWdlMkQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogeyAKLSAgICBp ZiAoYXJncy5zaXplKCkgPCAzIHx8IGFyZ3Muc2l6ZSgpID4gNSkKKyAgICBpZiAoYXJncy5zaXpl KCkgPCAzKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBTeW50YXhFcnJvcik7CiAK KyAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Qq IGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0M0QqPihpbXBsKCkp OyAgICAKICAgICB1bnNpZ25lZCB0YXJnZXQgPSBhcmdzLmF0KDApLnRvSW50MzIoZXhlYyk7CiAg ICAgdW5zaWduZWQgbGV2ZWwgPSBhcmdzLmF0KDEpLnRvSW50MzIoZXhlYyk7CiAgICAgCisgICAg aWYgKGFyZ3Muc2l6ZSgpID4gNSkgeworICAgICAgICAvLyBUaGlzIG11c3QgYmUgdGhlIGJhcmUg YXJyYXkgY2FzZS4KKyAgICAgICAgaWYgKGFyZ3Muc2l6ZSgpICE9IDkpCisgICAgICAgICAgICBy ZXR1cm4gdGhyb3dFcnJvcihleGVjLCBTeW50YXhFcnJvcik7CisgICAgICAgICAgICAKKyAgICAg ICAgdW5zaWduZWQgaW50ZXJuYWxmb3JtYXQgPSBhcmdzLmF0KDIpLnRvSW50MzIoZXhlYyk7Cisg ICAgICAgIHVuc2lnbmVkIHdpZHRoID0gYXJncy5hdCgzKS50b0ludDMyKGV4ZWMpOworICAgICAg ICB1bnNpZ25lZCBoZWlnaHQgPSBhcmdzLmF0KDQpLnRvSW50MzIoZXhlYyk7CisgICAgICAgIHVu c2lnbmVkIGJvcmRlciA9IGFyZ3MuYXQoNSkudG9JbnQzMihleGVjKTsKKyAgICAgICAgdW5zaWdu ZWQgZm9ybWF0ID0gYXJncy5hdCg2KS50b0ludDMyKGV4ZWMpOworICAgICAgICB1bnNpZ25lZCB0 eXBlID0gYXJncy5hdCg3KS50b0ludDMyKGV4ZWMpOworICAgICAgICBDYW52YXNBcnJheSogYXJy YXkgPSB0b0NhbnZhc0FycmF5KGFyZ3MuYXQoOCkpOworICAgICAgICAKKyAgICAgICAgLy8gRklY TUU6IE5lZWQgdG8gY2hlY2sgdG8gbWFrZSBzdXJlIENhbnZhc0FycmF5IGlzIGEgQ2FudmFzQnl0 ZUFycmF5IG9yIENhbnZhc1Nob3J0QXJyYXksCisgICAgICAgIC8vIGRlcGVuZGluZyBvbiB0aGUg cGFzc2VkIHR5cGUgcGFyYW1ldGVyLgorICAgICAgICAKKyAgICAgICAgY29udGV4dC0+dGV4SW1h Z2UyRCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgd2lkdGgsIGhlaWdodCwgYm9yZGVy LCBmb3JtYXQsIHR5cGUsIGFycmF5LCBlYyk7CisgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgp OworICAgIH0KKyAgICAKICAgICAvLyBUaGUgaW1hZ2UgcGFyYW1ldGVyIGNhbiBiZSBhIDxpbWc+ IG9yIDxjYW52YXM+IGVsZW1lbnQuCiAgICAgSlNWYWx1ZSB2YWx1ZSA9IGFyZ3MuYXQoMik7CiAg ICAgaWYgKCF2YWx1ZS5pc09iamVjdCgpKQpAQCAtOTksNyArMTIwLDYgQEAgSlNWYWx1ZSBKU0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4SQogICAgIGJvb2wgZmxpcFkgPSAoYXJncy5zaXpl KCkgPiAzKSA/IGFyZ3MuYXQoMykudG9Cb29sZWFuKGV4ZWMpIDogZmFsc2U7CiAgICAgYm9vbCBw cmVtdWx0aXBseUFscGhhID0gKGFyZ3Muc2l6ZSgpID4gNCkgPyBhcmdzLmF0KDMpLnRvQm9vbGVh bihleGVjKSA6IGZhbHNlOwogICAgIAotICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIGlm IChvLT5pbmhlcml0cygmSlNIVE1MSW1hZ2VFbGVtZW50OjpzX2luZm8pKSB7CiAgICAgICAgIEhU TUxJbWFnZUVsZW1lbnQqIGltZ0VsdCA9IHN0YXRpY19jYXN0PEhUTUxJbWFnZUVsZW1lbnQqPihz dGF0aWNfY2FzdDxKU0hUTUxFbGVtZW50Kj4obyktPmltcGwoKSk7CiAgICAgICAgIGNvbnRleHQt PnRleEltYWdlMkQodGFyZ2V0LCBsZXZlbCwgaW1nRWx0LCBmbGlwWSwgcHJlbXVsdGlwbHlBbHBo YSwgZWMpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250 ZXh0M0RNYWMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L0dyYXBoaWNzQ29udGV4dDNETWFjLmNwcAkocmV2aXNpb24gNDgyMTYpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0NvbnRleHQzRE1hYy5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE0NDEsMTcgKzE0NDEsOSBAQCBzdGF0aWMgdm9pZCBpbWFnZVRvVGV4dHVyZShJbWFn ZSogaW1hZ2UsCiAKIGludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4SW1hZ2UyRCh1bnNpZ25lZCB0 YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCBpbnRlcm5hbGZvcm1hdCwgdW5zaWduZWQg d2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgdW5zaWduZWQgYm9yZGVyLCB1bnNpZ25lZCBmb3JtYXQs IHVuc2lnbmVkIHR5cGUsIENhbnZhc0FycmF5KiBwaXhlbHMpCiB7Ci0gICAgLy8gRklYTUU6IG5l ZWQgdG8gaW1wbGVtZW50IHRoaXMgZm9ybQotICAgIFVOVVNFRF9QQVJBTSh0YXJnZXQpOwotICAg IFVOVVNFRF9QQVJBTShsZXZlbCk7Ci0gICAgVU5VU0VEX1BBUkFNKGludGVybmFsZm9ybWF0KTsK LSAgICBVTlVTRURfUEFSQU0od2lkdGgpOwotICAgIFVOVVNFRF9QQVJBTShoZWlnaHQpOwotICAg IFVOVVNFRF9QQVJBTShib3JkZXIpOwotICAgIFVOVVNFRF9QQVJBTShmb3JtYXQpOwotICAgIFVO VVNFRF9QQVJBTSh0eXBlKTsKLSAgICBVTlVTRURfUEFSQU0ocGl4ZWxzKTsKLSAgICByZXR1cm4g LTE7CisgICAgLy8gRklYTUU6IE5lZWQgdG8gZG8gYm91bmRzIGNoZWNraW5nIG9uIHRoZSBidWZm ZXIgaGVyZS4KKyAgICA6OmdsVGV4SW1hZ2UyRCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1h dCwgd2lkdGgsIGhlaWdodCwgYm9yZGVyLCBmb3JtYXQsIHR5cGUsIHBpeGVscy0+YmFzZUFkZHJl c3MoKSk7CisgICAgcmV0dXJuIDA7CiB9CiAKIGludCBHcmFwaGljc0NvbnRleHQzRDo6dGV4SW1h Z2UyRCh1bnNpZ25lZCB0YXJnZXQsIHVuc2lnbmVkIGxldmVsLCB1bnNpZ25lZCBpbnRlcm5hbGZv cm1hdCwgdW5zaWduZWQgd2lkdGgsIHVuc2lnbmVkIGhlaWdodCwgdW5zaWduZWQgYm9yZGVyLCB1 bnNpZ25lZCBmb3JtYXQsIHVuc2lnbmVkIHR5cGUsIEltYWdlRGF0YSogcGl4ZWxzKQo= 39453 2009-09-11 11:23:56 -0700 2009-09-11 11:26:48 -0700 Replacement patch 29191.patch text/plain 5053 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODMwNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDktMDktMTEgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZGVkIHN1cHBvcnQgZm9yIHRleEltYWdlMkQgd2hpY2ggdGFrZXMgQ2FudmFzQXJyYXkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTkxCisKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzRDo6dGV4SW1hZ2UyRCk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29udGV4dDNETWFjLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjp0ZXhJbWFnZTJEKToKKwog MjAwOS0wOS0xMSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0Nh bnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQzREN1c3RvbS5jcHAJKHJldmlzaW9u IDQ4MjE2KQorKysgV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQz REN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDEyICs4Myw2MSBAQCBKU1ZhbHVlIEpT Q2FudmFzUmVuZGVyaW5nQ29udGV4dDNEOjpidWZmCiAvLyB2b2lkIHRleEltYWdlMkRIVE1MKGlu IHVuc2lnbmVkIGxvbmcgdGFyZ2V0LCBpbiB1bnNpZ25lZCBsb25nIGxldmVsLCBpbiBIVE1MSW1h Z2VFbGVtZW50IGltYWdlKTsKIEpTVmFsdWUgSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Q6OnRl eEltYWdlMkQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBBcmdMaXN0JiBhcmdzKQogeyAKLSAgICBp ZiAoYXJncy5zaXplKCkgPCAzIHx8IGFyZ3Muc2l6ZSgpID4gNSkKKyAgICBpZiAoYXJncy5zaXpl KCkgPCAzKQogICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBTeW50YXhFcnJvcik7CiAK KyAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBDYW52YXNSZW5kZXJpbmdDb250ZXh0M0Qq IGNvbnRleHQgPSBzdGF0aWNfY2FzdDxDYW52YXNSZW5kZXJpbmdDb250ZXh0M0QqPihpbXBsKCkp OyAgICAKICAgICB1bnNpZ25lZCB0YXJnZXQgPSBhcmdzLmF0KDApLnRvSW50MzIoZXhlYyk7Cisg ICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKSAgICAKKyAgICAgICAgcmV0dXJuIGpzVW5kZWZp bmVkKCk7CisgICAgICAgIAogICAgIHVuc2lnbmVkIGxldmVsID0gYXJncy5hdCgxKS50b0ludDMy KGV4ZWMpOworICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgICAgCisgICAgICAgIHJldHVy biBqc1VuZGVmaW5lZCgpOworICAgIAorICAgIGlmIChhcmdzLnNpemUoKSA+IDUpIHsKKyAgICAg ICAgLy8gVGhpcyBtdXN0IGJlIHRoZSBiYXJlIGFycmF5IGNhc2UuCisgICAgICAgIGlmIChhcmdz LnNpemUoKSAhPSA5KQorICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoZXhlYywgU3ludGF4 RXJyb3IpOworICAgICAgICAgICAgCisgICAgICAgIHVuc2lnbmVkIGludGVybmFsZm9ybWF0ID0g YXJncy5hdCgyKS50b0ludDMyKGV4ZWMpOworICAgICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9u KCkpICAgIAorICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisKKyAgICAgICAgdW5z aWduZWQgd2lkdGggPSBhcmdzLmF0KDMpLnRvSW50MzIoZXhlYyk7CisgICAgICAgIGlmIChleGVj LT5oYWRFeGNlcHRpb24oKSkgICAgCisgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsK KworICAgICAgICB1bnNpZ25lZCBoZWlnaHQgPSBhcmdzLmF0KDQpLnRvSW50MzIoZXhlYyk7Cisg ICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgICAgCisgICAgICAgICAgICByZXR1cm4g anNVbmRlZmluZWQoKTsKKworICAgICAgICB1bnNpZ25lZCBib3JkZXIgPSBhcmdzLmF0KDUpLnRv SW50MzIoZXhlYyk7CisgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkgICAgCisgICAg ICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKworICAgICAgICB1bnNpZ25lZCBmb3JtYXQg PSBhcmdzLmF0KDYpLnRvSW50MzIoZXhlYyk7CisgICAgICAgIGlmIChleGVjLT5oYWRFeGNlcHRp b24oKSkgICAgCisgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKworICAgICAgICB1 bnNpZ25lZCB0eXBlID0gYXJncy5hdCg3KS50b0ludDMyKGV4ZWMpOworICAgICAgICBpZiAoZXhl Yy0+aGFkRXhjZXB0aW9uKCkpICAgIAorICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7 CisKKyAgICAgICAgQ2FudmFzQXJyYXkqIGFycmF5ID0gdG9DYW52YXNBcnJheShhcmdzLmF0KDgp KTsKKyAgICAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKSAgICAKKyAgICAgICAgICAgIHJl dHVybiBqc1VuZGVmaW5lZCgpOworICAgICAgICAgICAgCisgICAgICAgIGlmICghYXJyYXkpCisg ICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihleGVjLCBUeXBlRXJyb3IpOworICAgICAgICAK KyAgICAgICAgLy8gRklYTUU6IE5lZWQgdG8gY2hlY2sgdG8gbWFrZSBzdXJlIENhbnZhc0FycmF5 IGlzIGEgQ2FudmFzQnl0ZUFycmF5IG9yIENhbnZhc1Nob3J0QXJyYXksCisgICAgICAgIC8vIGRl cGVuZGluZyBvbiB0aGUgcGFzc2VkIHR5cGUgcGFyYW1ldGVyLgorICAgICAgICAKKyAgICAgICAg Y29udGV4dC0+dGV4SW1hZ2UyRCh0YXJnZXQsIGxldmVsLCBpbnRlcm5hbGZvcm1hdCwgd2lkdGgs IGhlaWdodCwgYm9yZGVyLCBmb3JtYXQsIHR5cGUsIGFycmF5LCBlYyk7CisgICAgICAgIHJldHVy biBqc1VuZGVmaW5lZCgpOworICAgIH0KICAgICAKICAgICAvLyBUaGUgaW1hZ2UgcGFyYW1ldGVy IGNhbiBiZSBhIDxpbWc+IG9yIDxjYW52YXM+IGVsZW1lbnQuCiAgICAgSlNWYWx1ZSB2YWx1ZSA9 IGFyZ3MuYXQoMik7CkBAIC05OSw3ICsxNDgsNiBAQCBKU1ZhbHVlIEpTQ2FudmFzUmVuZGVyaW5n Q29udGV4dDNEOjp0ZXhJCiAgICAgYm9vbCBmbGlwWSA9IChhcmdzLnNpemUoKSA+IDMpID8gYXJn cy5hdCgzKS50b0Jvb2xlYW4oZXhlYykgOiBmYWxzZTsKICAgICBib29sIHByZW11bHRpcGx5QWxw aGEgPSAoYXJncy5zaXplKCkgPiA0KSA/IGFyZ3MuYXQoMykudG9Cb29sZWFuKGV4ZWMpIDogZmFs c2U7CiAgICAgCi0gICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgaWYgKG8tPmluaGVyaXRz KCZKU0hUTUxJbWFnZUVsZW1lbnQ6OnNfaW5mbykpIHsKICAgICAgICAgSFRNTEltYWdlRWxlbWVu dCogaW1nRWx0ID0gc3RhdGljX2Nhc3Q8SFRNTEltYWdlRWxlbWVudCo+KHN0YXRpY19jYXN0PEpT SFRNTEVsZW1lbnQqPihvKS0+aW1wbCgpKTsKICAgICAgICAgY29udGV4dC0+dGV4SW1hZ2UyRCh0 YXJnZXQsIGxldmVsLCBpbWdFbHQsIGZsaXBZLCBwcmVtdWx0aXBseUFscGhhLCBlYyk7CkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0NvbnRleHQzRE1hYy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250 ZXh0M0RNYWMuY3BwCShyZXZpc2lvbiA0ODIxNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL0dyYXBoaWNzQ29udGV4dDNETWFjLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ0MSwx NyArMTQ0MSw5IEBAIHN0YXRpYyB2b2lkIGltYWdlVG9UZXh0dXJlKEltYWdlKiBpbWFnZSwKIAog aW50IEdyYXBoaWNzQ29udGV4dDNEOjp0ZXhJbWFnZTJEKHVuc2lnbmVkIHRhcmdldCwgdW5zaWdu ZWQgbGV2ZWwsIHVuc2lnbmVkIGludGVybmFsZm9ybWF0LCB1bnNpZ25lZCB3aWR0aCwgdW5zaWdu ZWQgaGVpZ2h0LCB1bnNpZ25lZCBib3JkZXIsIHVuc2lnbmVkIGZvcm1hdCwgdW5zaWduZWQgdHlw ZSwgQ2FudmFzQXJyYXkqIHBpeGVscykKIHsKLSAgICAvLyBGSVhNRTogbmVlZCB0byBpbXBsZW1l bnQgdGhpcyBmb3JtCi0gICAgVU5VU0VEX1BBUkFNKHRhcmdldCk7Ci0gICAgVU5VU0VEX1BBUkFN KGxldmVsKTsKLSAgICBVTlVTRURfUEFSQU0oaW50ZXJuYWxmb3JtYXQpOwotICAgIFVOVVNFRF9Q QVJBTSh3aWR0aCk7Ci0gICAgVU5VU0VEX1BBUkFNKGhlaWdodCk7Ci0gICAgVU5VU0VEX1BBUkFN KGJvcmRlcik7Ci0gICAgVU5VU0VEX1BBUkFNKGZvcm1hdCk7Ci0gICAgVU5VU0VEX1BBUkFNKHR5 cGUpOwotICAgIFVOVVNFRF9QQVJBTShwaXhlbHMpOwotICAgIHJldHVybiAtMTsKKyAgICAvLyBG SVhNRTogTmVlZCB0byBkbyBib3VuZHMgY2hlY2tpbmcgb24gdGhlIGJ1ZmZlciBoZXJlLgorICAg IDo6Z2xUZXhJbWFnZTJEKHRhcmdldCwgbGV2ZWwsIGludGVybmFsZm9ybWF0LCB3aWR0aCwgaGVp Z2h0LCBib3JkZXIsIGZvcm1hdCwgdHlwZSwgcGl4ZWxzLT5iYXNlQWRkcmVzcygpKTsKKyAgICBy ZXR1cm4gMDsKIH0KIAogaW50IEdyYXBoaWNzQ29udGV4dDNEOjp0ZXhJbWFnZTJEKHVuc2lnbmVk IHRhcmdldCwgdW5zaWduZWQgbGV2ZWwsIHVuc2lnbmVkIGludGVybmFsZm9ybWF0LCB1bnNpZ25l ZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCB1bnNpZ25lZCBib3JkZXIsIHVuc2lnbmVkIGZvcm1h dCwgdW5zaWduZWQgdHlwZSwgSW1hZ2VEYXRhKiBwaXhlbHMpCg==