102026 2012-11-12 17:59:08 -0800 Include child layers in the remote layer tree transaction 2012-11-12 18:10:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 765056 0 andersca 2012-11-12 17:59:08 -0800 Include child layers in the remote layer tree transaction 765066 1 173778 andersca 2012-11-12 18:03:49 -0800 Created attachment 173778 Patch 765070 2 webkit.review.bot 2012-11-12 18:06:20 -0800 Attachment 173778 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h:51: The parameter name "layer" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/WebProcess/WebPage/mac/RemoteGraphicsLayer.h:52: The parameter name "layer" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 765074 3 173778 kling 2012-11-12 18:09:12 -0800 Comment on attachment 173778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=173778&action=review > Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm:116 > + layerProperties.children.append(childLayer->layerID()); You could prematurely micro-optimize with uncheckedAppend() here! 765080 4 andersca 2012-11-12 18:10:42 -0800 Committed r134336: <http://trac.webkit.org/changeset/134336> 173778 2012-11-12 18:03:49 -0800 2012-11-12 18:09:06 -0800 Patch bug-102026-20121112180155.patch text/plain 8844 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0MzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmMzOTE1N2FjODI3MDEy NWIxNWRmMWVmZjZmYjNhZGY4ZDYyOWNmZC4uYmVhNmU4MGQ5MjdiOTk1MjNlYzc3YmIzODg4NjYw OGUxMDI5NzlhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEyLTExLTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgSW5jbHVkZSBjaGls ZCBsYXllcnMgaW4gdGhlIHJlbW90ZSBsYXllciB0cmVlIHRyYW5zYWN0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIwMjYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9tYWMvUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb24uaDoKKyAgICAgICAgKiBTaGFyZWQvbWFjL1JlbW90ZUxheWVy VHJlZVRyYW5zYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFu c2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQcm9wZXJ0aWVzOjpkZWNvZGUpOgorICAgICAg ICBFbmNvZGUgYW5kIGRlY29kZSBjaGlsZCBsYXllciBJRHMuCisKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmxheWVyUHJvcGVydGllc0NoYW5nZWQpOgorICAg ICAgICBHcmFiIGFsbCBjaGlsZCBsYXllciBJRHMgYW5kIHN0aWNrIHRoZW0gaW4gYSB2ZWN0b3Iu CisKKyAgICAgICAgKFdlYktpdDo6ZHVtcENoYW5nZWRMYXllcnMpOgorICAgICAgICBEdW1wIGNo aWxkIGxheWVyIElEcyBhcyB3ZWxsLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9SZW1vdGVHcmFwaGljc0xheWVyLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9SZW1vdGVHcmFwaGljc0xheWVyLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVHcmFwaGlj c0xheWVyOjpzZXRDaGlsZHJlbik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUdyYXBoaWNzTGF5 ZXI6OmFkZENoaWxkKToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlR3JhcGhpY3NMYXllcjo6YWRk Q2hpbGRBdEluZGV4KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlR3JhcGhpY3NMYXllcjo6YWRk Q2hpbGRBYm92ZSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZUdyYXBoaWNzTGF5ZXI6OmFkZENo aWxkQmVsb3cpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVHcmFwaGljc0xheWVyOjpyZXBsYWNl Q2hpbGQpOgorICAgICAgICBDYWxsIG5vdGVTdWJsYXllcnNDaGFuZ2VkLgorCisgICAgICAgIChX ZWJLaXQ6OlJlbW90ZUdyYXBoaWNzTGF5ZXI6Om5vdGVTdWJsYXllcnNDaGFuZ2VkKToKKyAgICAg ICAgTm90ZSB0aGF0IHRoZSBDaGlsZHJlbiBwcm9wZXJ0eSBjaGFuZ2VkLgorCisyMDEyLTExLTEy ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgU2VuZCBh bG9uZyB0aGUgY3VycmVudCByZW1vdGUgbGF5ZXIgdHJlZSB0cmFuc2FjdGlvbiB3aXRoIHRoZSBj b21taXQgbWVzc2FnZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTAyMDE0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaAppbmRleCBmNTY3NDY2NTdlN2M3YmY2NTU4ZDE4Yzky YzBiNzc4NzUwOTI3NmFjLi5lM2JjODVmNzQ2Y2U3NzY1MDY0NjE1NGUxZWJhNzA2N2Y2ZDljNDI3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1JlbW90ZUxheWVyVHJlZVRy YW5zYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbi5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAgICBlbnVtIExheWVy Q2hhbmdlIHsKICAgICAgICAgTm9DaGFuZ2UgPSAwLAogICAgICAgICBOYW1lQ2hhbmdlZCA9IDEg PDwgMSwKKyAgICAgICAgQ2hpbGRyZW5DaGFuZ2VkID0gMSA8PCAyLAogICAgIH07CiAKICAgICBz dHJ1Y3QgTGF5ZXJQcm9wZXJ0aWVzIHsKQEAgLTU0LDYgKzU1LDcgQEAgcHVibGljOgogICAgICAg ICB1bnNpZ25lZCBjaGFuZ2VkUHJvcGVydGllczsKIAogICAgICAgICBTdHJpbmcgbmFtZTsKKyAg ICAgICAgVmVjdG9yPHVpbnQ2NF90PiBjaGlsZHJlbjsKICAgICB9OwogCiAgICAgUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9t YWMvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv bWFjL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IGJkMjBmMjk1NjAwNWYyYzFj OWMxMWQ3YmIxODAzZGQyYzdmYjc5NWYuLmM4N2Q2ZGQzOGMzMmNmNTRjNjg0Y2YxZTE2ZTRiZmY1 ODY2N2FlMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvUmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9SZW1v dGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQpAQCAtMzMsNiArMzMsOCBAQAogI2luY2x1ZGUgPHd0 Zi90ZXh0L0NTdHJpbmcuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAK K3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOworCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAogUmVtb3Rl TGF5ZXJUcmVlVHJhbnNhY3Rpb246OkxheWVyUHJvcGVydGllczo6TGF5ZXJQcm9wZXJ0aWVzKCkK QEAgLTQ2LDYgKzQ4LDkgQEAgdm9pZCBSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbjo6TGF5ZXJQ cm9wZXJ0aWVzOjplbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGUKIAogICAgIGlmIChjaGFu Z2VkUHJvcGVydGllcyAmIE5hbWVDaGFuZ2VkKQogICAgICAgICBlbmNvZGVyIDw8IG5hbWU7CisK KyAgICBpZiAoY2hhbmdlZFByb3BlcnRpZXMgJiBDaGlsZHJlbkNoYW5nZWQpCisgICAgICAgIGVu Y29kZXIgPDwgY2hpbGRyZW47CiB9CiAKIGJvb2wgUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246 OkxheWVyUHJvcGVydGllczo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2Rl ciwgTGF5ZXJQcm9wZXJ0aWVzJiByZXN1bHQpCkBAIC01OCw2ICs2MywxNiBAQCBib29sIFJlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpMYXllclByb3BlcnRpZXM6OmRlY29kZShDb3JlSVBDOjpB cmd1bWVudERlY29kZQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGlm IChyZXN1bHQuY2hhbmdlZFByb3BlcnRpZXMgJiBDaGlsZHJlbkNoYW5nZWQpIHsKKyAgICAgICAg aWYgKCFkZWNvZGVyLT5kZWNvZGUocmVzdWx0LmNoaWxkcmVuKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKworICAgICAgICBmb3IgKGF1dG8gbGF5ZXJJRDogcmVzdWx0LmNoaWxkcmVuKSB7 CisgICAgICAgICAgICBpZiAoIWxheWVySUQpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CisgICAgfQorCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTkwLDYgKzEw NSwxNyBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpsYXllclByb3BlcnRpZXND aGFuZ2VkKGNvbnN0IFJlbW90ZUdyYXBoaWNzTGF5ZQogCiAgICAgaWYgKGNoYW5nZWRQcm9wZXJ0 aWVzICYgTmFtZUNoYW5nZWQpCiAgICAgICAgIGxheWVyUHJvcGVydGllcy5uYW1lID0gZ3JhcGhp Y3NMYXllci0+bmFtZSgpOworCisgICAgaWYgKGNoYW5nZWRQcm9wZXJ0aWVzICYgQ2hpbGRyZW5D aGFuZ2VkKSB7CisgICAgICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4mIGNoaWxkcmVu ID0gZ3JhcGhpY3NMYXllci0+Y2hpbGRyZW4oKTsKKworICAgICAgICBBU1NFUlQobGF5ZXJQcm9w ZXJ0aWVzLmNoaWxkcmVuLmlzRW1wdHkoKSk7CisgICAgICAgIGxheWVyUHJvcGVydGllcy5jaGls ZHJlbi5yZXNlcnZlQ2FwYWNpdHkoY2hpbGRyZW4uc2l6ZSgpKTsKKyAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBjaGlsZHJlbi5zaXplKCk7ICsraSkgeworICAgICAgICAgICAgUmVtb3Rl R3JhcGhpY3NMYXllciogY2hpbGRMYXllciA9IHN0YXRpY19jYXN0PFJlbW90ZUdyYXBoaWNzTGF5 ZXIqPihjaGlsZHJlbltpXSk7CisgICAgICAgICAgICBsYXllclByb3BlcnRpZXMuY2hpbGRyZW4u YXBwZW5kKGNoaWxkTGF5ZXItPmxheWVySUQoKSk7CisgICAgICAgIH0KKyAgICB9CiB9CiAKICNp Zm5kZWYgTkRFQlVHCkBAIC0xMjgsNiArMTU0LDE5IEBAIHN0YXRpYyB2b2lkIGR1bXBDaGFuZ2Vk TGF5ZXJzKFN0cmluZ0J1aWxkZXImIGJ1aWxkZXIsIGNvbnN0IEhhc2hNYXA8dWludDY0X3QsIFJl CiAgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgiXCIpIik7CiAgICAgICAgIH0KIAorICAgICAg ICBpZiAobGF5ZXJQcm9wZXJ0aWVzLmNoYW5nZWRQcm9wZXJ0aWVzICYgUmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb246OkNoaWxkcmVuQ2hhbmdlZCkgeworICAgICAgICAgICAgYnVpbGRlci5hcHBl bmQoJ1xuJyk7CisgICAgICAgICAgICB3cml0ZUluZGVudChidWlsZGVyLCAzKTsKKyAgICAgICAg ICAgIGJ1aWxkZXIuYXBwZW5kKCIoY2hpbGRyZW4gKCIpOworICAgICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBsYXllclByb3BlcnRpZXMuY2hpbGRyZW4uc2l6ZSgpOyArK2kpIHsKKyAg ICAgICAgICAgICAgICBpZiAoaSAhPSAwKQorICAgICAgICAgICAgICAgICAgICBidWlsZGVyLmFw cGVuZCgnICcpOworICAgICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTnVtYmVyKGxheWVyUHJv cGVydGllcy5jaGlsZHJlbltpXSk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGJ1aWxk ZXIuYXBwZW5kKCIpIik7CisgICAgICAgIH0KKwogICAgICAgICBidWlsZGVyLmFwcGVuZCgiKVxu Iik7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9SZW1vdGVHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1JlbW90ZUdyYXBoaWNzTGF5ZXIuaAppbmRleCAwNGI1YjFiMjFmZDg2NDE3 NjM4OTAwZTIwZjAxZjJlMmY2OWUxOWRkLi4zNTQ0ZWE2NGU5NWVlZThlYzAzZDJhYmIxYzgyMGE4 N2FmNGFkZjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1JlbW90ZUdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvbWFjL1JlbW90ZUdyYXBoaWNzTGF5ZXIuaApAQCAtNDQsMTIgKzQ0LDIyIEBAIHBy aXZhdGU6CiAKICAgICAvLyBXZWJDb3JlOjpHcmFwaGljc0xheWVyCiAgICAgdmlydHVhbCB2b2lk IHNldE5hbWUoY29uc3QgU3RyaW5nJikgT1ZFUlJJREU7CisKKyAgICB2aXJ0dWFsIGJvb2wgc2V0 Q2hpbGRyZW4oY29uc3QgVmVjdG9yPFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqPiYpOworICAgIHZp cnR1YWwgdm9pZCBhZGRDaGlsZChXZWJDb3JlOjpHcmFwaGljc0xheWVyKik7CisgICAgdmlydHVh bCB2b2lkIGFkZENoaWxkQXRJbmRleChXZWJDb3JlOjpHcmFwaGljc0xheWVyKiwgaW50IGluZGV4 KTsKKyAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRBYm92ZShXZWJDb3JlOjpHcmFwaGljc0xheWVy KiBsYXllciwgV2ViQ29yZTo6R3JhcGhpY3NMYXllciogc2libGluZyk7CisgICAgdmlydHVhbCB2 b2lkIGFkZENoaWxkQmVsb3coV2ViQ29yZTo6R3JhcGhpY3NMYXllciogbGF5ZXIsIFdlYkNvcmU6 OkdyYXBoaWNzTGF5ZXIqIHNpYmxpbmcpOworICAgIHZpcnR1YWwgYm9vbCByZXBsYWNlQ2hpbGQo V2ViQ29yZTo6R3JhcGhpY3NMYXllciogb2xkQ2hpbGQsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIq IG5ld0NoaWxkKTsKKwogICAgIHZpcnR1YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXkoKSBPVkVSUklE RTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5SW5SZWN0KGNvbnN0IFdlYkNvcmU6 OkZsb2F0UmVjdCYpIE9WRVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBmbHVzaENvbXBvc2l0aW5n U3RhdGUoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKSBPVkVSUklERTsKIAog ICAgIHZvaWQgbm90ZUxheWVyUHJvcGVydGllc0NoYW5nZWQodW5zaWduZWQgbGF5ZXJDaGFuZ2Vz KTsKKyAgICB2b2lkIG5vdGVTdWJsYXllcnNDaGFuZ2VkKCk7CisKICAgICB2b2lkIHJlY3Vyc2l2 ZUNvbW1pdENoYW5nZXMoKTsKIAogICAgIHVpbnQ2NF90IG1fbGF5ZXJJRDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlR3JhcGhpY3NMYXll ci5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlR3JhcGhp Y3NMYXllci5tbQppbmRleCAwMzNkODMyMGZkNzZhMDNmNjcwNzkwOGNjN2JiOGZkMDc1OTFmYjNm Li5iYjcwN2M5ODU0OTk1ZTEyOGEzYzczNjg5NjhhOTg5YjAwNTZjZjdmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUdyYXBoaWNzTGF5ZXIu bW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9SZW1vdGVHcmFw aGljc0xheWVyLm1tCkBAIC02Niw2ICs2Niw1MCBAQCB2b2lkIFJlbW90ZUdyYXBoaWNzTGF5ZXI6 OnNldE5hbWUoY29uc3QgU3RyaW5nJiBuYW1lKQogICAgIG5vdGVMYXllclByb3BlcnRpZXNDaGFu Z2VkKFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjpOYW1lQ2hhbmdlZCk7CiB9CiAKK2Jvb2wg UmVtb3RlR3JhcGhpY3NMYXllcjo6c2V0Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5 ZXIqPiYgY2hpbGRyZW4pCit7CisgICAgaWYgKEdyYXBoaWNzTGF5ZXI6OnNldENoaWxkcmVuKGNo aWxkcmVuKSkgeworICAgICAgICBub3RlU3VibGF5ZXJzQ2hhbmdlZCgpOworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK3ZvaWQgUmVtb3RlR3Jh cGhpY3NMYXllcjo6YWRkQ2hpbGQoR3JhcGhpY3NMYXllciogY2hpbGRMYXllcikKK3sKKyAgICBH cmFwaGljc0xheWVyOjphZGRDaGlsZChjaGlsZExheWVyKTsKKyAgICBub3RlU3VibGF5ZXJzQ2hh bmdlZCgpOworfQorCit2b2lkIFJlbW90ZUdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkQXRJbmRleChH cmFwaGljc0xheWVyKiBjaGlsZExheWVyLCBpbnQgaW5kZXgpCit7CisgICAgR3JhcGhpY3NMYXll cjo6YWRkQ2hpbGRBdEluZGV4KGNoaWxkTGF5ZXIsIGluZGV4KTsKKyAgICBub3RlU3VibGF5ZXJz Q2hhbmdlZCgpOworfQorCit2b2lkIFJlbW90ZUdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkQWJvdmUo R3JhcGhpY3NMYXllciogY2hpbGRMYXllciwgR3JhcGhpY3NMYXllciogc2libGluZykKK3sKKyAg ICBHcmFwaGljc0xheWVyOjphZGRDaGlsZEFib3ZlKGNoaWxkTGF5ZXIsIHNpYmxpbmcpOworICAg IG5vdGVTdWJsYXllcnNDaGFuZ2VkKCk7Cit9CisKK3ZvaWQgUmVtb3RlR3JhcGhpY3NMYXllcjo6 YWRkQ2hpbGRCZWxvdyhHcmFwaGljc0xheWVyKiBjaGlsZExheWVyLCBHcmFwaGljc0xheWVyKiBz aWJsaW5nKQoreworICAgIEdyYXBoaWNzTGF5ZXI6OmFkZENoaWxkQmVsb3coY2hpbGRMYXllciwg c2libGluZyk7CisgICAgbm90ZVN1YmxheWVyc0NoYW5nZWQoKTsKK30KKworYm9vbCBSZW1vdGVH cmFwaGljc0xheWVyOjpyZXBsYWNlQ2hpbGQoR3JhcGhpY3NMYXllciogb2xkQ2hpbGQsIEdyYXBo aWNzTGF5ZXIqIG5ld0NoaWxkKQoreworICAgIGlmIChHcmFwaGljc0xheWVyOjpyZXBsYWNlQ2hp bGQob2xkQ2hpbGQsIG5ld0NoaWxkKSkgeworICAgICAgICBub3RlU3VibGF5ZXJzQ2hhbmdlZCgp OworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICByZXR1cm4gZmFsc2U7Cit9CisK IHZvaWQgUmVtb3RlR3JhcGhpY3NMYXllcjo6c2V0TmVlZHNEaXNwbGF5KCkKIHsKICAgICBGbG9h dFJlY3QgaHVnZVJlY3QoLXN0ZDo6bnVtZXJpY19saW1pdHM8ZmxvYXQ+OjptYXgoKSAvIDIsIC1z dGQ6Om51bWVyaWNfbGltaXRzPGZsb2F0Pjo6bWF4KCkgLyAyLApAQCAtMTAwLDYgKzE0NCwxMyBA QCB2b2lkIFJlbW90ZUdyYXBoaWNzTGF5ZXI6Om5vdGVMYXllclByb3BlcnRpZXNDaGFuZ2VkKHVu c2lnbmVkIGxheWVyQ2hhbmdlcykKICAgICBtX3VuY29tbWl0dGVkTGF5ZXJDaGFuZ2VzIHw9IGxh eWVyQ2hhbmdlczsKIH0KIAordm9pZCBSZW1vdGVHcmFwaGljc0xheWVyOjpub3RlU3VibGF5ZXJz Q2hhbmdlZCgpCit7CisgICAgbm90ZUxheWVyUHJvcGVydGllc0NoYW5nZWQoUmVtb3RlTGF5ZXJU cmVlVHJhbnNhY3Rpb246OkNoaWxkcmVuQ2hhbmdlZCk7CisKKyAgICAvLyBGSVhNRTogSGFuZGxl IHJlcGxpY2EgbGF5ZXJzLgorfQorCiB2b2lkIFJlbW90ZUdyYXBoaWNzTGF5ZXI6OnJlY3Vyc2l2 ZUNvbW1pdENoYW5nZXMoKQogewogICAgIGZsdXNoQ29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXll ck9ubHkoKTsK