136609 2014-09-07 04:22:47 -0700 Introduce toBasicShapeFoo() instead of static_cast<BasicShapeFoo*> 2014-09-11 23:20:31 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 136773 1 gyuyoung.kim gyuyoung.kim commit-queue gyuyoung.kim lucas.de.marchi oldest_to_newest 1033726 0 gyuyoung.kim 2014-09-07 04:22:47 -0700 To use BasicShapeFoo() helps to detect wrong type casting and improve code readability. 1033727 1 237753 gyuyoung.kim 2014-09-07 04:23:56 -0700 Created attachment 237753 Patch 1033745 2 237753 darin 2014-09-07 11:37:52 -0700 Comment on attachment 237753 Patch Lets try again. 1033765 3 gyuyoung.kim 2014-09-07 18:01:29 -0700 (In reply to comment #2) > (From update of attachment 237753 [details]) > Lets try again. I will watch debug bot after landing this patch. 1033771 4 237753 commit-queue 2014-09-07 18:36:17 -0700 Comment on attachment 237753 Patch Clearing flags on attachment: 237753 Committed r173369: <http://trac.webkit.org/changeset/173369> 1033772 5 commit-queue 2014-09-07 18:36:22 -0700 All reviewed patches have been landed. Closing bug. 237753 2014-09-07 04:23:56 -0700 2014-09-07 18:36:17 -0700 Patch bug-136609-20140907202349.patch text/plain 11811 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTczMzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDIzODc2YTkxM2JkNzgz MTVkOWY5MGY1YzY4NjIzYzVjZjY2M2Q1My4uYzZiMzVmMmVkZWE0ZjNkZGNkZWE1MGViOWQ2N2Ez MTVhOTZhYzY5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA5LTA3ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgSW50cm9kdWNl IHRvQmFzaWNTaGFwZUZvbygpIGluc3RlYWQgb2Ygc3RhdGljX2Nhc3Q8QmFzaWNTaGFwZUZvbyo+ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzY2MDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUbyB1c2Ug QmFzaWNTaGFwZUZvbygpIGhlbHBzIHRvIGRldGVjdCB3cm9uZyB0eXBlIGNhc3RpbmcgYW5kIGlt cHJvdmUgY29kZSByZWFkYWJpbGl0eS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2 aW9yIGNoYW5nZXMuCisKKyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjp2YWx1ZUZvckJhc2ljU2hhcGUpOgorICAgICAgICAqIHJlbmRlcmlu Zy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hhcGU6OmNyZWF0ZVNoYXBl KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6QmFzaWNTaGFwZTo6Y2FuQmxlbmQpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNT aGFwZUNpcmNsZTo6YmxlbmQpOgorICAgICAgICAoV2ViQ29yZTo6QmFzaWNTaGFwZUVsbGlwc2U6 OmJsZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkJhc2ljU2hhcGVQb2x5Z29uOjpibGVuZCk6Cisg ICAgICAgIChXZWJDb3JlOjpCYXNpY1NoYXBlSW5zZXQ6OmJsZW5kKToKKyAgICAgICAgKiByZW5k ZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuaDoKKwogMjAxNC0wOS0wNiAgSmVyIE5vYmxlICA8amVy Lm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbRnVsbHNjcmVlbl0gQWRkIGEgc2l0ZS1zcGVj aWZpYyBoYWNrIHRvIHdvcmsgYXJvdW5kICJmbGFzaCBvbiBleGl0IiBiZWhhdmlvciBvZiBZb3VU dWJlLmNvbS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rp b25zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRl eCAwMTlkZTlmMDZiMTE4NDBiNTA0N2QyZGY3NDA2ODA1NWUyYzUxYzY0Li4wNGViYWZlODA1ZTFk ZjY1N2I3Y2E0MzAzYTdjMjEyMDI4MTEzNjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2lj U2hhcGVGdW5jdGlvbnMuY3BwCkBAIC03MSw3ICs3MSw3IEBAIFBhc3NSZWY8Q1NTVmFsdWU+IHZh bHVlRm9yQmFzaWNTaGFwZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IEJhc2ljU2hh cGUqCiAgICAgUmVmUHRyPENTU0Jhc2ljU2hhcGU+IGJhc2ljU2hhcGVWYWx1ZTsKICAgICBzd2l0 Y2ggKGJhc2ljU2hhcGUtPnR5cGUoKSkgewogICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFw ZUNpcmNsZVR5cGU6IHsKLSAgICAgICAgY29uc3QgQmFzaWNTaGFwZUNpcmNsZSogY2lyY2xlID0g c3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUNpcmNsZSo+KGJhc2ljU2hhcGUpOworICAgICAg ICBjb25zdCBCYXNpY1NoYXBlQ2lyY2xlKiBjaXJjbGUgPSB0b0Jhc2ljU2hhcGVDaXJjbGUoYmFz aWNTaGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NCYXNpY1NoYXBlQ2lyY2xlPiBjaXJjbGVWYWx1 ZSA9IENTU0Jhc2ljU2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCiAgICAgICAgIGNpcmNsZVZhbHVl LT5zZXRDZW50ZXJYKHZhbHVlRm9yQ2VudGVyQ29vcmRpbmF0ZShwb29sLCBzdHlsZSwgY2lyY2xl LT5jZW50ZXJYKCksIEhPUklaT05UQUwpKTsKQEAgLTgxLDcgKzgxLDcgQEAgUGFzc1JlZjxDU1NW YWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3Qg QmFzaWNTaGFwZSoKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgQmFzaWNTaGFwZTo6 QmFzaWNTaGFwZUVsbGlwc2VUeXBlOiB7Ci0gICAgICAgIGNvbnN0IEJhc2ljU2hhcGVFbGxpcHNl KiBlbGxpcHNlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqPihiYXNpY1No YXBlKTsKKyAgICAgICAgY29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqIGVsbGlwc2UgPSB0b0Jhc2lj U2hhcGVFbGxpcHNlKGJhc2ljU2hhcGUpOwogICAgICAgICBSZWZQdHI8Q1NTQmFzaWNTaGFwZUVs bGlwc2U+IGVsbGlwc2VWYWx1ZSA9IENTU0Jhc2ljU2hhcGVFbGxpcHNlOjpjcmVhdGUoKTsKIAog ICAgICAgICBlbGxpcHNlVmFsdWUtPnNldENlbnRlclgodmFsdWVGb3JDZW50ZXJDb29yZGluYXRl KHBvb2wsIHN0eWxlLCBlbGxpcHNlLT5jZW50ZXJYKCksIEhPUklaT05UQUwpKTsKQEAgLTkyLDcg KzkyLDcgQEAgUGFzc1JlZjxDU1NWYWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IFJlbmRl clN0eWxlKiBzdHlsZSwgY29uc3QgQmFzaWNTaGFwZSoKICAgICAgICAgYnJlYWs7CiAgICAgfQog ICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZVBvbHlnb25UeXBlOiB7Ci0gICAgICAgIGNv bnN0IEJhc2ljU2hhcGVQb2x5Z29uKiBwb2x5Z29uID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNT aGFwZVBvbHlnb24qPihiYXNpY1NoYXBlKTsKKyAgICAgICAgY29uc3QgQmFzaWNTaGFwZVBvbHln b24qIHBvbHlnb24gPSB0b0Jhc2ljU2hhcGVQb2x5Z29uKGJhc2ljU2hhcGUpOwogICAgICAgICBS ZWZQdHI8Q1NTQmFzaWNTaGFwZVBvbHlnb24+IHBvbHlnb25WYWx1ZSA9IENTU0Jhc2ljU2hhcGVQ b2x5Z29uOjpjcmVhdGUoKTsKIAogICAgICAgICBwb2x5Z29uVmFsdWUtPnNldFdpbmRSdWxlKHBv bHlnb24tPndpbmRSdWxlKCkpOwpAQCAtMTA0LDcgKzEwNCw3IEBAIFBhc3NSZWY8Q1NTVmFsdWU+ IHZhbHVlRm9yQmFzaWNTaGFwZShjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IEJhc2lj U2hhcGUqCiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2lj U2hhcGVJbnNldFR5cGU6IHsKLSAgICAgICAgY29uc3QgQmFzaWNTaGFwZUluc2V0KiBpbnNldCA9 IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVJbnNldCo+KGJhc2ljU2hhcGUpOworICAgICAg ICBjb25zdCBCYXNpY1NoYXBlSW5zZXQqIGluc2V0ID0gdG9CYXNpY1NoYXBlSW5zZXQoYmFzaWNT aGFwZSk7CiAgICAgICAgIFJlZlB0cjxDU1NCYXNpY1NoYXBlSW5zZXQ+IGluc2V0VmFsdWUgPSBD U1NCYXNpY1NoYXBlSW5zZXQ6OmNyZWF0ZSgpOwogCiAgICAgICAgIGluc2V0VmFsdWUtPnNldFRv cChwb29sLmNyZWF0ZVZhbHVlKGluc2V0LT50b3AoKSwgc3R5bGUpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKaW5kZXggODJmMmEyODZhMDhiZDhkOWFlMWM1MDQ1 NDA1OGFmZmY2YjlkNmFlNy4uOGM5MmE0Y2M1M2Y1MGE5ODI1OTM3YWE1MjBiODJkODNjMjY2Nzk1 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKQEAgLTEwMiw3 ICsxMDIsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVTaGFwZShjb25z dCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlLCBjb25zdCBMYQogICAgIHN3aXRjaCAoYmFzaWNTaGFw ZS0+dHlwZSgpKSB7CiAKICAgICBjYXNlIEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVDaXJjbGVUeXBl OiB7Ci0gICAgICAgIGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUqIGNpcmNsZSA9IHN0YXRpY19jYXN0 PGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUqPihiYXNpY1NoYXBlKTsKKyAgICAgICAgY29uc3QgQmFz aWNTaGFwZUNpcmNsZSogY2lyY2xlID0gdG9CYXNpY1NoYXBlQ2lyY2xlKGJhc2ljU2hhcGUpOwog ICAgICAgICBmbG9hdCBjZW50ZXJYID0gZmxvYXRWYWx1ZUZvckNlbnRlckNvb3JkaW5hdGUoY2ly Y2xlLT5jZW50ZXJYKCksIGJveFdpZHRoKTsKICAgICAgICAgZmxvYXQgY2VudGVyWSA9IGZsb2F0 VmFsdWVGb3JDZW50ZXJDb29yZGluYXRlKGNpcmNsZS0+Y2VudGVyWSgpLCBib3hIZWlnaHQpOwog ICAgICAgICBmbG9hdCByYWRpdXMgPSBjaXJjbGUtPmZsb2F0VmFsdWVGb3JSYWRpdXNJbkJveChi b3hXaWR0aCwgYm94SGVpZ2h0KTsKQEAgLTExMyw3ICsxMTMsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8 U2hhcGU+IFNoYXBlOjpjcmVhdGVTaGFwZShjb25zdCBCYXNpY1NoYXBlKiBiYXNpY1NoYXBlLCBj b25zdCBMYQogICAgIH0KIAogICAgIGNhc2UgQmFzaWNTaGFwZTo6QmFzaWNTaGFwZUVsbGlwc2VU eXBlOiB7Ci0gICAgICAgIGNvbnN0IEJhc2ljU2hhcGVFbGxpcHNlKiBlbGxpcHNlID0gc3RhdGlj X2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqPihiYXNpY1NoYXBlKTsKKyAgICAgICAgY29u c3QgQmFzaWNTaGFwZUVsbGlwc2UqIGVsbGlwc2UgPSB0b0Jhc2ljU2hhcGVFbGxpcHNlKGJhc2lj U2hhcGUpOwogICAgICAgICBmbG9hdCBjZW50ZXJYID0gZmxvYXRWYWx1ZUZvckNlbnRlckNvb3Jk aW5hdGUoZWxsaXBzZS0+Y2VudGVyWCgpLCBib3hXaWR0aCk7CiAgICAgICAgIGZsb2F0IGNlbnRl clkgPSBmbG9hdFZhbHVlRm9yQ2VudGVyQ29vcmRpbmF0ZShlbGxpcHNlLT5jZW50ZXJZKCksIGJv eEhlaWdodCk7CiAgICAgICAgIGZsb2F0IHJhZGl1c1ggPSBlbGxpcHNlLT5mbG9hdFZhbHVlRm9y UmFkaXVzSW5Cb3goZWxsaXBzZS0+cmFkaXVzWCgpLCBjZW50ZXJYLCBib3hXaWR0aCk7CkBAIC0x MjUsNyArMTI1LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFNoYXBlPiBTaGFwZTo6Y3JlYXRlU2hhcGUo Y29uc3QgQmFzaWNTaGFwZSogYmFzaWNTaGFwZSwgY29uc3QgTGEKICAgICB9CiAKICAgICBjYXNl IEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVQb2x5Z29uVHlwZTogewotICAgICAgICBjb25zdCBCYXNp Y1NoYXBlUG9seWdvbiYgcG9seWdvbiA9ICpzdGF0aWNfY2FzdDxjb25zdCBCYXNpY1NoYXBlUG9s eWdvbio+KGJhc2ljU2hhcGUpOworICAgICAgICBjb25zdCBCYXNpY1NoYXBlUG9seWdvbiYgcG9s eWdvbiA9ICp0b0Jhc2ljU2hhcGVQb2x5Z29uKGJhc2ljU2hhcGUpOwogICAgICAgICBjb25zdCBW ZWN0b3I8TGVuZ3RoPiYgdmFsdWVzID0gcG9seWdvbi52YWx1ZXMoKTsKICAgICAgICAgc2l6ZV90 IHZhbHVlc1NpemUgPSB2YWx1ZXMuc2l6ZSgpOwogICAgICAgICBBU1NFUlQoISh2YWx1ZXNTaXpl ICUgMikpOwpAQCAtMTQyLDcgKzE0Miw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxTaGFwZT4gU2hhcGU6 OmNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUqIGJhc2ljU2hhcGUsIGNvbnN0IExhCiAgICAg fQogCiAgICAgY2FzZSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlSW5zZXRUeXBlOiB7Ci0gICAgICAg IGNvbnN0IEJhc2ljU2hhcGVJbnNldCYgaW5zZXQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNT aGFwZUluc2V0Kj4oYmFzaWNTaGFwZSk7CisgICAgICAgIGNvbnN0IEJhc2ljU2hhcGVJbnNldCYg aW5zZXQgPSAqdG9CYXNpY1NoYXBlSW5zZXQoYmFzaWNTaGFwZSk7CiAgICAgICAgIGZsb2F0IGxl ZnQgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGluc2V0LmxlZnQoKSwgYm94V2lkdGgpOwogICAgICAg ICBmbG9hdCB0b3AgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKGluc2V0LnRvcCgpLCBib3hIZWlnaHQp OwogICAgICAgICBGbG9hdFJlY3QgcmVjdChsZWZ0LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9zdHlsZS9CYXNpY1NoYXBlcy5jcHAKaW5kZXggMDgyZjk1ZDhmYTEzN2U2YzczMjUxYjg4 YjIxMjk2ODNlYjE1YjVlOC4uNzVkZTE5YjcxOTQzYmI1Zjg0NGZmOTI1N2M2YjkyMzEzMjM3MDFj MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvQmFzaWNTaGFwZXMuY3Bw CkBAIC02NiwxNCArNjYsMTQgQEAgYm9vbCBCYXNpY1NoYXBlOjpjYW5CbGVuZChjb25zdCBCYXNp Y1NoYXBlKiBvdGhlcikgY29uc3QKIAogICAgIC8vIEp1c3QgcG9seWdvbnMgd2l0aCBzYW1lIG51 bWJlciBvZiB2ZXJ0aWNlcyBjYW4gYmUgYW5pbWF0ZWQuCiAgICAgaWYgKHR5cGUoKSA9PSBCYXNp Y1NoYXBlOjpCYXNpY1NoYXBlUG9seWdvblR5cGUKLSAgICAgICAgJiYgKHN0YXRpY19jYXN0PGNv bnN0IEJhc2ljU2hhcGVQb2x5Z29uKj4odGhpcyktPnZhbHVlcygpLnNpemUoKSAhPSBzdGF0aWNf Y2FzdDxjb25zdCBCYXNpY1NoYXBlUG9seWdvbio+KG90aGVyKS0+dmFsdWVzKCkuc2l6ZSgpCi0g ICAgICAgIHx8IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVQb2x5Z29uKj4odGhpcyktPndp bmRSdWxlKCkgIT0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZVBvbHlnb24qPihvdGhlcikt PndpbmRSdWxlKCkpKQorICAgICAgICAmJiAodG9CYXNpY1NoYXBlUG9seWdvbih0aGlzKS0+dmFs dWVzKCkuc2l6ZSgpICE9IHRvQmFzaWNTaGFwZVBvbHlnb24ob3RoZXIpLT52YWx1ZXMoKS5zaXpl KCkKKyAgICAgICAgfHwgdG9CYXNpY1NoYXBlUG9seWdvbih0aGlzKS0+d2luZFJ1bGUoKSAhPSB0 b0Jhc2ljU2hhcGVQb2x5Z29uKG90aGVyKS0+d2luZFJ1bGUoKSkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIC8vIENpcmNsZXMgd2l0aCBrZXl3b3JkcyBmb3IgcmFkaWkgY29vcmRpbmF0 ZXMgY2Fubm90IGJlIGFuaW1hdGVkLgogICAgIGlmICh0eXBlKCkgPT0gQmFzaWNTaGFwZTo6QmFz aWNTaGFwZUNpcmNsZVR5cGUpIHsKLSAgICAgICAgY29uc3QgQmFzaWNTaGFwZUNpcmNsZSogdGhp c0NpcmNsZSA9IHN0YXRpY19jYXN0PGNvbnN0IEJhc2ljU2hhcGVDaXJjbGUqPih0aGlzKTsKLSAg ICAgICAgY29uc3QgQmFzaWNTaGFwZUNpcmNsZSogb3RoZXJDaXJjbGUgPSBzdGF0aWNfY2FzdDxj b25zdCBCYXNpY1NoYXBlQ2lyY2xlKj4ob3RoZXIpOworICAgICAgICBjb25zdCBCYXNpY1NoYXBl Q2lyY2xlKiB0aGlzQ2lyY2xlID0gdG9CYXNpY1NoYXBlQ2lyY2xlKHRoaXMpOworICAgICAgICBj b25zdCBCYXNpY1NoYXBlQ2lyY2xlKiBvdGhlckNpcmNsZSA9IHRvQmFzaWNTaGFwZUNpcmNsZShv dGhlcik7CiAgICAgICAgIGlmICghdGhpc0NpcmNsZS0+cmFkaXVzKCkuY2FuQmxlbmQob3RoZXJD aXJjbGUtPnJhZGl1cygpKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CkBAIC04 Miw4ICs4Miw4IEBAIGJvb2wgQmFzaWNTaGFwZTo6Y2FuQmxlbmQoY29uc3QgQmFzaWNTaGFwZSog b3RoZXIpIGNvbnN0CiAgICAgaWYgKHR5cGUoKSAhPSBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlRWxs aXBzZVR5cGUpCiAgICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgY29uc3QgQmFzaWNTaGFwZUVs bGlwc2UqIHRoaXNFbGxpcHNlID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUVsbGlwc2Uq Pih0aGlzKTsKLSAgICBjb25zdCBCYXNpY1NoYXBlRWxsaXBzZSogb3RoZXJFbGxpcHNlID0gc3Rh dGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqPihvdGhlcik7CisgICAgY29uc3QgQmFz aWNTaGFwZUVsbGlwc2UqIHRoaXNFbGxpcHNlID0gdG9CYXNpY1NoYXBlRWxsaXBzZSh0aGlzKTsK KyAgICBjb25zdCBCYXNpY1NoYXBlRWxsaXBzZSogb3RoZXJFbGxpcHNlID0gdG9CYXNpY1NoYXBl RWxsaXBzZShvdGhlcik7CiAgICAgcmV0dXJuICh0aGlzRWxsaXBzZS0+cmFkaXVzWCgpLmNhbkJs ZW5kKG90aGVyRWxsaXBzZS0+cmFkaXVzWCgpKQogICAgICAgICAmJiB0aGlzRWxsaXBzZS0+cmFk aXVzWSgpLmNhbkJsZW5kKG90aGVyRWxsaXBzZS0+cmFkaXVzWSgpKSk7CiB9CkBAIC0xMjEsNyAr MTIxLDcgQEAgdm9pZCBCYXNpY1NoYXBlQ2lyY2xlOjpwYXRoKFBhdGgmIHBhdGgsIGNvbnN0IEZs b2F0UmVjdCYgYm91bmRpbmdCb3gpCiBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IEJhc2ljU2hhcGVD aXJjbGU6OmJsZW5kKGNvbnN0IEJhc2ljU2hhcGUqIG90aGVyLCBkb3VibGUgcHJvZ3Jlc3MpIGNv bnN0CiB7CiAgICAgQVNTRVJUKHR5cGUoKSA9PSBvdGhlci0+dHlwZSgpKTsKLSAgICBjb25zdCBC YXNpY1NoYXBlQ2lyY2xlKiBvID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUNpcmNsZSo+ KG90aGVyKTsKKyAgICBjb25zdCBCYXNpY1NoYXBlQ2lyY2xlKiBvID0gdG9CYXNpY1NoYXBlQ2ly Y2xlKG90aGVyKTsKICAgICBSZWZQdHI8QmFzaWNTaGFwZUNpcmNsZT4gcmVzdWx0ID0gIEJhc2lj U2hhcGVDaXJjbGU6OmNyZWF0ZSgpOwogCiAgICAgcmVzdWx0LT5zZXRDZW50ZXJYKG1fY2VudGVy WC5ibGVuZChvLT5jZW50ZXJYKCksIHByb2dyZXNzKSk7CkBAIC0xNjAsNyArMTYwLDcgQEAgdm9p ZCBCYXNpY1NoYXBlRWxsaXBzZTo6cGF0aChQYXRoJiBwYXRoLCBjb25zdCBGbG9hdFJlY3QmIGJv dW5kaW5nQm94KQogUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBCYXNpY1NoYXBlRWxsaXBzZTo6Ymxl bmQoY29uc3QgQmFzaWNTaGFwZSogb3RoZXIsIGRvdWJsZSBwcm9ncmVzcykgY29uc3QKIHsKICAg ICBBU1NFUlQodHlwZSgpID09IG90aGVyLT50eXBlKCkpOwotICAgIGNvbnN0IEJhc2ljU2hhcGVF bGxpcHNlKiBvID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqPihvdGhlcik7 CisgICAgY29uc3QgQmFzaWNTaGFwZUVsbGlwc2UqIG8gPSB0b0Jhc2ljU2hhcGVFbGxpcHNlKG90 aGVyKTsKICAgICBSZWZQdHI8QmFzaWNTaGFwZUVsbGlwc2U+IHJlc3VsdCA9IEJhc2ljU2hhcGVF bGxpcHNlOjpjcmVhdGUoKTsKIAogICAgIGlmIChtX3JhZGl1c1gudHlwZSgpICE9IEJhc2ljU2hh cGVSYWRpdXM6OlZhbHVlIHx8IG8tPnJhZGl1c1goKS50eXBlKCkgIT0gQmFzaWNTaGFwZVJhZGl1 czo6VmFsdWUKQEAgLTIwMSw3ICsyMDEsNyBAQCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IEJhc2lj U2hhcGVQb2x5Z29uOjpibGVuZChjb25zdCBCYXNpY1NoYXBlKiBvdGhlciwgZG91YmxlCiB7CiAg ICAgQVNTRVJUKHR5cGUoKSA9PSBvdGhlci0+dHlwZSgpKTsKIAotICAgIGNvbnN0IEJhc2ljU2hh cGVQb2x5Z29uKiBvID0gc3RhdGljX2Nhc3Q8Y29uc3QgQmFzaWNTaGFwZVBvbHlnb24qPihvdGhl cik7CisgICAgY29uc3QgQmFzaWNTaGFwZVBvbHlnb24qIG8gPSB0b0Jhc2ljU2hhcGVQb2x5Z29u KG90aGVyKTsKICAgICBBU1NFUlQobV92YWx1ZXMuc2l6ZSgpID09IG8tPnZhbHVlcygpLnNpemUo KSk7CiAgICAgQVNTRVJUKCEobV92YWx1ZXMuc2l6ZSgpICUgMikpOwogCkBAIC0yNTAsNyArMjUw LDcgQEAgUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBCYXNpY1NoYXBlSW5zZXQ6OmJsZW5kKGNvbnN0 IEJhc2ljU2hhcGUqIG90aGVyLCBkb3VibGUgcHIKIHsKICAgICBBU1NFUlQodHlwZSgpID09IG90 aGVyLT50eXBlKCkpOwogCi0gICAgY29uc3QgQmFzaWNTaGFwZUluc2V0KiBvID0gc3RhdGljX2Nh c3Q8Y29uc3QgQmFzaWNTaGFwZUluc2V0Kj4ob3RoZXIpOworICAgIGNvbnN0IEJhc2ljU2hhcGVJ bnNldCogbyA9IHRvQmFzaWNTaGFwZUluc2V0KG90aGVyKTsKICAgICBSZWZQdHI8QmFzaWNTaGFw ZUluc2V0PiByZXN1bHQgPSAgQmFzaWNTaGFwZUluc2V0OjpjcmVhdGUoKTsKICAgICByZXN1bHQt PnNldFRvcChtX3RvcC5ibGVuZChvLT50b3AoKSwgcHJvZ3Jlc3MpKTsKICAgICByZXN1bHQtPnNl dFJpZ2h0KG1fcmlnaHQuYmxlbmQoby0+cmlnaHQoKSwgcHJvZ3Jlc3MpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9CYXNpY1NoYXBlcy5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hhcGVzLmgKaW5kZXggNTg5MmYxMDA3Yjk2YmMy ZDgxZjU0MDMwMmVjMTAxODk5NWNjOTY1ZC4uNzVmYTkwNDRhZWM0NDYxN2FiOWM4ZGI3Y2M5NzU3 ZWY2ZDM0NjllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jh c2ljU2hhcGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL0Jhc2ljU2hh cGVzLmgKQEAgLTY0LDYgKzY0LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgVHlwZSB0eXBlKCkg Y29uc3QgPSAwOwogfTsKIAorI2RlZmluZSBCQVNJQ19TSEFQRVNfVFlQRV9DQVNUUyhUb1ZhbHVl VHlwZU5hbWUsIHByZWRpY2F0ZSkgXAorICAgIFRZUEVfQ0FTVFNfQkFTRShUb1ZhbHVlVHlwZU5h bWUsIEJhc2ljU2hhcGUsIGJhc2ljU2hhcGUsIGJhc2ljU2hhcGUtPnR5cGUoKSA9PSBwcmVkaWNh dGUsIGJhc2ljU2hhcGUudHlwZSgpID09IHByZWRpY2F0ZSkKKwogY2xhc3MgQmFzaWNTaGFwZUNl bnRlckNvb3JkaW5hdGUgewogcHVibGljOgogICAgIGVudW0gRGlyZWN0aW9uIHsKQEAgLTE2OSw2 ICsxNzIsOCBAQCBwcml2YXRlOgogICAgIEJhc2ljU2hhcGVSYWRpdXMgbV9yYWRpdXM7CiB9Owog CitCQVNJQ19TSEFQRVNfVFlQRV9DQVNUUyhCYXNpY1NoYXBlQ2lyY2xlLCBCYXNpY1NoYXBlOjpC YXNpY1NoYXBlQ2lyY2xlVHlwZSkKKwogY2xhc3MgQmFzaWNTaGFwZUVsbGlwc2UgOiBwdWJsaWMg QmFzaWNTaGFwZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8QmFzaWNTaGFwZUVs bGlwc2U+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBCYXNpY1NoYXBlRWxsaXBzZSk7 IH0KQEAgLTE5Nyw2ICsyMDIsOCBAQCBwcml2YXRlOgogICAgIEJhc2ljU2hhcGVSYWRpdXMgbV9y YWRpdXNZOwogfTsKIAorQkFTSUNfU0hBUEVTX1RZUEVfQ0FTVFMoQmFzaWNTaGFwZUVsbGlwc2Us IEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVFbGxpcHNlVHlwZSkKKwogY2xhc3MgQmFzaWNTaGFwZVBv bHlnb24gOiBwdWJsaWMgQmFzaWNTaGFwZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8QmFzaWNTaGFwZVBvbHlnb24+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBCYXNp Y1NoYXBlUG9seWdvbik7IH0KQEAgLTIyMyw2ICsyMzAsOCBAQCBwcml2YXRlOgogICAgIFZlY3Rv cjxMZW5ndGg+IG1fdmFsdWVzOwogfTsKIAorQkFTSUNfU0hBUEVTX1RZUEVfQ0FTVFMoQmFzaWNT aGFwZVBvbHlnb24sIEJhc2ljU2hhcGU6OkJhc2ljU2hhcGVQb2x5Z29uVHlwZSkKKwogY2xhc3Mg QmFzaWNTaGFwZUluc2V0IDogcHVibGljIEJhc2ljU2hhcGUgewogcHVibGljOgogICAgIHN0YXRp YyBQYXNzUmVmUHRyPEJhc2ljU2hhcGVJbnNldD4gY3JlYXRlKCkgeyByZXR1cm4gYWRvcHRSZWYo bmV3IEJhc2ljU2hhcGVJbnNldCk7IH0KQEAgLTI2NSw1ICsyNzQsNyBAQCBwcml2YXRlOgogICAg IExlbmd0aFNpemUgbV9ib3R0b21MZWZ0UmFkaXVzOwogfTsKIAorQkFTSUNfU0hBUEVTX1RZUEVf Q0FTVFMoQmFzaWNTaGFwZUluc2V0LCBCYXNpY1NoYXBlOjpCYXNpY1NoYXBlSW5zZXRUeXBlKQor CiB9CiAjZW5kaWYK