102896 2012-11-21 00:54:56 -0800 Coordinated Graphics: refactor changing children code in CoordinatedGraphicsLayer. 2012-11-21 15:22:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dongseong.hwang dongseong.hwang noam webkit.review.bot zeno oldest_to_newest 772573 0 dongseong.hwang 2012-11-21 00:54:56 -0800 When changing children, we don't need to sync a layer state. We were confused that we have to send a parent layer id to UI Process, but r133605 clarified passing the parent id is not necessary. So this patch removes didChangeLayerState() in methods which change children. In addition, purgeBackingStores() does not need to call didChangeChildren() because purgeBackingStores() does not change children. r133605 is Bug 101142. 772576 1 175366 dongseong.hwang 2012-11-21 00:58:10 -0800 Created attachment 175366 Patch 772577 2 dongseong.hwang 2012-11-21 00:58:35 -0800 It is a follow-up patch to Bug 101142. 772924 3 175366 noam 2012-11-21 07:02:31 -0800 Comment on attachment 175366 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175366&action=review > Source/WebKit2/ChangeLog:14 > + When changing children, we don't need to sync a layer state. We were confused > + that we have to send a parent layer id to UI Process, but r133605 clarified > + passing the parent id is not necessary. So this patch removes > + didChangeLayerState() in methods which change children. > + > + In addition, purgeBackingStores() does not need to call didChangeChildren() > + because purgeBackingStores() does not change children. I wouldn't say we were confused, in the past behavior of GraphicsLayer we did have to send the parent. I would reword this to say "There is no more need to send the parent ID every time the layer tree hierarchy changes." 773284 4 175523 dongseong.hwang 2012-11-21 14:19:05 -0800 Created attachment 175523 Patch 773285 5 dongseong.hwang 2012-11-21 14:20:05 -0800 (In reply to comment #3) > I wouldn't say we were confused, in the past behavior of GraphicsLayer we did have to send the parent. > I would reword this to say "There is no more need to send the parent ID every time the layer tree hierarchy changes." Thank you for review. Changelog can be more refined! 773345 6 175523 webkit.review.bot 2012-11-21 15:22:22 -0800 Comment on attachment 175523 Patch Clearing flags on attachment: 175523 Committed r135443: <http://trac.webkit.org/changeset/135443> 773346 7 webkit.review.bot 2012-11-21 15:22:26 -0800 All reviewed patches have been landed. Closing bug. 175366 2012-11-21 00:58:10 -0800 2012-11-21 14:19:02 -0800 Patch bug-102896-20121121175543.patch text/plain 4575 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2Y1NWEzYzNkMjQ0YzJi ZWIwZGM1MmQ3M2E0NGY3ODczMTlkMDU2Zi4uMWZlZGY4OTQ0MmZmYWFhNmYxYWFmMWE3YjEyNjUy MTk4MzMyNzE4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDEyLTExLTIxICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCisgICAgICAgIENvb3JkaW5h dGVkIEdyYXBoaWNzOiByZWZhY3RvciBjaGFuZ2luZyBjaGlsZHJlbiBjb2RlIGluIENvb3JkaW5h dGVkR3JhcGhpY3NMYXllci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMjg5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdoZW4gY2hhbmdpbmcgY2hpbGRyZW4sIHdlIGRvbid0IG5lZWQgdG8gc3luYyBh IGxheWVyIHN0YXRlLiBXZSB3ZXJlIGNvbmZ1c2VkCisgICAgICAgIHRoYXQgd2UgaGF2ZSB0byBz ZW5kIGEgcGFyZW50IGxheWVyIGlkIHRvIFVJIFByb2Nlc3MsIGJ1dCByMTMzNjA1IGNsYXJpZmll ZAorICAgICAgICBwYXNzaW5nIHRoZSBwYXJlbnQgaWQgaXMgbm90IG5lY2Vzc2FyeS4gU28gdGhp cyBwYXRjaCByZW1vdmVzCisgICAgICAgIGRpZENoYW5nZUxheWVyU3RhdGUoKSBpbiBtZXRob2Rz IHdoaWNoIGNoYW5nZSBjaGlsZHJlbi4KKworICAgICAgICBJbiBhZGRpdGlvbiwgcHVyZ2VCYWNr aW5nU3RvcmVzKCkgZG9lcyBub3QgbmVlZCB0byBjYWxsIGRpZENoYW5nZUNoaWxkcmVuKCkKKyAg ICAgICAgYmVjYXVzZSBwdXJnZUJhY2tpbmdTdG9yZXMoKSBkb2VzIG5vdCBjaGFuZ2UgY2hpbGRy ZW4uCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9D b29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyOjpzZXRDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5h dGVkR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRBdEluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkNv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRBYm92ZSk6CisgICAgICAgIChXZWJDb3Jl OjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkQmVsb3cpOgorICAgICAgICAoV2Vi Q29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZXBsYWNlQ2hpbGQpOgorICAgICAgICAo V2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZW1vdmVGcm9tUGFyZW50KToKKyAg ICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cHVyZ2VCYWNraW5nU3Rv cmVzKToKKworMjAxMi0xMS0yMSAgSHVhbmcgRG9uZ3N1bmcgIDxsdXh0ZWxsYUBjb21wYW55MTAw Lm5ldD4KKwogICAgICAgICBDb29yZGluYXRlZCBHcmFwaGljczogUmVtb3ZlIGFuIGludmlzaWJs ZSBUaWxlZEJhY2tpbmdTdG9yZSBvZiBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI4OTQKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhp Y3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5j cHAKaW5kZXggYjU2YjFhYmRmOTI3YmFmNmE5MWJhMWJjZDAyMTgyMGU5NzE5M2Y1My4uZTU2Mzlj Zjc5OTJkNGEyYjA2ODg2MTYxM2Q4Yjg3Yjg5ODFmZmM5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv Q29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC0xNDYs MTAgKzE0Niw2IEBAIGJvb2wgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzZXRDaGlsZHJlbihj b25zdCBWZWN0b3I8R3JhcGhpY3NMYXllcio+JiBjaGlsZHJlCiAgICAgYm9vbCBvayA9IEdyYXBo aWNzTGF5ZXI6OnNldENoaWxkcmVuKGNoaWxkcmVuKTsKICAgICBpZiAoIW9rKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGNoaWxkcmVuLnNpemUo KTsgKytpKSB7Ci0gICAgICAgIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciogY2hpbGQgPSB0b0Nv b3JkaW5hdGVkR3JhcGhpY3NMYXllcihjaGlsZHJlbltpXSk7Ci0gICAgICAgIGNoaWxkLT5kaWRD aGFuZ2VMYXllclN0YXRlKCk7Ci0gICAgfQogICAgIGRpZENoYW5nZUNoaWxkcmVuKCk7CiAgICAg cmV0dXJuIHRydWU7CiB9CkBAIC0xNTcsMjggKzE1MywyNCBAQCBib29sIENvb3JkaW5hdGVkR3Jh cGhpY3NMYXllcjo6c2V0Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYgY2hp bGRyZQogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkKEdyYXBoaWNzTGF5 ZXIqIGxheWVyKQogewogICAgIEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkKGxheWVyKTsKLSAgICB0 b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihsYXllciktPmRpZENoYW5nZUxheWVyU3RhdGUoKTsK ICAgICBkaWRDaGFuZ2VDaGlsZHJlbigpOwogfQogCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NM YXllcjo6YWRkQ2hpbGRBdEluZGV4KEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBpbnQgaW5kZXgpCiB7 CiAgICAgR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRBdEluZGV4KGxheWVyLCBpbmRleCk7Ci0gICAg dG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobGF5ZXIpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7 CiAgICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz TGF5ZXI6OmFkZENoaWxkQWJvdmUoR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIq IHNpYmxpbmcpCiB7CiAgICAgR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRBYm92ZShsYXllciwgc2li bGluZyk7Ci0gICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobGF5ZXIpLT5kaWRDaGFuZ2VM YXllclN0YXRlKCk7CiAgICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkQmVsb3coR3JhcGhpY3NMYXllciogbGF5ZXIsIEdy YXBoaWNzTGF5ZXIqIHNpYmxpbmcpCiB7CiAgICAgR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRCZWxv dyhsYXllciwgc2libGluZyk7Ci0gICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobGF5ZXIp LT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7CiAgICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIApA QCAtMTg4LDggKzE4MCw2IEBAIGJvb2wgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZXBsYWNl Q2hpbGQoR3JhcGhpY3NMYXllciogb2xkQ2hpbGQsIEdyYXBoaWNzTGF5CiAgICAgaWYgKCFvaykK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGRpZENoYW5nZUNoaWxkcmVuKCk7Ci0gICAgdG9D b29yZGluYXRlZEdyYXBoaWNzTGF5ZXIob2xkQ2hpbGQpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7 Ci0gICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobmV3Q2hpbGQpLT5kaWRDaGFuZ2VMYXll clN0YXRlKCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE5OCw4ICsxODgsNiBAQCB2b2lk IENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cmVtb3ZlRnJvbVBhcmVudCgpCiAgICAgaWYgKENv b3JkaW5hdGVkR3JhcGhpY3NMYXllciogcGFyZW50TGF5ZXIgPSB0b0Nvb3JkaW5hdGVkR3JhcGhp Y3NMYXllcihwYXJlbnQoKSkpCiAgICAgICAgIHBhcmVudExheWVyLT5kaWRDaGFuZ2VDaGlsZHJl bigpOwogICAgIEdyYXBoaWNzTGF5ZXI6OnJlbW92ZUZyb21QYXJlbnQoKTsKLQotICAgIGRpZENo YW5nZUxheWVyU3RhdGUoKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNl dFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHApCkBAIC03ODksNyArNzc3LDYgQEAgdm9pZCBD b29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnB1cmdlQmFja2luZ1N0b3JlcygpCiAgICAgcmVsZWFz ZUltYWdlQmFja2luZ0lmTmVlZGVkKCk7CiAKICAgICBkaWRDaGFuZ2VMYXllclN0YXRlKCk7Ci0g ICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5 ZXI6OnNldENvb3JkaW5hdG9yKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyQ2xpZW50 KiBjb29yZGluYXRvcikK 175523 2012-11-21 14:19:05 -0800 2012-11-21 15:22:21 -0800 Patch bug-102896-20121122071650.patch text/plain 4449 dongseong.hwang U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGFhNmZjYzU1ODExZjRh OTgxYTk3MmUzNWNiODZkNzhhNGExZjc2Yi4uYjAxNGJhM2ZlMzc4YmVhZTc0NDZmZmFiMDU5ZGFi MjEzZjhhYTUxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTIxICBIdWFu ZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCisgICAgICAgIENvb3JkaW5h dGVkIEdyYXBoaWNzOiByZWZhY3RvciBjaGFuZ2luZyBjaGlsZHJlbiBjb2RlIGluIENvb3JkaW5h dGVkR3JhcGhpY3NMYXllci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwMjg5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5vYW0gUm9zZW50aGFsLgor CisgICAgICAgIFdoZW4gY2hhbmdpbmcgY2hpbGRyZW4sIHdlIGRvbid0IG5lZWQgdG8gc3luYyBh IGxheWVyIHN0YXRlIGJlY2F1c2UKKyAgICAgICAgdGhlcmUgaXMgbm8gbW9yZSBuZWVkIHRvIHNl bmQgdGhlIHBhcmVudCBJRCBldmVyeSB0aW1lIHRoZSBsYXllciB0cmVlCisgICAgICAgIGhpZXJh cmNoeSBjaGFuZ2VzLiBTbyB0aGlzIHBhdGNoIHJlbW92ZXMgZGlkQ2hhbmdlTGF5ZXJTdGF0ZSgp IGluCisgICAgICAgIG1ldGhvZHMgd2hpY2ggY2hhbmdlIGNoaWxkcmVuLgorCisgICAgICAgIElu IGFkZGl0aW9uLCBwdXJnZUJhY2tpbmdTdG9yZXMoKSBkb2VzIG5vdCBuZWVkIHRvIGNhbGwgZGlk Q2hhbmdlQ2hpbGRyZW4oKQorICAgICAgICBiZWNhdXNlIHB1cmdlQmFja2luZ1N0b3JlcygpIGRv ZXMgbm90IGNoYW5nZSBjaGlsZHJlbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9D b29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuKToKKyAgICAg ICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGQpOgorICAgICAg ICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjphZGRDaGlsZEF0SW5kZXgpOgor ICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjphZGRDaGlsZEFib3Zl KToKKyAgICAgICAgKFdlYkNvcmU6OkNvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRC ZWxvdyk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlcGxh Y2VDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJl bW92ZUZyb21QYXJlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFwaGljc0xh eWVyOjpwdXJnZUJhY2tpbmdTdG9yZXMpOgorCiAyMDEyLTExLTIxICBBbGxhbiBTYW5kZmVsZCBK ZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCiAgICAgICAgIERpc2FtYmlndWF0ZSBp bm5lck5vZGVGcmFtZVBvaW50IGFuZCBtYWluRnJhbWVQb2ludApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9D b29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKaW5kZXggZWM5 NDNlOWNlN2QzZWJlOTcyZjcxMmJhMzhlZGYxYzEyOGJlOTY2ZC4uMTg0YjEyMWY2MzIzMTM3MmY2 N2YwMDNjZjA5NmExMDgwZGQzZDcxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRH cmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwCkBAIC0xNDYsMTAgKzE0Niw2IEBA IGJvb2wgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpzZXRDaGlsZHJlbihjb25zdCBWZWN0b3I8 R3JhcGhpY3NMYXllcio+JiBjaGlsZHJlCiAgICAgYm9vbCBvayA9IEdyYXBoaWNzTGF5ZXI6OnNl dENoaWxkcmVuKGNoaWxkcmVuKTsKICAgICBpZiAoIW9rKQogICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGNoaWxkcmVuLnNpemUoKTsgKytpKSB7Ci0g ICAgICAgIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllciogY2hpbGQgPSB0b0Nvb3JkaW5hdGVkR3Jh cGhpY3NMYXllcihjaGlsZHJlbltpXSk7Ci0gICAgICAgIGNoaWxkLT5kaWRDaGFuZ2VMYXllclN0 YXRlKCk7Ci0gICAgfQogICAgIGRpZENoYW5nZUNoaWxkcmVuKCk7CiAgICAgcmV0dXJuIHRydWU7 CiB9CkBAIC0xNTcsMjggKzE1MywyNCBAQCBib29sIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 c2V0Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYgY2hpbGRyZQogdm9pZCBD b29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkKEdyYXBoaWNzTGF5ZXIqIGxheWVyKQog ewogICAgIEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkKGxheWVyKTsKLSAgICB0b0Nvb3JkaW5hdGVk R3JhcGhpY3NMYXllcihsYXllciktPmRpZENoYW5nZUxheWVyU3RhdGUoKTsKICAgICBkaWRDaGFu Z2VDaGlsZHJlbigpOwogfQogCiB2b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRkQ2hp bGRBdEluZGV4KEdyYXBoaWNzTGF5ZXIqIGxheWVyLCBpbnQgaW5kZXgpCiB7CiAgICAgR3JhcGhp Y3NMYXllcjo6YWRkQ2hpbGRBdEluZGV4KGxheWVyLCBpbmRleCk7Ci0gICAgdG9Db29yZGluYXRl ZEdyYXBoaWNzTGF5ZXIobGF5ZXIpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7CiAgICAgZGlkQ2hh bmdlQ2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OmFkZENo aWxkQWJvdmUoR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIqIHNpYmxpbmcpCiB7 CiAgICAgR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRBYm92ZShsYXllciwgc2libGluZyk7Ci0gICAg dG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobGF5ZXIpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7 CiAgICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNz TGF5ZXI6OmFkZENoaWxkQmVsb3coR3JhcGhpY3NMYXllciogbGF5ZXIsIEdyYXBoaWNzTGF5ZXIq IHNpYmxpbmcpCiB7CiAgICAgR3JhcGhpY3NMYXllcjo6YWRkQ2hpbGRCZWxvdyhsYXllciwgc2li bGluZyk7Ci0gICAgdG9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIobGF5ZXIpLT5kaWRDaGFuZ2VM YXllclN0YXRlKCk7CiAgICAgZGlkQ2hhbmdlQ2hpbGRyZW4oKTsKIH0KIApAQCAtMTg4LDggKzE4 MCw2IEBAIGJvb2wgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpyZXBsYWNlQ2hpbGQoR3JhcGhp Y3NMYXllciogb2xkQ2hpbGQsIEdyYXBoaWNzTGF5CiAgICAgaWYgKCFvaykKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGRpZENoYW5nZUNoaWxkcmVuKCk7Ci0gICAgdG9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIob2xkQ2hpbGQpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7Ci0gICAgdG9Db29y ZGluYXRlZEdyYXBoaWNzTGF5ZXIobmV3Q2hpbGQpLT5kaWRDaGFuZ2VMYXllclN0YXRlKCk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE5OCw4ICsxODgsNiBAQCB2b2lkIENvb3JkaW5hdGVk R3JhcGhpY3NMYXllcjo6cmVtb3ZlRnJvbVBhcmVudCgpCiAgICAgaWYgKENvb3JkaW5hdGVkR3Jh cGhpY3NMYXllciogcGFyZW50TGF5ZXIgPSB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihwYXJl bnQoKSkpCiAgICAgICAgIHBhcmVudExheWVyLT5kaWRDaGFuZ2VDaGlsZHJlbigpOwogICAgIEdy YXBoaWNzTGF5ZXI6OnJlbW92ZUZyb21QYXJlbnQoKTsKLQotICAgIGRpZENoYW5nZUxheWVyU3Rh dGUoKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldFBvc2l0aW9uKGNv bnN0IEZsb2F0UG9pbnQmIHApCkBAIC03NzQsNyArNzYyLDYgQEAgdm9pZCBDb29yZGluYXRlZEdy YXBoaWNzTGF5ZXI6OnB1cmdlQmFja2luZ1N0b3JlcygpCiAgICAgcmVsZWFzZUltYWdlQmFja2lu Z0lmTmVlZGVkKCk7CiAKICAgICBkaWRDaGFuZ2VMYXllclN0YXRlKCk7Ci0gICAgZGlkQ2hhbmdl Q2hpbGRyZW4oKTsKIH0KIAogdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnNldENvb3Jk aW5hdG9yKFdlYktpdDo6Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyQ2xpZW50KiBjb29yZGluYXRv cikK