95520 2012-08-30 18:50:51 -0700 [chromium] Revert WebCompositorSupport to raw ptrs, make dtor protected 2012-08-30 20:30:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth cc-bugs dglazkov enne eric.carlson feature-media-reviews fishd tkent+wkapi webkit.review.bot oldest_to_newest 709234 0 jamesr 2012-08-30 18:50:51 -0700 [chromium] Revert WebCompositorSupport to raw ptrs, make dtor protected 709236 1 161603 jamesr 2012-08-30 18:52:08 -0700 Created attachment 161603 Patch 709237 2 jamesr 2012-08-30 18:53:26 -0700 Sadly the chromium side scoped_ptr<> -> WebPassOwnPtr<> conversion isn't working, at least on cr-linux clang. I'll try to investigate this when I get time but I need to make progress on WebCompositorSupport, so reverting to raw ptrs for now. 709240 3 webkit.review.bot 2012-08-30 18:55:06 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 709279 4 jamesr 2012-08-30 20:30:26 -0700 Committed r127225: <http://trac.webkit.org/changeset/127225> 161603 2012-08-30 18:52:08 -0700 2012-08-30 20:15:58 -0700 Patch bug-95520-20120830185156.patch text/plain 23361 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAxMjkzNDI1MWM0NTcy YzFmMTA3ZjI1ZGUwNGNlOTkwY2IzYmViMDU5Li43NDc4Y2RkZjgyMGI0MDZiODRiOGQyYzBhNDg3 NDg3OWVkZTZiODcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzNCBAQAogMjAxMi0wOC0zMCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFtjaHJvbWl1 bV0gUmV2ZXJ0IFdlYkNvbXBvc2l0b3JTdXBwb3J0IHRvIHJhdyBwdHJzLCBtYWtlIGR0b3IgcHJv dGVjdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTUyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YlBhc3NPd25QdHI8VD4gaXNuJ3QgcXVpdGUgdXNhYmxlIGZyb20gdGhlIGNocm9taXVtIHNpZGUg LSBpdCBuZWVkcyBzb21lIG1vcmUgd29yayBhbmQgaXNuJ3Qgd29ydGggYmxvY2tpbmcKKyAgICAg ICAgV2ViQ29tcG9zaXRvclN1cHBvcnQgZm9yLiBBbHNvLCB0aGUgZCd0b3IgZm9yIFdlYkNvbXBv c2l0b3JTdXBwb3J0IG5lZWRzIHRvIGJlIHByb3RlY3RlZCwgbm90IHByaXZhdGUsIHNvIGl0IGNh bgorICAgICAgICBiZSBpbXBsZW1lbnRlZC4KKworICAgICAgICAqIFBsYXRmb3JtLmd5cGk6Cisg ICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkNvbXBvc2l0b3JTdXBwb3J0Lmg6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydDo6Y3JlYXRl TGF5ZXJUcmVlVmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0Ojpj cmVhdGVMYXllcik6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0OjpjcmVh dGVDb250ZW50TGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydDo6 Y3JlYXRlRXh0ZXJuYWxUZXh0dXJlTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3Np dG9yU3VwcG9ydDo6Y3JlYXRlSU9TdXJmYWNlTGF5ZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJD b21wb3NpdG9yU3VwcG9ydDo6Y3JlYXRlSW1hZ2VMYXllcik6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbXBvc2l0b3JTdXBwb3J0OjpjcmVhdGVTb2xpZENvbG9yTGF5ZXIpOgorICAgICAgICAoV2Vi S2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydDo6Y3JlYXRlVmlkZW9MYXllcik6CisgICAgICAgIChX ZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0OjpjcmVhdGVTY3JvbGxiYXJMYXllcik6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0OjpjcmVhdGVBbmltYXRpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydDo6Y3JlYXRlRmxvYXRBbmltYXRpb25D dXJ2ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JTdXBwb3J0OjpjcmVhdGVUcmFu c2Zvcm1BbmltYXRpb25DdXJ2ZSk6CisgICAgICAgIChXZWJDb21wb3NpdG9yU3VwcG9ydCk6Cisg ICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYlBhc3NPd25QdHIuaDogUmVtb3ZlZC4KKworMjAx Mi0wOC0zMCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCiAgICAgICAg IENocm9taXVtIHdpbiBidWlsZCBmaXggLSBmaXggdHlwbyBpbiBneXBpCiAKICAgICAgICAgKiBQ bGF0Zm9ybS5neXBpOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDFjN2E0MzZkNWNjY2RhNGQxMWFjMjI1MDQxZWJm M2EwNTY3ZTdkYzEuLjY5NGIwZjc2ZjFjY2EzOWMyOTUzMDBjZTNmMmQzMmRjNmZhNDEwZWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0wOC0zMCAgSmFtZXMgUm9iaW5zb24gIDxq YW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmV2ZXJ0IFdlYkNvbXBv c2l0b3JTdXBwb3J0IHRvIHJhdyBwdHJzLCBtYWtlIGR0b3IgcHJvdGVjdGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTUyMAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IHRoZSByZXR1cm4gdmFs dWUgb2YgV2ViQ29tcG9zaXRvclN1cHBvcnQgZXhwbGljaXRseS4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRpbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVXZWJBbmltYXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5ZXJCcmlkZ2UuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q2FudmFzMkRMYXllckJyaWRnZTo6Q2FudmFzMkRMYXllckJyaWRnZSk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXJQcml2YXRlOjpEcmF3aW5nQnVmZmVyUHJpdmF0 ZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNo cm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6R3Jh cGhpY3NMYXllckNocm9taXVtKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJv bWl1bTo6c2V0Q29udGVudHNUb0ltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5 ZXJDaHJvbWl1bTo6dXBkYXRlTGF5ZXJQcmVzZXJ2ZXMzRCk6CisKIDIwMTItMDgtMzAgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgogCiAgICAgICAgIG9iamNfbXNnU2VuZCBh bmQgSU1QIHNob3VsZCBiZSBjYXN0IGFwcHJvcHJpYXRlbHkgYmVmb3JlIHVzaW5nCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCmluZGV4IGY1OTc1OGJlNDE1YTY0ODIxZGM5M2Y3OGI4MjdhN2FjMjUz YmQ2ZWYuLjQ3NDE1ZDM0MTIwYTNjMGY1MGQzNThiODBkZjYyZjdmMWU3YjRhZWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTItMDgtMzAgIEphbWVzIFJv Ymluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbY2hyb21pdW1dIFJldmVy dCBXZWJDb21wb3NpdG9yU3VwcG9ydCB0byByYXcgcHRycywgbWFrZSBkdG9yIHByb3RlY3RlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU1MjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZG9wdCB0aGUg cmV0dXJuIHZhbHVlIG9mIFdlYkNvbXBvc2l0b3JTdXBwb3J0IGV4cGxpY2l0bHkuCisKKyAgICAg ICAgKiBzcmMvTGlua0hpZ2hsaWdodC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxpbmtIaWdobGln aHQ6OkxpbmtIaWdobGlnaHQpOgorICAgICAgICAoV2ViS2l0OjpMaW5rSGlnaGxpZ2h0OjpzdGFy dEhpZ2hsaWdodEFuaW1hdGlvbik6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50 SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cmVh ZHlTdGF0ZUNoYW5nZWQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6c2V0QmFja2luZ1Rl eHR1cmVJZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OnNldEJh Y2tpbmdJT1N1cmZhY2VJZCk6CisKKzIwMTItMDgtMzAgIEphbWVzIFJvYmluc29uICA8amFtZXNy QGNocm9taXVtLm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIE1ha2Ugd2Via2l0X2NvbXBvc2l0 b3Igc3BlY2lmaWMgdW5pdCB0ZXN0IGNvbXBpbGF0aW9uIGNvbmRpdGlvbmFsIG9uIGd5cCB2YXIK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NDAxCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9QbGF0Zm9ybS5neXBpIGIvU291cmNlL1BsYXRm b3JtL1BsYXRmb3JtLmd5cGkKaW5kZXggYzE5MTY4ZTc0YmI0MWUyNTJlYWYyNWE2YzVkOTNhOTM1 MTM4ODVmYi4uNzZhMWI4OWMxMDI0OThiZmRjMjQ4MWQ3YTY4NmY4ZmJjMzMyMDBiNyAxMDA2NDQK LS0tIGEvU291cmNlL1BsYXRmb3JtL1BsYXRmb3JtLmd5cGkKKysrIGIvU291cmNlL1BsYXRmb3Jt L1BsYXRmb3JtLmd5cGkKQEAgLTk0LDcgKzk0LDYgQEAKICAgICAgICAgICAgICdjaHJvbWl1bS9w dWJsaWMvV2ViTWVzc2FnZVBvcnRDaGFubmVsQ2xpZW50LmgnLAogICAgICAgICAgICAgJ2Nocm9t aXVtL3B1YmxpYy9XZWJNaW1lUmVnaXN0cnkuaCcsCiAgICAgICAgICAgICAnY2hyb21pdW0vcHVi bGljL1dlYk5vbkNvcHlhYmxlLmgnLAotICAgICAgICAgICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJQ YXNzT3duUHRyLmgnLAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJQZWVyQ29ubmVj dGlvbjAwSGFuZGxlci5oJywKICAgICAgICAgICAgICdjaHJvbWl1bS9wdWJsaWMvV2ViUGVlckNv bm5lY3Rpb24wMEhhbmRsZXJDbGllbnQuaCcsCiAgICAgICAgICAgICAnY2hyb21pdW0vcHVibGlj L1dlYlBlZXJDb25uZWN0aW9uSGFuZGxlci5oJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaCBiL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViQ29tcG9zaXRvclN1cHBvcnQuaAppbmRleCA5MjdjZmJlYzEw ZTQyNDMxYjA1MTFhZTZiZWU4ZmM2ZDM1OTJhZGRmLi44OWQzZGZjOWE0YmY3MTdmMDIyOTg3NzIz OTRjN2E2NmFhZDE5NmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVi bGljL1dlYkNvbXBvc2l0b3JTdXBwb3J0LmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9XZWJDb21wb3NpdG9yU3VwcG9ydC5oCkBAIC0yOCw2MiArMjgsNjIgQEAKIAogI2lu Y2x1ZGUgIldlYkFuaW1hdGlvbi5oIgogI2luY2x1ZGUgIldlYkNvbW1vbi5oIgotI2luY2x1ZGUg IldlYkNvbnRlbnRMYXllci5oIgotI2luY2x1ZGUgIldlYkV4dGVybmFsVGV4dHVyZUxheWVyLmgi Ci0jaW5jbHVkZSAiV2ViRmxvYXRBbmltYXRpb25DdXJ2ZS5oIgotI2luY2x1ZGUgIldlYklPU3Vy ZmFjZUxheWVyLmgiCi0jaW5jbHVkZSAiV2ViSW1hZ2VMYXllci5oIgotI2luY2x1ZGUgIldlYkxh eWVyLmgiCiAjaW5jbHVkZSAiV2ViTGF5ZXJUcmVlVmlldy5oIgotI2luY2x1ZGUgIldlYlBhc3NP d25QdHIuaCIKLSNpbmNsdWRlICJXZWJTY3JvbGxiYXIuaCIKLSNpbmNsdWRlICJXZWJTY3JvbGxi YXJMYXllci5oIgotI2luY2x1ZGUgIldlYlNjcm9sbGJhclRoZW1lR2VvbWV0cnkuaCIKICNpbmNs dWRlICJXZWJTY3JvbGxiYXJUaGVtZVBhaW50ZXIuaCIKLSNpbmNsdWRlICJXZWJTb2xpZENvbG9y TGF5ZXIuaCIKLSNpbmNsdWRlICJXZWJUcmFuc2Zvcm1BbmltYXRpb25DdXJ2ZS5oIgotI2luY2x1 ZGUgIldlYlZpZGVvTGF5ZXIuaCIKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIFdlYkFu aW1hdGlvbkN1cnZlOworY2xhc3MgV2ViQ29udGVudExheWVyOwogY2xhc3MgV2ViQ29udGVudExh eWVyQ2xpZW50OworY2xhc3MgV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI7CiBjbGFzcyBXZWJFeHRl cm5hbFRleHR1cmVMYXllckNsaWVudDsKK2NsYXNzIFdlYkZsb2F0QW5pbWF0aW9uQ3VydmU7Citj bGFzcyBXZWJJT1N1cmZhY2VMYXllcjsKK2NsYXNzIFdlYkltYWdlTGF5ZXI7CitjbGFzcyBXZWJM YXllcjsKK2NsYXNzIFdlYlNjcm9sbGJhcjsKK2NsYXNzIFdlYlNjcm9sbGJhckxheWVyOworY2xh c3MgV2ViU2Nyb2xsYmFyVGhlbWVHZW9tZXRyeTsKK2NsYXNzIFdlYlNvbGlkQ29sb3JMYXllcjsK K2NsYXNzIFdlYlRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlOwogY2xhc3MgV2ViVmlkZW9GcmFtZVBy b3ZpZGVyOworY2xhc3MgV2ViVmlkZW9MYXllcjsKIAogY2xhc3MgV2ViQ29tcG9zaXRvclN1cHBv cnQgewogcHVibGljOgogICAgIC8vIE1heSByZXR1cm4gMCBpZiBpbml0aWFsaXphdGlvbiBmYWls cy4KLSAgICB2aXJ0dWFsIFdlYlBhc3NPd25QdHI8V2ViTGF5ZXJUcmVlVmlldz4gY3JlYXRlTGF5 ZXJUcmVlVmlldyhXZWJMYXllclRyZWVWaWV3Q2xpZW50KiwgY29uc3QgV2ViTGF5ZXImIHJvb3Qs IGNvbnN0IFdlYkxheWVyVHJlZVZpZXc6OlNldHRpbmdzJikgeyByZXR1cm4gV2ViUGFzc093blB0 cjxXZWJMYXllclRyZWVWaWV3PigpOyB9CisgICAgdmlydHVhbCBXZWJMYXllclRyZWVWaWV3KiBj cmVhdGVMYXllclRyZWVWaWV3KFdlYkxheWVyVHJlZVZpZXdDbGllbnQqLCBjb25zdCBXZWJMYXll ciYgcm9vdCwgY29uc3QgV2ViTGF5ZXJUcmVlVmlldzo6U2V0dGluZ3MmKSB7IHJldHVybiAwOyB9 CiAKIAogICAgIC8vIExheWVycyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKLSAgICB2aXJ0dWFsIFdlYlBhc3NPd25QdHI8V2ViTGF5ZXI+ IGNyZWF0ZUxheWVyKCkgeyByZXR1cm4gV2ViUGFzc093blB0cjxXZWJMYXllcj4oKTsgfQorICAg IHZpcnR1YWwgV2ViTGF5ZXIqIGNyZWF0ZUxheWVyKCkgeyByZXR1cm4gMDsgfQogCi0gICAgdmly dHVhbCBXZWJQYXNzT3duUHRyPFdlYkNvbnRlbnRMYXllcj4gY3JlYXRlQ29udGVudExheWVyKFdl YkNvbnRlbnRMYXllckNsaWVudCopIHsgcmV0dXJuIFdlYlBhc3NPd25QdHI8V2ViQ29udGVudExh eWVyPigpOyB9CisgICAgdmlydHVhbCBXZWJDb250ZW50TGF5ZXIqIGNyZWF0ZUNvbnRlbnRMYXll cihXZWJDb250ZW50TGF5ZXJDbGllbnQqKSB7IHJldHVybiAwOyB9CiAKLSAgICB2aXJ0dWFsIFdl YlBhc3NPd25QdHI8V2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI+IGNyZWF0ZUV4dGVybmFsVGV4dHVy ZUxheWVyKFdlYkV4dGVybmFsVGV4dHVyZUxheWVyQ2xpZW50KiA9IDApIHsgcmV0dXJuIFdlYlBh c3NPd25QdHI8V2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI+KCk7IH0KKyAgICB2aXJ0dWFsIFdlYkV4 dGVybmFsVGV4dHVyZUxheWVyKiBjcmVhdGVFeHRlcm5hbFRleHR1cmVMYXllcihXZWJFeHRlcm5h bFRleHR1cmVMYXllckNsaWVudCogPSAwKSB7IHJldHVybiAwOyB9CiAKLSAgICB2aXJ0dWFsIFdl YlBhc3NPd25QdHI8V2ViSU9TdXJmYWNlTGF5ZXI+IGNyZWF0ZUlPU3VyZmFjZUxheWVyKCkgeyBy ZXR1cm4gV2ViUGFzc093blB0cjxXZWJJT1N1cmZhY2VMYXllcj4oKTsgfQorICAgIHZpcnR1YWwg V2ViSU9TdXJmYWNlTGF5ZXIqIGNyZWF0ZUlPU3VyZmFjZUxheWVyKCkgeyByZXR1cm4gMDsgfQog Ci0gICAgdmlydHVhbCBXZWJQYXNzT3duUHRyPFdlYkltYWdlTGF5ZXI+IGNyZWF0ZUltYWdlTGF5 ZXIoKSB7IHJldHVybiBXZWJQYXNzT3duUHRyPFdlYkltYWdlTGF5ZXI+KCk7IH0KKyAgICB2aXJ0 dWFsIFdlYkltYWdlTGF5ZXIqIGNyZWF0ZUltYWdlTGF5ZXIoKSB7IHJldHVybiAwOyB9CiAKLSAg ICB2aXJ0dWFsIFdlYlBhc3NPd25QdHI8V2ViU29saWRDb2xvckxheWVyPiBjcmVhdGVTb2xpZENv bG9yTGF5ZXIoKSB7IHJldHVybiBXZWJQYXNzT3duUHRyPFdlYlNvbGlkQ29sb3JMYXllcj4oKTsg fQorICAgIHZpcnR1YWwgV2ViU29saWRDb2xvckxheWVyKiBjcmVhdGVTb2xpZENvbG9yTGF5ZXIo KSB7IHJldHVybiAwOyB9CiAKLSAgICB2aXJ0dWFsIFdlYlBhc3NPd25QdHI8V2ViVmlkZW9MYXll cj4gY3JlYXRlVmlkZW9MYXllcihXZWJWaWRlb0ZyYW1lUHJvdmlkZXIqKSB7IHJldHVybiBXZWJQ YXNzT3duUHRyPFdlYlZpZGVvTGF5ZXI+KCk7IH0KKyAgICB2aXJ0dWFsIFdlYlZpZGVvTGF5ZXIq IGNyZWF0ZVZpZGVvTGF5ZXIoV2ViVmlkZW9GcmFtZVByb3ZpZGVyKikgeyByZXR1cm4gMDsgfQog Ci0gICAgdmlydHVhbCBXZWJQYXNzT3duUHRyPFdlYlNjcm9sbGJhckxheWVyPiBjcmVhdGVTY3Jv bGxiYXJMYXllcihXZWJQYXNzT3duUHRyPFdlYlNjcm9sbGJhcj4sIFdlYlNjcm9sbGJhclRoZW1l UGFpbnRlciwgV2ViUGFzc093blB0cjxXZWJTY3JvbGxiYXJUaGVtZUdlb21ldHJ5PikgeyByZXR1 cm4gV2ViUGFzc093blB0cjxXZWJTY3JvbGxiYXJMYXllcj4oKTsgfQorICAgIHZpcnR1YWwgV2Vi U2Nyb2xsYmFyTGF5ZXIqIGNyZWF0ZVNjcm9sbGJhckxheWVyKFdlYlNjcm9sbGJhciosIFdlYlNj cm9sbGJhclRoZW1lUGFpbnRlciwgV2ViU2Nyb2xsYmFyVGhlbWVHZW9tZXRyeSopIHsgcmV0dXJu IDA7IH0KIAogCiAgICAgLy8gQW5pbWF0aW9uIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAotICAgIHZpcnR1YWwgV2ViUGFzc093blB0cjxXZWJB bmltYXRpb24+IGNyZWF0ZUFuaW1hdGlvbihjb25zdCBXZWJBbmltYXRpb25DdXJ2ZSYsIFdlYkFu aW1hdGlvbjo6VGFyZ2V0UHJvcGVydHksIGludCBhbmltYXRpb25JZCA9IDApIHsgcmV0dXJuIFdl YlBhc3NPd25QdHI8V2ViQW5pbWF0aW9uPigpOyB9CisgICAgdmlydHVhbCBXZWJBbmltYXRpb24q IGNyZWF0ZUFuaW1hdGlvbihjb25zdCBXZWJBbmltYXRpb25DdXJ2ZSYsIFdlYkFuaW1hdGlvbjo6 VGFyZ2V0UHJvcGVydHksIGludCBhbmltYXRpb25JZCA9IDApIHsgcmV0dXJuIDA7IH0KIAotICAg IHZpcnR1YWwgV2ViUGFzc093blB0cjxXZWJGbG9hdEFuaW1hdGlvbkN1cnZlPiBjcmVhdGVGbG9h dEFuaW1hdGlvbkN1cnZlKCkgeyByZXR1cm4gV2ViUGFzc093blB0cjxXZWJGbG9hdEFuaW1hdGlv bkN1cnZlPigpOyB9CisgICAgdmlydHVhbCBXZWJGbG9hdEFuaW1hdGlvbkN1cnZlKiBjcmVhdGVG bG9hdEFuaW1hdGlvbkN1cnZlKCkgeyByZXR1cm4gMDsgfQogCi0gICAgdmlydHVhbCBXZWJQYXNz T3duUHRyPFdlYlRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlPiBjcmVhdGVUcmFuc2Zvcm1BbmltYXRp b25DdXJ2ZSgpIHsgcmV0dXJuIFdlYlBhc3NPd25QdHI8V2ViVHJhbnNmb3JtQW5pbWF0aW9uQ3Vy dmU+KCk7IH0KKyAgICB2aXJ0dWFsIFdlYlRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlKiBjcmVhdGVU cmFuc2Zvcm1BbmltYXRpb25DdXJ2ZSgpIHsgcmV0dXJuIDA7IH0KIAotcHJpdmF0ZToKK3Byb3Rl Y3RlZDoKICAgICB2aXJ0dWFsIH5XZWJDb21wb3NpdG9yU3VwcG9ydCgpIHsgfQogfTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJQYXNzT3duUHRyLmgg Yi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlBhc3NPd25QdHIuaApkZWxldGVk IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggY2Q3MTgyNTAwYTEzOWIyOGMwOWM1Mzg4NzAzOWQ0NzVj MmZmOTY1OC4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0gYS9T b3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYlBhc3NPd25QdHIuaAorKysgL2Rldi9u dWxsCkBAIC0xLDExNSArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKgotICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0gKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK LSAqIGFyZSBtZXQ6Ci0gKgotICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotICogMi4gIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0Ci0gKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVy IG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCi0gKgotICogVEhJUyBT T0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMi IEFORCBBTlkKLSAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKLSAqIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKLSAqIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElB QkxFIEZPUiBBTlkKLSAqIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCi0gKiAoSU5DTFVESU5HLCBCVVQgTk9U IExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 Ci0gKiBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQKLSAqIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBX SEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0gKiAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YKLSAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0gKi8KLQotI2lmbmRlZiBXZWJQYXNzT3duUHRyX2gKLSNk ZWZpbmUgV2ViUGFzc093blB0cl9oCi0KLSNpbmNsdWRlICJXZWJDb21tb24uaCIKLQotI2lmIFdF QktJVF9JTVBMRU1FTlRBVElPTgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KLSNpbmNsdWRlIDx3 dGYvUGFzc093blB0ci5oPgotI2Vsc2UKLSNpbmNsdWRlICJiYXNlL21lbW9yeS9zY29wZWRfcHRy LmgiCi0jZW5kaWYKLQotbmFtZXNwYWNlIFdlYktpdCB7Ci0KLS8vIFVzZSBhIHJldHVybiB2YWx1 ZSBvZiB0eXBlIFdlYlBhc3NPd25QdHI8VD4gd2hlbiB0aGUgY2FsbGVyIHRha2VzIG93bmVyc2hp cCBvZiB0aGUgcmV0dXJuZWQgdmFsdWUsIGZvciBpbnN0YW5jZQotLy8gaW4gYSBjcmVhdGVGb28o KSBmYWN0b3J5IGZ1bmN0aW9uLiBFeGFtcGxlOgotLy8KLS8vIFRvIGltcGxlbWVudCB0aGUgY2xh c3MgV2ViUGFzc093blB0cjxGb28+IGNyZWF0ZUZvbygpIGluIGNocm9taXVtIGNvZGUsIHdyaXRl OgotLy8KLS8vIFdlYlBhc3NPd25QdHI8Rm9vPiBjcmVhdGVGb28oKSB7Ci0vLyAgIHNjb3BlZF9w dHI8Rm9vPiBmb28gPSAuLi47Ci0vLyAgIHJldHVybiBmb28uUGFzcygpOwotLy8gfQotLy8KLS8v IFRvIHVzZSBvbiB0aGUgV2ViS2l0IHNpZGU6Ci0vLwotLy8gICBPd25QdHI8Rm9vPiBmb28gPSAu Li4tPmNyZWF0ZUZvbygpOwotLy8KLS8vIFRvIGltcGxlbWVudCBXZWJQYXNzT3duUHRyPEZvbz4g Y3JlYXRlRm9vKCkgaW4gV2ViS2l0IGFuZCB1c2UgaXQgZnJvbSBjaHJvbWl1bSwgd3JpdGU6Ci0v LwotLy8gV2ViUGFzc093blB0cjxGb28+IGNyZWF0ZUZvbygpCi0vLyB7Ci0vLyAgICAgT3duUHRy PEZvbz4gZm9vID0gLi4uOwotLy8gICAgIHJldHVybiBmb28ucmVsZWFzZSgpOwotLy8gfQotLy8K LS8vIGFuZAotLy8KLS8vICAgc2NvcGVkX3B0cjxGb28+ID0gLi4uLT5jcmVhdGVGb28oKTsKLQot dGVtcGxhdGUgPHR5cGVuYW1lIFQ+Ci1jbGFzcyBXZWJQYXNzT3duUHRyIDogcHVibGljIFdlYk5v bkNvcHlhYmxlIHsKLXB1YmxpYzoKLSAgICBXZWJQYXNzT3duUHRyKCkKLSAgICAgICAgOiBtX3B0 cigwKQotICAgIHsKLSAgICB9Ci0KLSAgICB+V2ViUGFzc093blB0cigpCi0gICAgewotICAgICAg ICBXRUJLSVRfQVNTRVJUKCFtX3B0cik7Ci0gICAgfQotCi0KLSNpZiBXRUJLSVRfSU1QTEVNRU5U QVRJT04KLSAgICBXZWJQYXNzT3duUHRyKFBhc3NPd25QdHI8VD4gcHRyKQotICAgICAgICA6IG1f cHRyKHB0ci5sZWFrUHRyKCkpCi0gICAgewotICAgIH0KLQotICAgIG9wZXJhdG9yIFBhc3NPd25Q dHI8VD4oKQotICAgIHsKLSAgICAgICAgT3duUHRyPFQ+IHJldCA9IGFkb3B0UHRyKG1fcHRyKTsK LSAgICAgICAgbV9wdHIgPSAwOwotICAgICAgICByZXR1cm4gcmV0LnJlbGVhc2UoKTsKLSAgICB9 Ci0jZWxzZQotICAgIFdlYlBhc3NPd25QdHIoc2NvcGVkX3B0cjxUPiBwdHIpCi0gICAgICAgIDog bV9wdHIocHRyLnJlbGVhc2UoKSkKLSAgICB7Ci0gICAgfQotCi0gICAgb3BlcmF0b3Igc2NvcGVk X3B0cjxUPigpCi0gICAgewotICAgICAgICBzY29wZWRfcHRyPFQ+IHJldChtX3B0cik7Ci0gICAg ICAgIG1fcHRyID0gMDsKLSAgICAgICAgcmV0dXJuIHJldC5QYXNzKCk7Ci0gICAgfQotI2VuZGlm Ci0KLXByaXZhdGU6Ci0gICAgVCogbV9wdHI7Ci0KLSAgICAvLyBUaGlzIGNvbnN0cnVjdG9yIGhh cyB0byBiZSBkZWNsYXJlZCBidXQgbm90IGRlZmluZWQgdG8gdHJpZ2dlciBtb3ZlIGVtdWxhdGlv bi4KLSAgICBXZWJQYXNzT3duUHRyKFdlYlBhc3NPd25QdHImKTsKLX07Ci0KLX0KLQotI2VuZGlm IC8vIFdlYlBhc3NPd25QdHJfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRp bC5jcHAKaW5kZXggMmRhYzIyZWFlN2I4NzA1ZmRjNmU4NDcyYzdjZmI5NTY5YzE1YTg5ZS4uMTc5 ZmNjMDIxYjYzODliNDZmNzQ2NjhmMzU1NzcxNWFkMWI4MGU2YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9uVHJhbnNsYXRpb25V dGlsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9B bmltYXRpb25UcmFuc2xhdGlvblV0aWwuY3BwCkBAIC0yNDMsNyArMjQzLDcgQEAgUGFzc093blB0 cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1l VmFsdWVMaXN0JiB2YWwKIAogICAgIE93blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gd2ViQW5p bWF0aW9uOwogICAgIGlmIChXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQg PSBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAg ICAgIHdlYkFuaW1hdGlvbiA9IGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVBbmltYXRpb24oKmN1 cnZlLCB0YXJnZXRQcm9wZXJ0eSwgYW5pbWF0aW9uSWQpOworICAgICAgICB3ZWJBbmltYXRpb24g PSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlQW5pbWF0aW9uKCpjdXJ2ZSwgdGFy Z2V0UHJvcGVydHksIGFuaW1hdGlvbklkKSk7CiAgICAgZWxzZQogICAgICAgICB3ZWJBbmltYXRp b24gPSBhZG9wdFB0cihXZWJLaXQ6OldlYkFuaW1hdGlvbjo6Y3JlYXRlKCpjdXJ2ZSwgdGFyZ2V0 UHJvcGVydHksIGFuaW1hdGlvbklkKSk7CiAKQEAgLTI2NCw3ICsyNjQsNyBAQCBQYXNzT3duUHRy PFdlYktpdDo6V2ViQW5pbWF0aW9uPiBjcmVhdGVXZWJBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVW YWx1ZUxpc3QmIHZhbAogICAgIGlmICh2YWx1ZXMucHJvcGVydHkoKSA9PSBBbmltYXRlZFByb3Bl cnR5V2Via2l0VHJhbnNmb3JtKSB7CiAgICAgICAgIE93blB0cjxXZWJUcmFuc2Zvcm1BbmltYXRp b25DdXJ2ZT4gY3VydmU7CiAgICAgICAgIGlmIChXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9z aXRvclN1cHBvcnQgPSBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBw b3J0KCkpCi0gICAgICAgICAgICBjdXJ2ZSA9IGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVUcmFu c2Zvcm1BbmltYXRpb25DdXJ2ZSgpOworICAgICAgICAgICAgY3VydmUgPSBhZG9wdFB0cihjb21w b3NpdG9yU3VwcG9ydC0+Y3JlYXRlVHJhbnNmb3JtQW5pbWF0aW9uQ3VydmUoKSk7CiAgICAgICAg IGVsc2UKICAgICAgICAgICAgIGN1cnZlID0gYWRvcHRQdHIoV2ViVHJhbnNmb3JtQW5pbWF0aW9u Q3VydmU6OmNyZWF0ZSgpKTsKICAgICAgICAgcmV0dXJuIGNyZWF0ZVdlYkFuaW1hdGlvbjxUcmFu c2Zvcm1BbmltYXRpb25WYWx1ZSwgV2ViVHJhbnNmb3JtS2V5ZnJhbWUsIFdlYlRyYW5zZm9ybUFu aW1hdGlvbkN1cnZlPih2YWx1ZXMsIGFuaW1hdGlvbiwgYW5pbWF0aW9uSWQsIHRpbWVPZmZzZXQs IGN1cnZlLmdldCgpLCBXZWJLaXQ6OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlUcmFuc2Zv cm0sIEZsb2F0U2l6ZShib3hTaXplKSk7CkBAIC0yNzMsNyArMjczLDcgQEAgUGFzc093blB0cjxX ZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFs dWVMaXN0JiB2YWwKICAgICBpZiAodmFsdWVzLnByb3BlcnR5KCkgPT0gQW5pbWF0ZWRQcm9wZXJ0 eU9wYWNpdHkpIHsKICAgICAgICAgT3duUHRyPFdlYkZsb2F0QW5pbWF0aW9uQ3VydmU+IGN1cnZl OwogICAgICAgICBpZiAoV2ViQ29tcG9zaXRvclN1cHBvcnQqIGNvbXBvc2l0b3JTdXBwb3J0ID0g V2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9yU3VwcG9ydCgpKQotICAgICAg ICAgICAgY3VydmUgPSBjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlRmxvYXRBbmltYXRpb25DdXJ2 ZSgpOworICAgICAgICAgICAgY3VydmUgPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3Jl YXRlRmxvYXRBbmltYXRpb25DdXJ2ZSgpKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgY3Vy dmUgPSBhZG9wdFB0cihXZWJGbG9hdEFuaW1hdGlvbkN1cnZlOjpjcmVhdGUoKSk7CiAgICAgICAg IHJldHVybiBjcmVhdGVXZWJBbmltYXRpb248RmxvYXRBbmltYXRpb25WYWx1ZSwgV2ViRmxvYXRL ZXlmcmFtZSwgV2ViRmxvYXRBbmltYXRpb25DdXJ2ZT4odmFsdWVzLCBhbmltYXRpb24sIGFuaW1h dGlvbklkLCB0aW1lT2Zmc2V0LCBjdXJ2ZS5nZXQoKSwgV2ViS2l0OjpXZWJBbmltYXRpb246OlRh cmdldFByb3BlcnR5T3BhY2l0eSwgRmxvYXRTaXplKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzMkRMYXllckJyaWRnZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVy QnJpZGdlLmNwcAppbmRleCAyZjU3MTU1ODBiMGU2NTNkN2UzMDY1NGNiNTg5M2NkZmUzMWUzNjg3 Li4wNjUyMmY1ZDY2N2QxMjZmYWRlODAwYjAyNTYyZGY2NDVmYzA2MTljIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQnJp ZGdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D YW52YXMyRExheWVyQnJpZGdlLmNwcApAQCAtNzcsNyArNzcsNyBAQCBDYW52YXMyRExheWVyQnJp ZGdlOjpDYW52YXMyRExheWVyQnJpZGdlKFBhc3NSZWZQdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNv bnRleHQsCiAgICAgfQogCiAgICAgaWYgKFdlYktpdDo6V2ViQ29tcG9zaXRvclN1cHBvcnQqIGNv bXBvc2l0b3JTdXBwb3J0ID0gV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3NpdG9y U3VwcG9ydCgpKQotICAgICAgICBtX2xheWVyID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUV4 dGVybmFsVGV4dHVyZUxheWVyKHRoaXMpOworICAgICAgICBtX2xheWVyID0gYWRvcHRQdHIoY29t cG9zaXRvclN1cHBvcnQtPmNyZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKHRoaXMpKTsKICAgICBl bHNlCiAgICAgICAgIG1fbGF5ZXIgPSBhZG9wdFB0cihXZWJLaXQ6OldlYkV4dGVybmFsVGV4dHVy ZUxheWVyOjpjcmVhdGUodGhpcykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVt LmNwcAppbmRleCA2MjE3YTYzNzFjZjkyY2MyYTQyMDk0YzJmMzM5OTY3NTA4YzIyNjg5Li5iOTA5 YTBkMTRkYzIwZGM3NTFjNjAyZTdmZDVlYzAyMmNmZDBjMzg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdp bmdCdWZmZXJDaHJvbWl1bS5jcHAKQEAgLTE2Nyw3ICsxNjcsNyBAQCBwdWJsaWM6CiAgICAgICAg IDogbV9kcmF3aW5nQnVmZmVyKGRyYXdpbmdCdWZmZXIpCiAgICAgewogICAgICAgICBpZiAoV2Vi S2l0OjpXZWJDb21wb3NpdG9yU3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBXZWJLaXQ6OlBs YXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAgICAgICBtX2xh eWVyID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUV4dGVybmFsVGV4dHVyZUxheWVyKHRoaXMp OworICAgICAgICAgICAgbV9sYXllciA9IGFkb3B0UHRyKGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVh dGVFeHRlcm5hbFRleHR1cmVMYXllcih0aGlzKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IG1fbGF5ZXIgPSBhZG9wdFB0cihXZWJLaXQ6OldlYkV4dGVybmFsVGV4dHVyZUxheWVyOjpjcmVh dGUodGhpcykpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcAppbmRleCBh ODk3ODQ3NDJmMTQ0MWViNTI1MjZlOWVjOTNiYzUzNjYxN2E3N2EwLi5hMThhM2Y5NTlhMDA5MTZk NWFlNjY2ZjU0MWY3YmFiZDZkZjE3YmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJv bWl1bS5jcHAKQEAgLTk0LDcgKzk0LDcgQEAgR3JhcGhpY3NMYXllckNocm9taXVtOjpHcmFwaGlj c0xheWVyQ2hyb21pdW0oR3JhcGhpY3NMYXllckNsaWVudCogY2xpZW50KQogICAgIG1fb3BhcXVl UmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUgPSBhZG9wdFB0cihuZXcgT3BhcXVlUmVj dFRyYWNraW5nQ29udGVudExheWVyRGVsZWdhdGUodGhpcykpOwogCiAgICAgaWYgKFdlYkNvbXBv c2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50KCktPmNv bXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAgIG1fbGF5ZXIgPSBjb21wb3NpdG9yU3VwcG9ydC0+ Y3JlYXRlQ29udGVudExheWVyKG1fb3BhcXVlUmVjdFRyYWNraW5nQ29udGVudExheWVyRGVsZWdh dGUuZ2V0KCkpOworICAgICAgICBtX2xheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQt PmNyZWF0ZUNvbnRlbnRMYXllcihtX29wYXF1ZVJlY3RUcmFja2luZ0NvbnRlbnRMYXllckRlbGVn YXRlLmdldCgpKSk7CiAgICAgZWxzZQogICAgICAgICBtX2xheWVyID0gYWRvcHRQdHIoV2ViQ29u dGVudExheWVyOjpjcmVhdGUobV9vcGFxdWVSZWN0VHJhY2tpbmdDb250ZW50TGF5ZXJEZWxlZ2F0 ZS5nZXQoKSkpOwogCkBAIC00NzcsNyArNDc3LDcgQEAgdm9pZCBHcmFwaGljc0xheWVyQ2hyb21p dW06OnNldENvbnRlbnRzVG9JbWFnZShJbWFnZSogaW1hZ2UpCiAgICAgaWYgKGltYWdlKSB7CiAg ICAgICAgIGlmIChtX2NvbnRlbnRzTGF5ZXJQdXJwb3NlICE9IENvbnRlbnRzTGF5ZXJGb3JJbWFn ZSkgewogICAgICAgICAgICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3Vw cG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAg ICAgICAgICAgbV9pbWFnZUxheWVyID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUltYWdlTGF5 ZXIoKTsKKyAgICAgICAgICAgICAgICBtX2ltYWdlTGF5ZXIgPSBhZG9wdFB0cihjb21wb3NpdG9y U3VwcG9ydC0+Y3JlYXRlSW1hZ2VMYXllcigpKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAg ICAgICAgICBtX2ltYWdlTGF5ZXIgPSBhZG9wdFB0cihXZWJJbWFnZUxheWVyOjpjcmVhdGUoKSk7 CiAgICAgICAgICAgICByZWdpc3RlckNvbnRlbnRzTGF5ZXIobV9pbWFnZUxheWVyLT5sYXllcigp KTsKQEAgLTczMyw3ICs3MzMsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6dXBkYXRl TGF5ZXJQcmVzZXJ2ZXMzRCgpCiB7CiAgICAgaWYgKG1fcHJlc2VydmVzM0QgJiYgIW1fdHJhbnNm b3JtTGF5ZXIpIHsKICAgICAgICAgaWYgKFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9y U3VwcG9ydCA9IFBsYXRmb3JtOjpjdXJyZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAg ICAgICAgICBtX3RyYW5zZm9ybUxheWVyID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUxheWVy KCk7CisgICAgICAgICAgICBtX3RyYW5zZm9ybUxheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1 cHBvcnQtPmNyZWF0ZUxheWVyKCkpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBtX3RyYW5z Zm9ybUxheWVyID0gYWRvcHRQdHIoV2ViTGF5ZXI6OmNyZWF0ZSgpKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvTGlua0hpZ2hsaWdodC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0LmNwcAppbmRleCA2Zjk3NDYwZDNlZjYyMWE1 NjI3ZGQ1ZTY2MjE0ZjBlYThmYWJhMTFhLi4xY2Q2YWZiNDQ5MDRjNGUyZmI2MGZmZTM0ZTYyOGIx YzY5NDE0N2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGln aGxpZ2h0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9MaW5rSGlnaGxpZ2h0 LmNwcApAQCAtNjksOCArNjksOCBAQCBMaW5rSGlnaGxpZ2h0OjpMaW5rSGlnaGxpZ2h0KE5vZGUq IG5vZGUsIFdlYlZpZXdJbXBsKiBvd25pbmdXZWJWaWV3SW1wbCkKICAgICBBU1NFUlQobV9ub2Rl KTsKICAgICBBU1NFUlQob3duaW5nV2ViVmlld0ltcGwpOwogICAgIGlmIChXZWJDb21wb3NpdG9y U3VwcG9ydCogY29tcG9zaXRvclN1cHBvcnQgPSBQbGF0Zm9ybTo6Y3VycmVudCgpLT5jb21wb3Np dG9yU3VwcG9ydCgpKSB7Ci0gICAgICAgIG1fY29udGVudExheWVyID0gY29tcG9zaXRvclN1cHBv cnQtPmNyZWF0ZUNvbnRlbnRMYXllcih0aGlzKTsKLSAgICAgICAgbV9jbGlwTGF5ZXIgPSBjb21w b3NpdG9yU3VwcG9ydC0+Y3JlYXRlTGF5ZXIoKTsKKyAgICAgICAgbV9jb250ZW50TGF5ZXIgPSBh ZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlQ29udGVudExheWVyKHRoaXMpKTsKKyAg ICAgICAgbV9jbGlwTGF5ZXIgPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlTGF5 ZXIoKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgbV9jb250ZW50TGF5ZXIgPSBhZG9wdFB0cihX ZWJDb250ZW50TGF5ZXI6OmNyZWF0ZSh0aGlzKSk7CiAgICAgICAgIG1fY2xpcExheWVyID0gYWRv cHRQdHIoV2ViTGF5ZXI6OmNyZWF0ZSgpKTsKQEAgLTIxMCw3ICsyMTAsNyBAQCB2b2lkIExpbmtI aWdobGlnaHQ6OnN0YXJ0SGlnaGxpZ2h0QW5pbWF0aW9uKCkKIAogICAgIE93blB0cjxXZWJGbG9h dEFuaW1hdGlvbkN1cnZlPiBjdXJ2ZTsKICAgICBpZiAoY29tcG9zaXRvclN1cHBvcnQpCi0gICAg ICAgIGN1cnZlID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUZsb2F0QW5pbWF0aW9uQ3VydmUo KTsKKyAgICAgICAgY3VydmUgPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlRmxv YXRBbmltYXRpb25DdXJ2ZSgpKTsKICAgICBlbHNlCiAgICAgICAgIGN1cnZlID0gYWRvcHRQdHIo V2ViRmxvYXRBbmltYXRpb25DdXJ2ZTo6Y3JlYXRlKCkpOwogCkBAIC0yMjAsNyArMjIwLDcgQEAg dm9pZCBMaW5rSGlnaGxpZ2h0OjpzdGFydEhpZ2hsaWdodEFuaW1hdGlvbigpCiAgICAgY3VydmUt PmFkZChXZWJGbG9hdEtleWZyYW1lKGR1cmF0aW9uLCBXZWJLaXQ6OmxheW91dFRlc3RNb2RlKCkg PyBzdGFydE9wYWNpdHkgOiAwKSk7CiAKICAgICBpZiAoY29tcG9zaXRvclN1cHBvcnQpCi0gICAg ICAgIG1fYW5pbWF0aW9uID0gY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZUFuaW1hdGlvbigqY3Vy dmUsIFdlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlPcGFjaXR5KTsKKyAgICAgICAgbV9hbmlt YXRpb24gPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlQW5pbWF0aW9uKCpjdXJ2 ZSwgV2ViQW5pbWF0aW9uOjpUYXJnZXRQcm9wZXJ0eU9wYWNpdHkpKTsKICAgICBlbHNlCiAgICAg ICAgIG1fYW5pbWF0aW9uID0gYWRvcHRQdHIoV2ViQW5pbWF0aW9uOjpjcmVhdGUoKmN1cnZlLCBX ZWJBbmltYXRpb246OlRhcmdldFByb3BlcnR5T3BhY2l0eSkpOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcAppbmRl eCA5M2ZjZGVhMTYxYjEwNTQ3ZTI5OGJjMDdkOTQ2MzEzODgyZDYwNzdmLi4wODgxZjA5YjQ2ZTEx ZjBhOWNmMDNkMzIwZWQ4N2JjYjdiZDQ5MGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKQEAgLTExOSw3ICsx MTksNyBAQCB2b2lkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6cmVhZHlTdGF0ZUNoYW5nZWQo KQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICBpZiAoaGFzVmlkZW8oKSAm JiBzdXBwb3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkgJiYgIW1fdmlkZW9MYXllcikgewogICAg ICAgICBpZiAoV2ViQ29tcG9zaXRvclN1cHBvcnQqIGNvbXBvc2l0b3JTdXBwb3J0ID0gUGxhdGZv cm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBvcnQoKSkKLSAgICAgICAgICAgIG1fdmlkZW9M YXllciA9IGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVWaWRlb0xheWVyKHRoaXMpOworICAgICAg ICAgICAgbV92aWRlb0xheWVyID0gYWRvcHRQdHIoY29tcG9zaXRvclN1cHBvcnQtPmNyZWF0ZVZp ZGVvTGF5ZXIodGhpcykpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBtX3ZpZGVvTGF5ZXIg PSBhZG9wdFB0cihXZWJWaWRlb0xheWVyOjpjcmVhdGUodGhpcykpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCmluZGV4 IGVjZjg2NjNmZDgxZTgxNGNjZDJmYjk5YmFhZDJkNzhlODVkNTk0M2UuLmZlOTlhYjg0NDViMTI3 MmIyM2M2N2ZmNDc2YTk2MWI3MjFkYzY3NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCkBAIC0zNzMsNyArMzczLDcg QEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpzZXRCYWNraW5nVGV4dHVyZUlkKHVuc2ln bmVkIHRleHR1cmVJZCkKIAogICAgIGlmICghbV90ZXh0dXJlTGF5ZXIpIHsKICAgICAgICAgaWYg KFdlYkNvbXBvc2l0b3JTdXBwb3J0KiBjb21wb3NpdG9yU3VwcG9ydCA9IFBsYXRmb3JtOjpjdXJy ZW50KCktPmNvbXBvc2l0b3JTdXBwb3J0KCkpCi0gICAgICAgICAgICBtX3RleHR1cmVMYXllciA9 IGNvbXBvc2l0b3JTdXBwb3J0LT5jcmVhdGVFeHRlcm5hbFRleHR1cmVMYXllcigpOworICAgICAg ICAgICAgbV90ZXh0dXJlTGF5ZXIgPSBhZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRl RXh0ZXJuYWxUZXh0dXJlTGF5ZXIoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fdGV4 dHVyZUxheWVyID0gYWRvcHRQdHIoV2ViRXh0ZXJuYWxUZXh0dXJlTGF5ZXI6OmNyZWF0ZSgpKTsK ICAgICAgICAgR3JhcGhpY3NMYXllckNocm9taXVtOjpyZWdpc3RlckNvbnRlbnRzTGF5ZXIobV90 ZXh0dXJlTGF5ZXItPmxheWVyKCkpOwpAQCAtNDAyLDcgKzQwMiw3IEBAIHZvaWQgV2ViUGx1Z2lu Q29udGFpbmVySW1wbDo6c2V0QmFja2luZ0lPU3VyZmFjZUlkKGludCB3aWR0aCwKIAogICAgIGlm ICghbV9pb1N1cmZhY2VMYXllcikgewogICAgICAgICBpZiAoV2ViQ29tcG9zaXRvclN1cHBvcnQq IGNvbXBvc2l0b3JTdXBwb3J0ID0gUGxhdGZvcm06OmN1cnJlbnQoKS0+Y29tcG9zaXRvclN1cHBv cnQoKSkKLSAgICAgICAgICAgIG1faW9TdXJmYWNlTGF5ZXIgPSBjb21wb3NpdG9yU3VwcG9ydC0+ Y3JlYXRlSU9TdXJmYWNlTGF5ZXIoKTsKKyAgICAgICAgICAgIG1faW9TdXJmYWNlTGF5ZXIgPSBh ZG9wdFB0cihjb21wb3NpdG9yU3VwcG9ydC0+Y3JlYXRlSU9TdXJmYWNlTGF5ZXIoKSk7CiAgICAg ICAgIGVsc2UKICAgICAgICAgICAgIG1faW9TdXJmYWNlTGF5ZXIgPSBhZG9wdFB0cihXZWJJT1N1 cmZhY2VMYXllcjo6Y3JlYXRlKCkpOwogICAgICAgICBHcmFwaGljc0xheWVyQ2hyb21pdW06OnJl Z2lzdGVyQ29udGVudHNMYXllcihtX2lvU3VyZmFjZUxheWVyLT5sYXllcigpKTsK