141749 2015-02-18 01:16:22 -0800 Purge PassRefPtr from CanvasRenderingContext2D. 2015-04-23 01:47:38 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 144092 1 kling kling commit-queue esprehn+autocc gyuyoung.kim oldest_to_newest 1070080 0 kling 2015-02-18 01:16:22 -0800 Let's get rid of PassRefPtr usage from CanvasRenderingContext2D. 1070082 1 246809 kling 2015-02-18 01:33:00 -0800 Created attachment 246809 Patch 1070084 2 commit-queue 2015-02-18 01:33:55 -0800 Attachment 246809 did not pass style-queue: ERROR: Source/WebCore/html/canvas/CanvasRenderingContext2D.h:342: The parameter name "gradient" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1070093 3 246809 gyuyoung.kim 2015-02-18 03:51:22 -0800 Comment on attachment 246809 Patch LGTM 1070134 4 246809 commit-queue 2015-02-18 09:52:29 -0800 Comment on attachment 246809 Patch Clearing flags on attachment: 246809 Committed r180268: <http://trac.webkit.org/changeset/180268> 1070135 5 commit-queue 2015-02-18 09:52:33 -0800 All reviewed patches have been landed. Closing bug. 246809 2015-02-18 01:33:00 -0800 2015-02-18 09:52:29 -0800 Patch bug-141749.diff text/plain 15312 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlYmMyMDQwLi5mNmExN2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDItMTggIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIFB1cmdlIFBhc3NSZWZQdHIgZnJvbSBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuCisgICAg ICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xNDE3NDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3dpdGNoIGZyb20gdXNpbmcgUGFzc1JlZlB0ciB0 byBSZWZQdHIvUmVmIGluIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC4KKworICAgICAgICAqIGh0 bWwvVGV4dE1ldHJpY3MuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRNZXRyaWNzOjpjcmVhdGUp OiBDaGFuZ2VkIGNyZWF0ZSgpIGhlbHBlciB0byByZXR1cm4gUmVmLgorCisgICAgICAgICogaHRt bC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmg6CisgICAgICAgICogaHRtbC9jYW52 YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZh c1JlbmRlcmluZ0NvbnRleHQyRDo6cHJlcGFyZUdyYWRpZW50Rm9yRGFzaGJvYXJkKTogQ2hhbmdl ZCB0byB0YWtlIGEgcmVmZXJlbmNlLgorCisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJp bmdDb250ZXh0MkQ6OmNyZWF0ZUxpbmVhckdyYWRpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlUmFkaWFsR3JhZGllbnQpOgorICAgICAgICAo V2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVQYXR0ZXJuKToKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZUVtcHR5SW1hZ2VEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNh bnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlSW1hZ2VEYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1hZ2VEYXRhKToKKyAgICAgICAgKFdl YkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6d2Via2l0R2V0SW1hZ2VEYXRhSEQpOiBN YWRlIHRoZXNlIHJldHVybiBSZWZQdHIuIEFsc28gZGlkCisgICAgICAgIGEgYnVuY2ggb2YgMCAt PiBudWxscHRyIGNvbnZlcnNpb24sIHJlbW92ZWQgYSBidW5jaCBvZiB1bm5lY2Vzc2FyeSBSZWZQ dHI6OnJlbGVhc2UoKSBjYWxscywKKyAgICAgICAgYW5kIGNoYW5nZWQgYSBQYXNzUmVmUHRyIGFy Z3VtZW50IHRvIFJlZlB0ciYmLgorCisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdD b250ZXh0MkQ6Om1lYXN1cmVUZXh0KTogTWFkZSB0aGlzIHJldHVybiBSZWYuCisKIDIwMTUtMDIt MTcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWUgU2Nv cGVkRXZlbnRRdWV1ZTo6aW5zdGFuY2UoKSB0byBzaW5nbGV0b24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9UZXh0TWV0cmljcy5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9UZXh0 TWV0cmljcy5oCmluZGV4IGIyNzJlZjYuLjc3MDJiOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvVGV4dE1ldHJpY3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1RleHRNZXRy aWNzLmgKQEAgLTI2LDE0ICsyNiwxNCBAQAogI2lmbmRlZiBUZXh0TWV0cmljc19oCiAjZGVmaW5l IFRleHRNZXRyaWNzX2gKIAotI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CisjaW5jbHVkZSA8 d3RmL1JlZi5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogY2xhc3MgVGV4dE1ldHJpY3MgOiBwdWJsaWMgUmVmQ291bnRlZDxUZXh0TWV0cmlj cz4gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFRleHRNZXRyaWNzPiBjcmVhdGUo KSB7IHJldHVybiBhZG9wdFJlZihuZXcgVGV4dE1ldHJpY3MpOyB9CisgICAgc3RhdGljIFJlZjxU ZXh0TWV0cmljcz4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYoKm5ldyBUZXh0TWV0cmljcyk7 IH0KIAogICAgIGZsb2F0IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV93aWR0aDsgfQogICAgIHZv aWQgc2V0V2lkdGgoZmxvYXQgdykgeyBtX3dpZHRoID0gdzsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXgg MDlkYjMxNi4uNDJkNGUzMSAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2Nh bnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCkBAIC0xNjk5LDY1ICsxNjk5LDY1IEBA IHRlbXBsYXRlPGNsYXNzIFQ+IHZvaWQgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZnVsbENh bnZhc0NvbXBvc2l0ZWREcmF3SW1hZ2UoCiAgICAgY29tcG9zaXRlQnVmZmVyKGJ1ZmZlci5nZXQo KSwgYnVmZmVyUmVjdCwgb3ApOwogfQogCi12b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 cHJlcGFyZUdyYWRpZW50Rm9yRGFzaGJvYXJkKENhbnZhc0dyYWRpZW50KiBncmFkaWVudCkgY29u c3QKK3ZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpwcmVwYXJlR3JhZGllbnRGb3JEYXNo Ym9hcmQoQ2FudmFzR3JhZGllbnQmIGdyYWRpZW50KSBjb25zdAogewogI2lmIEVOQUJMRShEQVNI Qk9BUkRfU1VQUE9SVCkKICAgICBpZiAobV91c2VzRGFzaGJvYXJkQ29tcGF0aWJpbGl0eU1vZGUp Ci0gICAgICAgIGdyYWRpZW50LT5zZXREYXNoYm9hcmRDb21wYXRpYmlsaXR5TW9kZSgpOworICAg ICAgICBncmFkaWVudC5zZXREYXNoYm9hcmRDb21wYXRpYmlsaXR5TW9kZSgpOwogI2Vsc2UKICAg ICBVTlVTRURfUEFSQU0oZ3JhZGllbnQpOwogI2VuZGlmCiB9CiAKLVBhc3NSZWZQdHI8Q2FudmFz R3JhZGllbnQ+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlTGluZWFyR3JhZGllbnQo ZmxvYXQgeDAsIGZsb2F0IHkwLCBmbG9hdCB4MSwgZmxvYXQgeTEsIEV4Y2VwdGlvbkNvZGUmIGVj KQorUmVmUHRyPENhbnZhc0dyYWRpZW50PiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmNyZWF0 ZUxpbmVhckdyYWRpZW50KGZsb2F0IHgwLCBmbG9hdCB5MCwgZmxvYXQgeDEsIGZsb2F0IHkxLCBF eGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAoIXN0ZDo6aXNmaW5pdGUoeDApIHx8ICFzdGQ6 OmlzZmluaXRlKHkwKSB8fCAhc3RkOjppc2Zpbml0ZSh4MSkgfHwgIXN0ZDo6aXNmaW5pdGUoeTEp KSB7CiAgICAgICAgIGVjID0gTk9UX1NVUFBPUlRFRF9FUlI7Ci0gICAgICAgIHJldHVybiAwOwor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBSZWZQdHI8Q2FudmFzR3JhZGll bnQ+IGdyYWRpZW50ID0gQ2FudmFzR3JhZGllbnQ6OmNyZWF0ZShGbG9hdFBvaW50KHgwLCB5MCks IEZsb2F0UG9pbnQoeDEsIHkxKSk7CisgICAgUmVmPENhbnZhc0dyYWRpZW50PiBncmFkaWVudCA9 IENhbnZhc0dyYWRpZW50OjpjcmVhdGUoRmxvYXRQb2ludCh4MCwgeTApLCBGbG9hdFBvaW50KHgx LCB5MSkpOwogICAgIHByZXBhcmVHcmFkaWVudEZvckRhc2hib2FyZChncmFkaWVudC5nZXQoKSk7 Ci0gICAgcmV0dXJuIGdyYWRpZW50LnJlbGVhc2UoKTsKKyAgICByZXR1cm4gV1RGOjptb3ZlKGdy YWRpZW50KTsKIH0KIAotUGFzc1JlZlB0cjxDYW52YXNHcmFkaWVudD4gQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJEOjpjcmVhdGVSYWRpYWxHcmFkaWVudChmbG9hdCB4MCwgZmxvYXQgeTAsIGZsb2F0 IHIwLCBmbG9hdCB4MSwgZmxvYXQgeTEsIGZsb2F0IHIxLCBFeGNlcHRpb25Db2RlJiBlYykKK1Jl ZlB0cjxDYW52YXNHcmFkaWVudD4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVSYWRp YWxHcmFkaWVudChmbG9hdCB4MCwgZmxvYXQgeTAsIGZsb2F0IHIwLCBmbG9hdCB4MSwgZmxvYXQg eTEsIGZsb2F0IHIxLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAoIXN0ZDo6aXNmaW5p dGUoeDApIHx8ICFzdGQ6OmlzZmluaXRlKHkwKSB8fCAhc3RkOjppc2Zpbml0ZShyMCkgfHwgIXN0 ZDo6aXNmaW5pdGUoeDEpIHx8ICFzdGQ6OmlzZmluaXRlKHkxKSB8fCAhc3RkOjppc2Zpbml0ZShy MSkpIHsKICAgICAgICAgZWMgPSBOT1RfU1VQUE9SVEVEX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7 CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIGlmIChyMCA8IDAgfHwgcjEg PCAwKSB7CiAgICAgICAgIGVjID0gSU5ERVhfU0laRV9FUlI7Ci0gICAgICAgIHJldHVybiAwOwor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBSZWZQdHI8Q2FudmFzR3JhZGll bnQ+IGdyYWRpZW50ID0gQ2FudmFzR3JhZGllbnQ6OmNyZWF0ZShGbG9hdFBvaW50KHgwLCB5MCks IHIwLCBGbG9hdFBvaW50KHgxLCB5MSksIHIxKTsKKyAgICBSZWY8Q2FudmFzR3JhZGllbnQ+IGdy YWRpZW50ID0gQ2FudmFzR3JhZGllbnQ6OmNyZWF0ZShGbG9hdFBvaW50KHgwLCB5MCksIHIwLCBG bG9hdFBvaW50KHgxLCB5MSksIHIxKTsKICAgICBwcmVwYXJlR3JhZGllbnRGb3JEYXNoYm9hcmQo Z3JhZGllbnQuZ2V0KCkpOwotICAgIHJldHVybiBncmFkaWVudC5yZWxlYXNlKCk7CisgICAgcmV0 dXJuIFdURjo6bW92ZShncmFkaWVudCk7CiB9CiAKLVBhc3NSZWZQdHI8Q2FudmFzUGF0dGVybj4g Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVQYXR0ZXJuKEhUTUxJbWFnZUVsZW1lbnQq IGltYWdlLAorUmVmUHRyPENhbnZhc1BhdHRlcm4+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6 Y3JlYXRlUGF0dGVybihIVE1MSW1hZ2VFbGVtZW50KiBpbWFnZSwKICAgICBjb25zdCBTdHJpbmcm IHJlcGV0aXRpb25UeXBlLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBpZiAoIWltYWdlKSB7 CiAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAgICAgYm9vbCByZXBlYXRYLCByZXBlYXRZOwog ICAgIGVjID0gMDsKICAgICBDYW52YXNQYXR0ZXJuOjpwYXJzZVJlcGV0aXRpb25UeXBlKHJlcGV0 aXRpb25UeXBlLCByZXBlYXRYLCByZXBlYXRZLCBlYyk7CiAgICAgaWYgKGVjKQotICAgICAgICBy ZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBpZiAoIWltYWdlLT5jb21w bGV0ZSgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAg ICBDYWNoZWRJbWFnZSogY2FjaGVkSW1hZ2UgPSBpbWFnZS0+Y2FjaGVkSW1hZ2UoKTsKICAgICBp ZiAoIWNhY2hlZEltYWdlIHx8IGNhY2hlZEltYWdlLT5zdGF0dXMoKSA9PSBDYWNoZWRSZXNvdXJj ZTo6TG9hZEVycm9yKSB7CiAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9FUlI7Ci0gICAgICAg IHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICBpZiAoIWlt YWdlLT5jYWNoZWRJbWFnZSgpLT5pbWFnZUZvclJlbmRlcmVyKGltYWdlLT5yZW5kZXJlcigpKSkK QEAgLTE3NjcsMjMgKzE3NjcsMjMgQEAgUGFzc1JlZlB0cjxDYW52YXNQYXR0ZXJuPiBDYW52YXNS ZW5kZXJpbmdDb250ZXh0MkQ6OmNyZWF0ZVBhdHRlcm4oSFRNTEltYWdlRWxlbWUKICAgICByZXR1 cm4gQ2FudmFzUGF0dGVybjo6Y3JlYXRlKGNhY2hlZEltYWdlLT5pbWFnZUZvclJlbmRlcmVyKGlt YWdlLT5yZW5kZXJlcigpKSwgcmVwZWF0WCwgcmVwZWF0WSwgb3JpZ2luQ2xlYW4pOwogfQogCi1Q YXNzUmVmUHRyPENhbnZhc1BhdHRlcm4+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRl UGF0dGVybihIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLAorUmVmUHRyPENhbnZhc1BhdHRlcm4+ IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlUGF0dGVybihIVE1MQ2FudmFzRWxlbWVu dCogY2FudmFzLAogICAgIGNvbnN0IFN0cmluZyYgcmVwZXRpdGlvblR5cGUsIEV4Y2VwdGlvbkNv ZGUmIGVjKQogewogICAgIGlmICghY2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRD SF9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAgICAgaWYgKCFjYW52YXMtPndpZHRoKCkgfHwgIWNhbnZhcy0+aGVpZ2h0KCkgfHwgIWNhbnZh cy0+YnVmZmVyKCkpIHsKICAgICAgICAgZWMgPSBJTlZBTElEX1NUQVRFX0VSUjsKLSAgICAgICAg cmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAgIGJvb2wgcmVw ZWF0WCwgcmVwZWF0WTsKICAgICBlYyA9IDA7CiAgICAgQ2FudmFzUGF0dGVybjo6cGFyc2VSZXBl dGl0aW9uVHlwZShyZXBldGl0aW9uVHlwZSwgcmVwZWF0WCwgcmVwZWF0WSwgZWMpOwogICAgIGlm IChlYykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIHJl dHVybiBDYW52YXNQYXR0ZXJuOjpjcmVhdGUoY2FudmFzLT5jb3BpZWRJbWFnZSgpLCByZXBlYXRY LCByZXBlYXRZLCBjYW52YXMtPm9yaWdpbkNsZWFuKCkpOwogfQogCkBAIC0xODQxLDQxICsxODQx LDQxIEBAIEdyYXBoaWNzQ29udGV4dCogQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3aW5n Q29udGV4dCgpIGNvbnN0CiAgICAgcmV0dXJuIGNhbnZhcygpLT5kcmF3aW5nQ29udGV4dCgpOwog fQogCi1zdGF0aWMgUGFzc1JlZlB0cjxJbWFnZURhdGE+IGNyZWF0ZUVtcHR5SW1hZ2VEYXRhKGNv bnN0IEludFNpemUmIHNpemUpCitzdGF0aWMgUmVmUHRyPEltYWdlRGF0YT4gY3JlYXRlRW1wdHlJ bWFnZURhdGEoY29uc3QgSW50U2l6ZSYgc2l6ZSkKIHsKICAgICBpZiAoUmVmUHRyPEltYWdlRGF0 YT4gZGF0YSA9IEltYWdlRGF0YTo6Y3JlYXRlKHNpemUpKSB7CiAgICAgICAgIGRhdGEtPmRhdGEo KS0+emVyb0ZpbGwoKTsKLSAgICAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOworICAgICAgICBy ZXR1cm4gZGF0YTsKICAgICB9CiAKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotUGFzc1JlZlB0 cjxJbWFnZURhdGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlSW1hZ2VEYXRhKFBh c3NSZWZQdHI8SW1hZ2VEYXRhPiBpbWFnZURhdGEsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdAor UmVmUHRyPEltYWdlRGF0YT4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVJbWFnZURh dGEoUmVmUHRyPEltYWdlRGF0YT4mJiBpbWFnZURhdGEsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25z dAogewogICAgIGlmICghaW1hZ2VEYXRhKSB7CiAgICAgICAgIGVjID0gTk9UX1NVUFBPUlRFRF9F UlI7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAK ICAgICByZXR1cm4gY3JlYXRlRW1wdHlJbWFnZURhdGEoaW1hZ2VEYXRhLT5zaXplKCkpOwogfQog Ci1QYXNzUmVmUHRyPEltYWdlRGF0YT4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpjcmVhdGVJ bWFnZURhdGEoZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKK1Jl ZlB0cjxJbWFnZURhdGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlSW1hZ2VEYXRh KGZsb2F0IHN3LCBmbG9hdCBzaCwgRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0CiB7CiAgICAgZWMg PSAwOwogICAgIGlmICghc3cgfHwgIXNoKSB7CiAgICAgICAgIGVjID0gSU5ERVhfU0laRV9FUlI7 Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAgICAg aWYgKCFzdGQ6OmlzZmluaXRlKHN3KSB8fCAhc3RkOjppc2Zpbml0ZShzaCkpIHsKICAgICAgICAg ZWMgPSBUeXBlRXJyb3I7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9CiAKICAgICBGbG9hdFNpemUgbG9naWNhbFNpemUoZmFicyhzdyksIGZhYnMoc2gp KTsKICAgICBpZiAoIWxvZ2ljYWxTaXplLmlzRXhwcmVzc2libGVBc0ludFNpemUoKSkKLSAgICAg ICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgSW50U2l6ZSBzaXpl ID0gZXhwYW5kZWRJbnRTaXplKGxvZ2ljYWxTaXplKTsKICAgICBpZiAoc2l6ZS53aWR0aCgpIDwg MSkKQEAgLTE4ODYsMzIgKzE4ODYsMzIgQEAgUGFzc1JlZlB0cjxJbWFnZURhdGE+IENhbnZhc1Jl bmRlcmluZ0NvbnRleHQyRDo6Y3JlYXRlSW1hZ2VEYXRhKGZsb2F0IHN3LCBmbG9hdAogICAgIHJl dHVybiBjcmVhdGVFbXB0eUltYWdlRGF0YShzaXplKTsKIH0KIAotUGFzc1JlZlB0cjxJbWFnZURh dGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1hZ2VEYXRhKGZsb2F0IHN4LCBmbG9h dCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QKK1JlZlB0 cjxJbWFnZURhdGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1hZ2VEYXRhKGZsb2F0 IHN4LCBmbG9hdCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJiBlYykgY29u c3QKIHsKICAgICByZXR1cm4gZ2V0SW1hZ2VEYXRhKEltYWdlQnVmZmVyOjpMb2dpY2FsQ29vcmRp bmF0ZVN5c3RlbSwgc3gsIHN5LCBzdywgc2gsIGVjKTsKIH0KIAotUGFzc1JlZlB0cjxJbWFnZURh dGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6d2Via2l0R2V0SW1hZ2VEYXRhSEQoZmxvYXQg c3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQgc2gsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25z dAorUmVmUHRyPEltYWdlRGF0YT4gQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjp3ZWJraXRHZXRJ bWFnZURhdGFIRChmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3LCBmbG9hdCBzaCwgRXhjZXB0 aW9uQ29kZSYgZWMpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGdldEltYWdlRGF0YShJbWFnZUJ1ZmZl cjo6QmFja2luZ1N0b3JlQ29vcmRpbmF0ZVN5c3RlbSwgc3gsIHN5LCBzdywgc2gsIGVjKTsKIH0K IAotUGFzc1JlZlB0cjxJbWFnZURhdGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1h Z2VEYXRhKEltYWdlQnVmZmVyOjpDb29yZGluYXRlU3lzdGVtIGNvb3JkaW5hdGVTeXN0ZW0sIGZs b2F0IHN4LCBmbG9hdCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJiBlYykg Y29uc3QKK1JlZlB0cjxJbWFnZURhdGE+IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1h Z2VEYXRhKEltYWdlQnVmZmVyOjpDb29yZGluYXRlU3lzdGVtIGNvb3JkaW5hdGVTeXN0ZW0sIGZs b2F0IHN4LCBmbG9hdCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJiBlYykg Y29uc3QKIHsKICAgICBpZiAoIWNhbnZhcygpLT5vcmlnaW5DbGVhbigpKSB7CiAgICAgICAgIERF UFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoQVND SUlMaXRlcmFsKCJVbmFibGUgdG8gZ2V0IGltYWdlIGRhdGEgZnJvbSBjYW52YXMgYmVjYXVzZSB0 aGUgY2FudmFzIGhhcyBiZWVuIHRhaW50ZWQgYnkgY3Jvc3Mtb3JpZ2luIGRhdGEuIikpKTsKICAg ICAgICAgY2FudmFzKCktPmRvY3VtZW50KCkuYWRkQ29uc29sZU1lc3NhZ2UoTWVzc2FnZVNvdXJj ZTo6U2VjdXJpdHksIE1lc3NhZ2VMZXZlbDo6RXJyb3IsIGNvbnNvbGVNZXNzYWdlKTsKICAgICAg ICAgZWMgPSBTRUNVUklUWV9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4g bnVsbHB0cjsKICAgICB9CiAKICAgICBpZiAoIXN3IHx8ICFzaCkgewogICAgICAgICBlYyA9IElO REVYX1NJWkVfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAgICAgfQogICAgIGlmICghc3RkOjppc2Zpbml0ZShzeCkgfHwgIXN0ZDo6aXNmaW5pdGUoc3kp IHx8ICFzdGQ6OmlzZmluaXRlKHN3KSB8fCAhc3RkOjppc2Zpbml0ZShzaCkpIHsKICAgICAgICAg ZWMgPSBOT1RfU1VQUE9SVEVEX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIH0KIAogICAgIGlmIChzdyA8IDApIHsKQEAgLTE5MjksNyArMTkyOSw3 IEBAIFBhc3NSZWZQdHI8SW1hZ2VEYXRhPiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmdldElt YWdlRGF0YShJbWFnZUJ1ZmZlcjo6Q29vcmRpCiAgICAgaWYgKGxvZ2ljYWxSZWN0LmhlaWdodCgp IDwgMSkKICAgICAgICAgbG9naWNhbFJlY3Quc2V0SGVpZ2h0KDEpOwogICAgIGlmICghbG9naWNh bFJlY3QuaXNFeHByZXNzaWJsZUFzSW50UmVjdCgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAg ICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBJbnRSZWN0IGltYWdlRGF0YVJlY3QgPSBlbmNsb3Np bmdJbnRSZWN0KGxvZ2ljYWxSZWN0KTsKICAgICBJbWFnZUJ1ZmZlciogYnVmZmVyID0gY2FudmFz KCktPmJ1ZmZlcigpOwpAQCAtMTkzOCw3ICsxOTM4LDcgQEAgUGFzc1JlZlB0cjxJbWFnZURhdGE+ IENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6Z2V0SW1hZ2VEYXRhKEltYWdlQnVmZmVyOjpDb29y ZGkKIAogICAgIFJlZlB0cjxVaW50OENsYW1wZWRBcnJheT4gYnl0ZUFycmF5ID0gYnVmZmVyLT5n ZXRVbm11bHRpcGxpZWRJbWFnZURhdGEoaW1hZ2VEYXRhUmVjdCwgY29vcmRpbmF0ZVN5c3RlbSk7 CiAgICAgaWYgKCFieXRlQXJyYXkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4g bnVsbHB0cjsKIAogICAgIHJldHVybiBJbWFnZURhdGE6OmNyZWF0ZShpbWFnZURhdGFSZWN0LnNp emUoKSwgYnl0ZUFycmF5LnJlbGVhc2UoKSk7CiB9CkBAIC0yMjU3LDE2ICsyMjU3LDE2IEBAIHN0 YXRpYyB2b2lkIG5vcm1hbGl6ZVNwYWNlcyhTdHJpbmcmIHRleHQpCiAgICAgdGV4dCA9IFN0cmlu Zzo6YWRvcHQoY2hhclZlY3Rvcik7CiB9CiAKLVBhc3NSZWZQdHI8VGV4dE1ldHJpY3M+IENhbnZh c1JlbmRlcmluZ0NvbnRleHQyRDo6bWVhc3VyZVRleHQoY29uc3QgU3RyaW5nJiB0ZXh0KQorUmVm PFRleHRNZXRyaWNzPiBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6Om1lYXN1cmVUZXh0KGNvbnN0 IFN0cmluZyYgdGV4dCkKIHsKLSAgICBSZWZQdHI8VGV4dE1ldHJpY3M+IG1ldHJpY3MgPSBUZXh0 TWV0cmljczo6Y3JlYXRlKCk7CisgICAgUmVmPFRleHRNZXRyaWNzPiBtZXRyaWNzID0gVGV4dE1l dHJpY3M6OmNyZWF0ZSgpOwogCiAgICAgU3RyaW5nIG5vcm1hbGl6ZWRUZXh0ID0gdGV4dDsKICAg ICBub3JtYWxpemVTcGFjZXMobm9ybWFsaXplZFRleHQpOwogCiAgICAgbWV0cmljcy0+c2V0V2lk dGgoYWNjZXNzRm9udCgpLndpZHRoKFRleHRSdW4obm9ybWFsaXplZFRleHQpKSk7CiAKLSAgICBy ZXR1cm4gbWV0cmljcy5yZWxlYXNlKCk7CisgICAgcmV0dXJuIG1ldHJpY3M7CiB9CiAKIHZvaWQg Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3VGV4dEludGVybmFsKGNvbnN0IFN0cmluZyYg dGV4dCwgZmxvYXQgeCwgZmxvYXQgeSwgYm9vbCBmaWxsLCBmbG9hdCBtYXhXaWR0aCwgYm9vbCB1 c2VNYXhXaWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZh c1JlbmRlcmluZ0NvbnRleHQyRC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFz UmVuZGVyaW5nQ29udGV4dDJELmgKaW5kZXggOWVjNzc1ZS4uNDljNDRjYjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5o CkBAIC0xODMsMTUgKzE4MywxNSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldENvbXBvc2l0ZU9w ZXJhdGlvbihjb25zdCBTdHJpbmcmKTsKIAotICAgIFBhc3NSZWZQdHI8Q2FudmFzR3JhZGllbnQ+ IGNyZWF0ZUxpbmVhckdyYWRpZW50KGZsb2F0IHgwLCBmbG9hdCB5MCwgZmxvYXQgeDEsIGZsb2F0 IHkxLCBFeGNlcHRpb25Db2RlJik7Ci0gICAgUGFzc1JlZlB0cjxDYW52YXNHcmFkaWVudD4gY3Jl YXRlUmFkaWFsR3JhZGllbnQoZmxvYXQgeDAsIGZsb2F0IHkwLCBmbG9hdCByMCwgZmxvYXQgeDEs IGZsb2F0IHkxLCBmbG9hdCByMSwgRXhjZXB0aW9uQ29kZSYpOwotICAgIFBhc3NSZWZQdHI8Q2Fu dmFzUGF0dGVybj4gY3JlYXRlUGF0dGVybihIVE1MSW1hZ2VFbGVtZW50KiwgY29uc3QgU3RyaW5n JiByZXBldGl0aW9uVHlwZSwgRXhjZXB0aW9uQ29kZSYpOwotICAgIFBhc3NSZWZQdHI8Q2FudmFz UGF0dGVybj4gY3JlYXRlUGF0dGVybihIVE1MQ2FudmFzRWxlbWVudCosIGNvbnN0IFN0cmluZyYg cmVwZXRpdGlvblR5cGUsIEV4Y2VwdGlvbkNvZGUmKTsKLQotICAgIFBhc3NSZWZQdHI8SW1hZ2VE YXRhPiBjcmVhdGVJbWFnZURhdGEoUGFzc1JlZlB0cjxJbWFnZURhdGE+LCBFeGNlcHRpb25Db2Rl JikgY29uc3Q7Ci0gICAgUGFzc1JlZlB0cjxJbWFnZURhdGE+IGNyZWF0ZUltYWdlRGF0YShmbG9h dCB3aWR0aCwgZmxvYXQgaGVpZ2h0LCBFeGNlcHRpb25Db2RlJikgY29uc3Q7Ci0gICAgUGFzc1Jl ZlB0cjxJbWFnZURhdGE+IGdldEltYWdlRGF0YShmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3 LCBmbG9hdCBzaCwgRXhjZXB0aW9uQ29kZSYpIGNvbnN0OwotICAgIFBhc3NSZWZQdHI8SW1hZ2VE YXRhPiB3ZWJraXRHZXRJbWFnZURhdGFIRChmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3LCBm bG9hdCBzaCwgRXhjZXB0aW9uQ29kZSYpIGNvbnN0OworICAgIFJlZlB0cjxDYW52YXNHcmFkaWVu dD4gY3JlYXRlTGluZWFyR3JhZGllbnQoZmxvYXQgeDAsIGZsb2F0IHkwLCBmbG9hdCB4MSwgZmxv YXQgeTEsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICBSZWZQdHI8Q2FudmFzR3JhZGllbnQ+IGNyZWF0 ZVJhZGlhbEdyYWRpZW50KGZsb2F0IHgwLCBmbG9hdCB5MCwgZmxvYXQgcjAsIGZsb2F0IHgxLCBm bG9hdCB5MSwgZmxvYXQgcjEsIEV4Y2VwdGlvbkNvZGUmKTsKKyAgICBSZWZQdHI8Q2FudmFzUGF0 dGVybj4gY3JlYXRlUGF0dGVybihIVE1MSW1hZ2VFbGVtZW50KiwgY29uc3QgU3RyaW5nJiByZXBl dGl0aW9uVHlwZSwgRXhjZXB0aW9uQ29kZSYpOworICAgIFJlZlB0cjxDYW52YXNQYXR0ZXJuPiBj cmVhdGVQYXR0ZXJuKEhUTUxDYW52YXNFbGVtZW50KiwgY29uc3QgU3RyaW5nJiByZXBldGl0aW9u VHlwZSwgRXhjZXB0aW9uQ29kZSYpOworCisgICAgUmVmUHRyPEltYWdlRGF0YT4gY3JlYXRlSW1h Z2VEYXRhKFJlZlB0cjxJbWFnZURhdGE+JiYsIEV4Y2VwdGlvbkNvZGUmKSBjb25zdDsKKyAgICBS ZWZQdHI8SW1hZ2VEYXRhPiBjcmVhdGVJbWFnZURhdGEoZmxvYXQgd2lkdGgsIGZsb2F0IGhlaWdo dCwgRXhjZXB0aW9uQ29kZSYpIGNvbnN0OworICAgIFJlZlB0cjxJbWFnZURhdGE+IGdldEltYWdl RGF0YShmbG9hdCBzeCwgZmxvYXQgc3ksIGZsb2F0IHN3LCBmbG9hdCBzaCwgRXhjZXB0aW9uQ29k ZSYpIGNvbnN0OworICAgIFJlZlB0cjxJbWFnZURhdGE+IHdlYmtpdEdldEltYWdlRGF0YUhEKGZs b2F0IHN4LCBmbG9hdCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJikgY29u c3Q7CiAgICAgdm9pZCBwdXRJbWFnZURhdGEoSW1hZ2VEYXRhKiwgZmxvYXQgZHgsIGZsb2F0IGR5 LCBFeGNlcHRpb25Db2RlJik7CiAgICAgdm9pZCBwdXRJbWFnZURhdGEoSW1hZ2VEYXRhKiwgZmxv YXQgZHgsIGZsb2F0IGR5LCBmbG9hdCBkaXJ0eVgsIGZsb2F0IGRpcnR5WSwgZmxvYXQgZGlydHlX aWR0aCwgZmxvYXQgZGlydHlIZWlnaHQsIEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2b2lkIHdlYmtp dFB1dEltYWdlRGF0YUhEKEltYWdlRGF0YSosIGZsb2F0IGR4LCBmbG9hdCBkeSwgRXhjZXB0aW9u Q29kZSYpOwpAQCAtMjIwLDcgKzIyMCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGZpbGxUZXh0KGNv bnN0IFN0cmluZyYgdGV4dCwgZmxvYXQgeCwgZmxvYXQgeSwgZmxvYXQgbWF4V2lkdGgpOwogICAg IHZvaWQgc3Ryb2tlVGV4dChjb25zdCBTdHJpbmcmIHRleHQsIGZsb2F0IHgsIGZsb2F0IHkpOwog ICAgIHZvaWQgc3Ryb2tlVGV4dChjb25zdCBTdHJpbmcmIHRleHQsIGZsb2F0IHgsIGZsb2F0IHks IGZsb2F0IG1heFdpZHRoKTsKLSAgICBQYXNzUmVmUHRyPFRleHRNZXRyaWNzPiBtZWFzdXJlVGV4 dChjb25zdCBTdHJpbmcmIHRleHQpOworICAgIFJlZjxUZXh0TWV0cmljcz4gbWVhc3VyZVRleHQo Y29uc3QgU3RyaW5nJiB0ZXh0KTsKIAogICAgIExpbmVDYXAgZ2V0TGluZUNhcCgpIGNvbnN0IHsg cmV0dXJuIHN0YXRlKCkubV9saW5lQ2FwOyB9CiAgICAgTGluZUpvaW4gZ2V0TGluZUpvaW4oKSBj b25zdCB7IHJldHVybiBzdGF0ZSgpLm1fbGluZUpvaW47IH0KQEAgLTMzOSw5ICszMzksOSBAQCBw cml2YXRlOgogCiAgICAgdGVtcGxhdGU8Y2xhc3MgVD4gdm9pZCBmdWxsQ2FudmFzQ29tcG9zaXRl ZERyYXdJbWFnZShUKiwgQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiwgY29uc3QgRmxvYXRS ZWN0JiwgQ29tcG9zaXRlT3BlcmF0b3IpOwogCi0gICAgdm9pZCBwcmVwYXJlR3JhZGllbnRGb3JE YXNoYm9hcmQoQ2FudmFzR3JhZGllbnQqIGdyYWRpZW50KSBjb25zdDsKKyAgICB2b2lkIHByZXBh cmVHcmFkaWVudEZvckRhc2hib2FyZChDYW52YXNHcmFkaWVudCYgZ3JhZGllbnQpIGNvbnN0Owog Ci0gICAgUGFzc1JlZlB0cjxJbWFnZURhdGE+IGdldEltYWdlRGF0YShJbWFnZUJ1ZmZlcjo6Q29v cmRpbmF0ZVN5c3RlbSwgZmxvYXQgc3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQgc2gsIEV4 Y2VwdGlvbkNvZGUmKSBjb25zdDsKKyAgICBSZWZQdHI8SW1hZ2VEYXRhPiBnZXRJbWFnZURhdGEo SW1hZ2VCdWZmZXI6OkNvb3JkaW5hdGVTeXN0ZW0sIGZsb2F0IHN4LCBmbG9hdCBzeSwgZmxvYXQg c3csIGZsb2F0IHNoLCBFeGNlcHRpb25Db2RlJikgY29uc3Q7CiAgICAgdm9pZCBwdXRJbWFnZURh dGEoSW1hZ2VEYXRhKiwgSW1hZ2VCdWZmZXI6OkNvb3JkaW5hdGVTeXN0ZW0sIGZsb2F0IGR4LCBm bG9hdCBkeSwgZmxvYXQgZGlydHlYLCBmbG9hdCBkaXJ0eVksIGZsb2F0IGRpcnR5V2lkdGgsIGZs b2F0IGRpcnR5SGVpZ2h0LCBFeGNlcHRpb25Db2RlJik7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXMy ZCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIHRydWU7IH0K