103134 2012-11-23 06:02:37 -0800 RenderLayer minor clean-up: replace raw pointers with OwnPtrs. 2012-11-23 06:56:35 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 loislo loislo eric hyatt jamesr koivisto ojan simon.fraser webkit.review.bot oldest_to_newest 774492 0 loislo 2012-11-23 06:02:37 -0800 I found that RenderLayer still uses raw pointers to the objects which it owns. Looks like these pointers could be replaced with OwnPtrs. Patch to follow. 774493 1 175790 loislo 2012-11-23 06:05:12 -0800 Created attachment 175790 Patch 774520 2 175790 eric 2012-11-23 06:53:04 -0800 Comment on attachment 175790 Patch Yay! 774522 3 loislo 2012-11-23 06:56:35 -0800 Committed r135605: <http://trac.webkit.org/changeset/135605> 175790 2012-11-23 06:05:12 -0800 2012-11-23 06:53:04 -0800 Patch bug-103134-20121123180254.patch text/plain 9253 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTJiOWI2MzA2MTUxZDQx YmIwZmE5Y2JmNzY2Y2RkMmQxMzg1YjA3ZC4uZWVlMmIzNGI2M2NmNjQ4MjljMWU3YTYzYjQyOTA5 MjRkNzZjYTY3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTExLTIzICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5kZXJMYXll ciBtaW5vciBjbGVhbi11cDogcmVwbGFjZSByYXcgcG9pbnRlcnMgd2l0aCBPd25QdHJzLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAzMTM0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBmb3VuZCB0aGF0 IFJlbmRlckxheWVyIHN0aWxsIHVzZXMgcmF3IHBvaW50ZXJzIHRvIHRoZSBvYmplY3RzIHdoaWNo IGl0IG93bnMuCisgICAgICAgIExvb2tzIGxpa2UgdGhlc2UgcG9pbnRlcnMgY291bGQgYmUgcmVw bGFjZWQgd2l0aCBPd25QdHJzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpSZW5kZXJMYXllcik6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJMYXllcjo6flJlbmRlckxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6OmhpdFRlc3RMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 dXBkYXRlTm9ybWFsRmxvd0xpc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNv bGxlY3RMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnN0eWxlQ2hhbmdl ZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJMYXllcjo6bWFycXVlZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 cG9zWk9yZGVyTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6bmVnWk9yZGVy TGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6bm9ybWFsRmxvd0xpc3QpOgor ICAgICAgICAoUmVuZGVyTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNs ZWFyWk9yZGVyTGlzdHMpOgorCiAyMDEyLTExLTIyICBSYWZhZWwgQnJhbmRhbyAgPHJhZmFlbC5s b2JvQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIFBMQVRGT1JNKEhBSUtVKSBsZWZ0 b3ZlcnMgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXgg NGU2N2NkNTcxM2Q2NGI4Mjc2MzJkNzBhOGU4MGIxNDQ5MDBlYjc1ZC4uYjRiMDFiMDU3YjRmOTZk MDE2NmVjZGRjZTQ0NDU0NDFlODc0MzE5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwCkBAIC0xNzksMTAgKzE3OSw2IEBAIFJlbmRlckxheWVyOjpSZW5kZXJMYXll cihSZW5kZXJMYXllck1vZGVsT2JqZWN0KiByZW5kZXJlcikKICAgICAsIG1fbmV4dCgwKQogICAg ICwgbV9maXJzdCgwKQogICAgICwgbV9sYXN0KDApCi0gICAgLCBtX3Bvc1pPcmRlckxpc3QoMCkK LSAgICAsIG1fbmVnWk9yZGVyTGlzdCgwKQotICAgICwgbV9ub3JtYWxGbG93TGlzdCgwKQotICAg ICwgbV9tYXJxdWVlKDApCiAgICAgLCBtX3N0YXRpY0lubGluZVBvc2l0aW9uKDApCiAgICAgLCBt X3N0YXRpY0Jsb2NrUG9zaXRpb24oMCkKICAgICAsIG1fcmVmbGVjdGlvbigwKQpAQCAtMjQ1LDEx ICsyNDEsNiBAQCBSZW5kZXJMYXllcjo6flJlbmRlckxheWVyKCkKICAgICAvLyBDaGlsZCBsYXll cnMgd2lsbCBiZSBkZWxldGVkIGJ5IHRoZWlyIGNvcnJlc3BvbmRpbmcgcmVuZGVyIG9iamVjdHMs IHNvCiAgICAgLy8gd2UgZG9uJ3QgbmVlZCB0byBkZWxldGUgdGhlbSBvdXJzZWx2ZXMuCiAKLSAg ICBkZWxldGUgbV9wb3NaT3JkZXJMaXN0OwotICAgIGRlbGV0ZSBtX25lZ1pPcmRlckxpc3Q7Ci0g ICAgZGVsZXRlIG1fbm9ybWFsRmxvd0xpc3Q7Ci0gICAgZGVsZXRlIG1fbWFycXVlZTsKLQogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBjbGVhckJhY2tpbmcodHJ1ZSk7CiAj ZW5kaWYKQEAgLTM0MjEsNyArMzQxMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJD b250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAg ICAgIH0KICAgICAKICAgICAgICAgLy8gUGFpbnQgYW55IGNoaWxkIGxheWVycyB0aGF0IGhhdmUg b3ZlcmZsb3cuCi0gICAgICAgIHBhaW50TGlzdChtX25vcm1hbEZsb3dMaXN0LCBjb250ZXh0LCBs b2NhbFBhaW50aW5nSW5mbywgbG9jYWxQYWludEZsYWdzKTsKKyAgICAgICAgcGFpbnRMaXN0KG1f bm9ybWFsRmxvd0xpc3QuZ2V0KCksIGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBsb2NhbFBh aW50RmxhZ3MpOwogICAgIAogICAgICAgICAvLyBOb3cgd2FsayB0aGUgc29ydGVkIGxpc3Qgb2Yg Y2hpbGRyZW4gd2l0aCBwb3NpdGl2ZSB6LWluZGljZXMuCiAgICAgICAgIHBhaW50TGlzdChwb3Na T3JkZXJMaXN0KCksIGNvbnRleHQsIGxvY2FsUGFpbnRpbmdJbmZvLCBsb2NhbFBhaW50RmxhZ3Mp OwpAQCAtMzg4NCw3ICszODc1LDcgQEAgUmVuZGVyTGF5ZXIqIFJlbmRlckxheWVyOjpoaXRUZXN0 TGF5ZXIoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgUmVuZGVyTGF5ZXIqIGNvbnQKICAgICB9CiAK ICAgICAvLyBOb3cgY2hlY2sgb3VyIG92ZXJmbG93IG9iamVjdHMuCi0gICAgaGl0TGF5ZXIgPSBo aXRUZXN0TGlzdChtX25vcm1hbEZsb3dMaXN0LCByb290TGF5ZXIsIHJlcXVlc3QsIHJlc3VsdCwg aGl0VGVzdFJlY3QsIGhpdFRlc3RMb2NhdGlvbiwKKyAgICBoaXRMYXllciA9IGhpdFRlc3RMaXN0 KG1fbm9ybWFsRmxvd0xpc3QuZ2V0KCksIHJvb3RMYXllciwgcmVxdWVzdCwgcmVzdWx0LCBoaXRU ZXN0UmVjdCwgaGl0VGVzdExvY2F0aW9uLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgbG9j YWxUcmFuc2Zvcm1TdGF0ZS5nZXQoKSwgek9mZnNldEZvckRlc2NlbmRhbnRzUHRyLCB6T2Zmc2V0 LCB1bmZsYXR0ZW5lZFRyYW5zZm9ybVN0YXRlLmdldCgpLCBkZXB0aFNvcnREZXNjZW5kYW50cyk7 CiAgICAgaWYgKGhpdExheWVyKSB7CiAgICAgICAgIGlmICghZGVwdGhTb3J0RGVzY2VuZGFudHMp CkBAIC00ODMyLDcgKzQ4MjMsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVOb3JtYWxGbG93 TGlzdCgpCiAgICAgICAgIC8vIElnbm9yZSBub24tb3ZlcmZsb3cgbGF5ZXJzIGFuZCByZWZsZWN0 aW9ucy4KICAgICAgICAgaWYgKGNoaWxkLT5pc05vcm1hbEZsb3dPbmx5KCkgJiYgKCFtX3JlZmxl Y3Rpb24gfHwgcmVmbGVjdGlvbkxheWVyKCkgIT0gY2hpbGQpKSB7CiAgICAgICAgICAgICBpZiAo IW1fbm9ybWFsRmxvd0xpc3QpCi0gICAgICAgICAgICAgICAgbV9ub3JtYWxGbG93TGlzdCA9IG5l dyBWZWN0b3I8UmVuZGVyTGF5ZXIqPjsKKyAgICAgICAgICAgICAgICBtX25vcm1hbEZsb3dMaXN0 ID0gYWRvcHRQdHIobmV3IFZlY3RvcjxSZW5kZXJMYXllcio+KTsKICAgICAgICAgICAgIG1fbm9y bWFsRmxvd0xpc3QtPmFwcGVuZChjaGlsZCk7CiAgICAgICAgIH0KICAgICB9CkBAIC00ODQwLDcg KzQ4MzEsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVOb3JtYWxGbG93TGlzdCgpCiAgICAg bV9ub3JtYWxGbG93TGlzdERpcnR5ID0gZmFsc2U7CiB9CiAKLXZvaWQgUmVuZGVyTGF5ZXI6OmNv bGxlY3RMYXllcnMoYm9vbCBpbmNsdWRlSGlkZGVuTGF5ZXJzLCBWZWN0b3I8UmVuZGVyTGF5ZXIq PiomIHBvc0J1ZmZlciwgVmVjdG9yPFJlbmRlckxheWVyKj4qJiBuZWdCdWZmZXIpCit2b2lkIFJl bmRlckxheWVyOjpjb2xsZWN0TGF5ZXJzKGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycywgT3duUHRy PFZlY3RvcjxSZW5kZXJMYXllcio+ID4mIHBvc0J1ZmZlciwgT3duUHRyPFZlY3RvcjxSZW5kZXJM YXllcio+ID4mIG5lZ0J1ZmZlcikKIHsKICNpZiBFTkFCTEUoRElBTE9HX0VMRU1FTlQpCiAgICAg aWYgKGlzSW5Ub3BMYXllcigpKQpAQCAtNDg1MywxMSArNDg0NCwxMSBAQCB2b2lkIFJlbmRlckxh eWVyOjpjb2xsZWN0TGF5ZXJzKGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycywgVmVjdG9yPFJlbmRl ckxheWVyKj4qJgogICAgIGJvb2wgaW5jbHVkZUhpZGRlbkxheWVyID0gaW5jbHVkZUhpZGRlbkxh eWVycyB8fCAobV9oYXNWaXNpYmxlQ29udGVudCB8fCAobV9oYXNWaXNpYmxlRGVzY2VuZGFudCAm JiBpc1N0YWNraW5nQ29udGV4dCgpKSk7CiAgICAgaWYgKGluY2x1ZGVIaWRkZW5MYXllciAmJiAh aXNOb3JtYWxGbG93T25seSgpICYmICFyZW5kZXJlcigpLT5pc1JlbmRlckZsb3dUaHJlYWQoKSkg ewogICAgICAgICAvLyBEZXRlcm1pbmUgd2hpY2ggYnVmZmVyIHRoZSBjaGlsZCBzaG91bGQgYmUg aW4uCi0gICAgICAgIFZlY3RvcjxSZW5kZXJMYXllcio+KiYgYnVmZmVyID0gKHpJbmRleCgpID49 IDApID8gcG9zQnVmZmVyIDogbmVnQnVmZmVyOworICAgICAgICBPd25QdHI8VmVjdG9yPFJlbmRl ckxheWVyKj4gPiYgYnVmZmVyID0gKHpJbmRleCgpID49IDApID8gcG9zQnVmZmVyIDogbmVnQnVm ZmVyOwogCiAgICAgICAgIC8vIENyZWF0ZSB0aGUgYnVmZmVyIGlmIGl0IGRvZXNuJ3QgZXhpc3Qg eWV0LgogICAgICAgICBpZiAoIWJ1ZmZlcikKLSAgICAgICAgICAgIGJ1ZmZlciA9IG5ldyBWZWN0 b3I8UmVuZGVyTGF5ZXIqPjsKKyAgICAgICAgICAgIGJ1ZmZlciA9IGFkb3B0UHRyKG5ldyBWZWN0 b3I8UmVuZGVyTGF5ZXIqPik7CiAgICAgICAgIAogICAgICAgICAvLyBBcHBlbmQgb3Vyc2VsdmVz IGF0IHRoZSBlbmQgb2YgdGhlIGFwcHJvcHJpYXRlIGJ1ZmZlci4KICAgICAgICAgYnVmZmVyLT5h cHBlbmQodGhpcyk7CkBAIC01MDg2LDEyICs1MDc3LDExIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnN0 eWxlQ2hhbmdlZChTdHlsZURpZmZlcmVuY2UsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkK IAogICAgIGlmIChyZW5kZXJlcigpLT5zdHlsZSgpLT5vdmVyZmxvd1goKSA9PSBPTUFSUVVFRSAm JiByZW5kZXJlcigpLT5zdHlsZSgpLT5tYXJxdWVlQmVoYXZpb3IoKSAhPSBNTk9ORSAmJiByZW5k ZXJlcigpLT5pc0JveCgpKSB7CiAgICAgICAgIGlmICghbV9tYXJxdWVlKQotICAgICAgICAgICAg bV9tYXJxdWVlID0gbmV3IFJlbmRlck1hcnF1ZWUodGhpcyk7CisgICAgICAgICAgICBtX21hcnF1 ZWUgPSBhZG9wdFB0cihuZXcgUmVuZGVyTWFycXVlZSh0aGlzKSk7CiAgICAgICAgIG1fbWFycXVl ZS0+dXBkYXRlTWFycXVlZVN0eWxlKCk7CiAgICAgfQogICAgIGVsc2UgaWYgKG1fbWFycXVlZSkg ewotICAgICAgICBkZWxldGUgbV9tYXJxdWVlOwotICAgICAgICBtX21hcnF1ZWUgPSAwOworICAg ICAgICBtX21hcnF1ZWUuY2xlYXIoKTsKICAgICB9CiAKICAgICB1cGRhdGVTdGFja2luZ0NvbnRl eHRzQWZ0ZXJTdHlsZUNoYW5nZShvbGRTdHlsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5oCmluZGV4IDE5ZDUyOTY4YzhmZmUwZjVkYTY2MzRhMzNjZWQ3OWVlNzc1MzU5ZmUu LjBiMTRhNmQ2YjBiZGVjMjQ3MjkzMWU2N2M1MTU4MjljNzQ1ODA4ZjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5oCkBAIC0yODQsNyArMjg0LDcgQEAgcHVibGljOgogCiAg ICAgdm9pZCBzdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlLCBjb25zdCBSZW5kZXJTdHlsZSog b2xkU3R5bGUpOwogCi0gICAgUmVuZGVyTWFycXVlZSogbWFycXVlZSgpIGNvbnN0IHsgcmV0dXJu IG1fbWFycXVlZTsgfQorICAgIFJlbmRlck1hcnF1ZWUqIG1hcnF1ZWUoKSBjb25zdCB7IHJldHVy biBtX21hcnF1ZWUuZ2V0KCk7IH0KIAogICAgIGJvb2wgaXNOb3JtYWxGbG93T25seSgpIGNvbnN0 IHsgcmV0dXJuIG1faXNOb3JtYWxGbG93T25seTsgfQogICAgIGJvb2wgaXNTZWxmUGFpbnRpbmdM YXllcigpIGNvbnN0IHsgcmV0dXJuIG1faXNTZWxmUGFpbnRpbmdMYXllcjsgfQpAQCAtNDMzLDcg KzQzMyw3IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFTU0VSVCghbV96T3JkZXJMaXN0c0Rp cnR5KTsKICAgICAgICAgQVNTRVJUKGlzU3RhY2tpbmdDb250ZXh0KCkgfHwgIW1fcG9zWk9yZGVy TGlzdCk7Ci0gICAgICAgIHJldHVybiBtX3Bvc1pPcmRlckxpc3Q7CisgICAgICAgIHJldHVybiBt X3Bvc1pPcmRlckxpc3QuZ2V0KCk7CiAgICAgfQogCiAgICAgYm9vbCBoYXNOZWdhdGl2ZVpPcmRl ckxpc3QoKSBjb25zdCB7IHJldHVybiBuZWdaT3JkZXJMaXN0KCkgJiYgbmVnWk9yZGVyTGlzdCgp LT5zaXplKCk7IH0KQEAgLTQ0MiwxMSArNDQyLDExIEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAg IEFTU0VSVCghbV96T3JkZXJMaXN0c0RpcnR5KTsKICAgICAgICAgQVNTRVJUKGlzU3RhY2tpbmdD b250ZXh0KCkgfHwgIW1fbmVnWk9yZGVyTGlzdCk7Ci0gICAgICAgIHJldHVybiBtX25lZ1pPcmRl ckxpc3Q7CisgICAgICAgIHJldHVybiBtX25lZ1pPcmRlckxpc3QuZ2V0KCk7CiAgICAgfQogCiAg ICAgdm9pZCBkaXJ0eU5vcm1hbEZsb3dMaXN0KCk7Ci0gICAgVmVjdG9yPFJlbmRlckxheWVyKj4q IG5vcm1hbEZsb3dMaXN0KCkgY29uc3QgeyBBU1NFUlQoIW1fbm9ybWFsRmxvd0xpc3REaXJ0eSk7 IHJldHVybiBtX25vcm1hbEZsb3dMaXN0OyB9CisgICAgVmVjdG9yPFJlbmRlckxheWVyKj4qIG5v cm1hbEZsb3dMaXN0KCkgY29uc3QgeyBBU1NFUlQoIW1fbm9ybWFsRmxvd0xpc3REaXJ0eSk7IHJl dHVybiBtX25vcm1hbEZsb3dMaXN0LmdldCgpOyB9CiAKICAgICAvLyBVcGRhdGUgb3VyIG5vcm1h bCBhbmQgei1pbmRleCBsaXN0cy4KICAgICB2b2lkIHVwZGF0ZUxheWVyTGlzdHNJZk5lZWRlZCgp OwpAQCAtNzY0LDcgKzc2NCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCByZW5kZXJCb3hY KCkgY29uc3QgeyByZXR1cm4gcmVuZGVyQm94TG9jYXRpb24oKS54KCk7IH0KICAgICBMYXlvdXRV bml0IHJlbmRlckJveFkoKSBjb25zdCB7IHJldHVybiByZW5kZXJCb3hMb2NhdGlvbigpLnkoKTsg fQogCi0gICAgdm9pZCBjb2xsZWN0TGF5ZXJzKGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycywgVmVj dG9yPFJlbmRlckxheWVyKj4qJiwgVmVjdG9yPFJlbmRlckxheWVyKj4qJik7CisgICAgdm9pZCBj b2xsZWN0TGF5ZXJzKGJvb2wgaW5jbHVkZUhpZGRlbkxheWVycywgT3duUHRyPFZlY3RvcjxSZW5k ZXJMYXllcio+ID4mLCBPd25QdHI8VmVjdG9yPFJlbmRlckxheWVyKj4gPiYpOwogCiAgICAgdm9p ZCB1cGRhdGVDb21wb3NpdGluZ0FuZExheWVyTGlzdHNJZk5lZWRlZCgpOwogCkBAIC0xMDM4LDE4 ICsxMDM4LDE4IEBAIHByb3RlY3RlZDoKICAgICAvLyBkZXNjZW5kYW50IGxheWVycyB3aXRoaW4g dGhlIHN0YWNraW5nIGNvbnRleHQgdGhhdCBoYXZlIHotaW5kaWNlcyBvZiAwIG9yIGdyZWF0ZXIK ICAgICAvLyAoYXV0byB3aWxsIGNvdW50IGFzIDApLiAgbV9uZWdaT3JkZXJMaXN0IGhvbGRzIGRl c2NlbmRhbnRzIHdpdGhpbiBvdXIgc3RhY2tpbmcgY29udGV4dCB3aXRoIG5lZ2F0aXZlCiAgICAg Ly8gei1pbmRpY2VzLgotICAgIFZlY3RvcjxSZW5kZXJMYXllcio+KiBtX3Bvc1pPcmRlckxpc3Q7 Ci0gICAgVmVjdG9yPFJlbmRlckxheWVyKj4qIG1fbmVnWk9yZGVyTGlzdDsKKyAgICBPd25QdHI8 VmVjdG9yPFJlbmRlckxheWVyKj4gPiBtX3Bvc1pPcmRlckxpc3Q7CisgICAgT3duUHRyPFZlY3Rv cjxSZW5kZXJMYXllcio+ID4gbV9uZWdaT3JkZXJMaXN0OwogCiAgICAgLy8gVGhpcyBsaXN0IGNv bnRhaW5zIGNoaWxkIGxheWVycyB0aGF0IGNhbm5vdCBjcmVhdGUgc3RhY2tpbmcgY29udGV4dHMu ICBGb3Igbm93IGl0IGlzIGp1c3QKICAgICAvLyBvdmVyZmxvdyBsYXllcnMsIGJ1dCB0aGF0IG1h eSBjaGFuZ2UgaW4gdGhlIGZ1dHVyZS4KLSAgICBWZWN0b3I8UmVuZGVyTGF5ZXIqPiogbV9ub3Jt YWxGbG93TGlzdDsKKyAgICBPd25QdHI8VmVjdG9yPFJlbmRlckxheWVyKj4gPiBtX25vcm1hbEZs b3dMaXN0OwogCiAgICAgT3duUHRyPENsaXBSZWN0c0NhY2hlPiBtX2NsaXBSZWN0c0NhY2hlOwog ICAgIAogICAgIEludFBvaW50IG1fY2FjaGVkT3ZlcmxheVNjcm9sbGJhck9mZnNldDsKIAotICAg IFJlbmRlck1hcnF1ZWUqIG1fbWFycXVlZTsgLy8gVXNlZCBieSBsYXllcnMgd2l0aCBvdmVyZmxv dzptYXJxdWVlCisgICAgT3duUHRyPFJlbmRlck1hcnF1ZWU+IG1fbWFycXVlZTsgLy8gVXNlZCBi eSBsYXllcnMgd2l0aCBvdmVyZmxvdzptYXJxdWVlCiAgICAgCiAgICAgLy8gQ2FjaGVkIG5vcm1h bCBmbG93IHZhbHVlcyBmb3IgYWJzb2x1dGUgcG9zaXRpb25lZCBlbGVtZW50cyB3aXRoIHN0YXRp YyBsZWZ0L3RvcCB2YWx1ZXMuCiAgICAgTGF5b3V0VW5pdCBtX3N0YXRpY0lubGluZVBvc2l0aW9u OwpAQCAtMTA3NiwxNSArMTA3Niw4IEBAIGlubGluZSB2b2lkIFJlbmRlckxheWVyOjpjbGVhclpP cmRlckxpc3RzKCkKIHsKICAgICBBU1NFUlQoIWlzU3RhY2tpbmdDb250ZXh0KCkpOwogCi0gICAg aWYgKG1fcG9zWk9yZGVyTGlzdCkgewotICAgICAgICBkZWxldGUgbV9wb3NaT3JkZXJMaXN0Owot ICAgICAgICBtX3Bvc1pPcmRlckxpc3QgPSAwOwotICAgIH0KLQotICAgIGlmIChtX25lZ1pPcmRl ckxpc3QpIHsKLSAgICAgICAgZGVsZXRlIG1fbmVnWk9yZGVyTGlzdDsKLSAgICAgICAgbV9uZWda T3JkZXJMaXN0ID0gMDsKLSAgICB9CisgICAgbV9wb3NaT3JkZXJMaXN0LmNsZWFyKCk7CisgICAg bV9uZWdaT3JkZXJMaXN0LmNsZWFyKCk7CiB9CiAKIGlubGluZSB2b2lkIFJlbmRlckxheWVyOjp1 cGRhdGVaT3JkZXJMaXN0cygpCg==