113868 2013-04-03 05:04:20 -0700 Cross fade into restarted plugin 2013-04-03 13:16:37 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino eric esprehn+autocc ojan.autocc simon.fraser thorton webkit.review.bot oldest_to_newest 868632 0 dino 2013-04-03 05:04:20 -0700 When a snapshotted plugin gets restarted, there is an abrupt swap as the snapshot disappears and the plugin loads. Replace this with a cross-fade. I'll implement the WebCore part to detect a restarted plugin, and have the RenderEmbeddedObject draw the snapshot for a while as the plugin appears, but the main crossfade will be done in Apple-specific code. Other platforms will just have to do whatever it takes to animate the opacity of their plugins. <rdar://problem/13478573> 868644 1 196333 dino 2013-04-03 05:33:01 -0700 Created attachment 196333 Patch 868877 2 dino 2013-04-03 13:16:37 -0700 Committed r147579: <http://trac.webkit.org/changeset/147579> 196333 2013-04-03 05:33:01 -0700 2013-04-03 11:44:11 -0700 Patch bug-113868-20130403233250.patch text/plain 16258 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTVmNDc2ZDI5OThmYWYw ZTlmMmY2MDU3YjRkMGMwM2JiNTUzZGQ3Mi4uODk2ZDk0YmM5YjFiMjE3NjJiZThiZTI2NGUyYTdl OWIwNTZhMjM3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA0LTAzICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBDcm9zcyBmYWRlIGludG8gcmVz dGFydGVkIHBsdWdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTEzODY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWxsb3cgYSByZXN0YXJ0ZWQgcGx1Z2luIHRvIGZhZGUgaW4gb3ZlciBpdHMgc25hcHNo b3QsIGF2b2lkaW5nIHRoZSBhYnJ1cHQKKyAgICAgICAgZmxhc2ggb2YgZW1wdHkgY29udGVudC4g VGhlIFdlYkNvcmUgcGFydCBvZiB0aGlzIHBhdGNoIG1hcmtzIHRoZSBwbHVnaW4KKyAgICAgICAg ZWxlbWVudCBhcyByZXN0YXJ0ZWQsIGFuZCBkcmF3cyB0aGUgc25hcHNob3QgZm9yIGEgc2hvcnQg YW1vdW50IG9mIHRpbWUKKyAgICAgICAgYXMgdGhlIHBsdWdpbiBpcyByZXN0YXJ0aW5nLiBBZnRl ciB0aGUgcGx1Z2luIGhhcyByZWFwcGVhcmVkLCB3ZSBzdG9wIGRyYXdpbmcKKyAgICAgICAgdGhl IHNuYXBzaG90LgorCisgICAgICAgIFRoZXJlIGlzIGEgbGl0dGxlIGJpdCBvZiBkcml2ZS1ieSB3 aGl0ZXNwYWNlIHJlbW92YWwgaW4gSFRNTFBsdWdJbkltYWdlRWxlbWVudC4KKworICAgICAgICAq IGh0bWwvSFRNTFBsdWdJbkVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5F bGVtZW50OjpyZXN0YXJ0ZWRQbHVnaW4pOiBOZXcgbWV0aG9kIGluZGljYXRpbmcgaWYgdGhlIHBs dWdpbiBoYXMgYmVlbiByZXN0YXJ0ZWQuCisgICAgICAgICogaHRtbC9IVE1MUGx1Z0luSW1hZ2VF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OkhU TUxQbHVnSW5JbWFnZUVsZW1lbnQpOiBJbml0aWFsaXNlIG5ldyB0aW1lciBhbmQgbWVtYmVyIHZh cmlhYmxlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c2V0RGlz cGxheVN0YXRlKTogSWYgd2UgYXJlIG1vdmluZyBpbnRvIGEgcmVzdGFydGluZyBzdGF0ZSwgbWFr ZSBzdXJlCisgICAgICAgICAgICB0byByZW1lbWJlciB0aGlzIGFuZCBhbHNvIHN0YXJ0IGEgdGlt ZXIgc28gdGhhdCB3ZSBzaG93IHRoZSBzbmFwc2hvdCBmb3Igd2hpbGUuCisgICAgICAgIChXZWJD b3JlOjpIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjpyZW1vdmVTbmFwc2hvdFRpbWVyRmlyZWQpOiBO byBuZWVkIHRvIGRyYXcgdGhlIHNuYXBzaG90IGZyb20gaGVyZSBvbi4KKyAgICAgICAgKiBodG1s L0hUTUxQbHVnSW5JbWFnZUVsZW1lbnQuaDoKKyAgICAgICAgKEhUTUxQbHVnSW5JbWFnZUVsZW1l bnQpOiBNZW1iZXIgdmFyaWFibGUgdG8gcmVtZW1iZXIgaWYgd2UndmUgcmVzdGFydGVkLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbWJlZGRlZE9iamVjdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbWJlZGRlZE9iamVjdDo6cGFpbnRDb250ZW50cyk6IE9ubHkgZXhpdCBlYXJs eSBmcm9tIHRoZSBwYWludCBpZiB3ZSdyZSBub3QgYSByZXN0YXJ0aW5nCisgICAgICAgICAgICBw bHVnaW4sIG90aGVyd2lzZSB3ZSBkbyB3YW50IHRvIGRyYXcgdGhlIHNuYXBzaG90IGlmIHRoZXJl IGlzIG9uZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmlzUmVzdGFydGVkUGx1Z2luKTogRGV0ZWN0cyBhIHJlc3RhcnRlZCBw bHVnaW4uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OmlzU2ltcGxlQ29u dGFpbmVyQ29tcG9zaXRpbmdMYXllcik6IERvbid0IGJlY29tZSBhIHNpbXBsZSBjb250YWluZXIK KyAgICAgICAgICAgIGNvbXBvc2l0aW5nIGxheWVyIGlmIHlvdSdyZSBhIHJlc3RhcnRlZCBwbHVn aW4uCisKIDIwMTMtMDQtMDMgIFRha2VzaGkgWW9zaGlubyAgPHR5b3NoaW5vQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZWZpbmUgTE9HIG1lc3NhZ2VzIGluIFdlYlNvY2tldCByZWxhdGVkIGNv bXBvbmVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCBhMWNiYTkzOTYxZTcwNmRjM2UxMzcxMTI4ZWFjY2MyNTYx YjA4ZmZmLi41NDFkOWQ5NDM2NWMyMDM4MzY2NzY0YjI4N2VkN2Q2YWM0YTc3ZGE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTMtMDQtMDMgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgorCisgICAgICAgIENyb3NzIGZhZGUgaW50byByZXN0YXJ0ZWQgcGx1Z2luCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4NjgKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgcGx1 Z2luIHByb2Nlc3MgdHlwZSB0aGF0IGluZGljYXRlcyB0aGlzIGlzIGEgcGx1Z2luIHRoYXQKKyAg ICAgICAgaGFzIGJlZW4gcmVzdGFydGVkIGZyb20gc25hcHNob3R0aW5nLiBPbiBBcHBsZSBwb3J0 cywgdGhpcyBhbGxvd3MKKyAgICAgICAgdXMgdG8gYW5pbWF0ZSB0aGUgYXBwZWFyYW5jZSBvZiB0 aGUgcGx1Z2luIHNvIHRoYXQgaXQgY3Jvc3NmYWRlcworICAgICAgICB3aXRoIHRoZSBzbmFwc2hv dC4gT3RoZXIgcG9ydHMgd2lsbCBoYXZlIHRvIGFkZCB0aGVpciBvd24gZmFkaW5nLgorCisgICAg ICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmg6IE5ldyBUeXBlOiBUeXBlUmVzdGFy dGVkUHJvY2Vzcy4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL1Bs dWdpblByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6cGx1Z2luTGF5 ZXIpOiBXaGVuIHRoZSBwbHVnaW4ncyBDQUxheWVyIGlzIGNyZWF0ZWQsIGlmIGl0CisgICAgICAg ICAgICBpcyBhIHJlc3RhcnRlZCBwbHVnaW4sIGFkZCBhbiBvcGFjaXR5IGFuaW1hdGlvbiB0byBm YWRlIGl0IGluLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y3JlYXRlUGx1Z2luKTogTWFyayByZXN0YXJ0ZWQgcGx1 Z2lucyB3aXRoIHRoZSBuZXcgcHJvY2VzcyB0eXBlLgorCiAyMDEzLTA0LTAyICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBjb2RlIGZvciBNYWMgMTAu NSBhbmQgZWFybGllciBmcm9tIFdURiBhbmQgV2ViS2l0MgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M UGx1Z0luRWxlbWVudC5oCmluZGV4IDQ5NDM2ZTRmMWI1ZDgzMTFjNWQ4YTYzZDUxZDYwYjE5YjY3 OTQxZDQuLjJlMTJlZTdiMTUxMWEzMzJlZDNhNGJhMjMzMDZiZjFlMDViZGFlZjUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkVsZW1lbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmgKQEAgLTU5LDYgKzU5LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBzZXREaXNwbGF5U3RhdGUoRGlzcGxheVN0YXRlIHN0YXRlKSB7 IG1fZGlzcGxheVN0YXRlID0gc3RhdGU7IH0KICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlU25hcHNo b3QoUGFzc1JlZlB0cjxJbWFnZT4pIHsgfQogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaFBlbmRp bmdNb3VzZUNsaWNrKCkgeyB9CisgICAgdmlydHVhbCBib29sIHJlc3RhcnRlZFBsdWdpbigpIGNv bnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkK ICAgICBOUE9iamVjdCogZ2V0TlBPYmplY3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxQbHVnSW5JbWFnZUVsZW1lbnQuY3BwCmluZGV4IDI2OWMyYjMyZjk1YjRhNzAxYzA5NzBlNmY1 MjVkZWNlNzg2ZGZlNTUuLjZmZmI4NjkxNjBiZjZlODU4ZWEzYTViMTRhZmY0YTdmM2FiODNhMGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luSW1hZ2VFbGVtZW50LmNwcApA QCAtNjUsNiArNjUsNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgYXV0b3N0YXJ0U29vbkFmdGVyVXNl ckdlc3R1cmVUaHJlc2hvbGQgPSA1LjA7CiAKIC8vIFRoaXMgZGVsYXkgc2hvdWxkIG5vdCBleGNl ZWQgdGhlIHNuYXBzaG90IGRlbGF5IGluIFBsdWdpblZpZXcuY3BwCiBzdGF0aWMgY29uc3QgZG91 YmxlIHNpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lckRlbGF5ID0gLjc1Oworc3RhdGljIGNvbnN0IGRv dWJsZSByZW1vdmVTbmFwc2hvdFRpbWVyRGVsYXkgPSAxLjU7CiAKIEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFt ZSwgRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIGNyZWF0ZWRCeVBhcnNlciwgUHJlZmVyUGx1Z0lu c0ZvckltYWdlc09wdGlvbiBwcmVmZXJQbHVnSW5zRm9ySW1hZ2VzT3B0aW9uKQogICAgIDogSFRN TFBsdWdJbkVsZW1lbnQodGFnTmFtZSwgZG9jdW1lbnQpCkBAIC03Nyw3ICs3OCw5IEBAIEhUTUxQ bHVnSW5JbWFnZUVsZW1lbnQ6OkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQoY29uc3QgUXVhbGlmaWVk TmFtZSYgdGFnTmFtZSwgRG9jCiAgICAgLCBtX25lZWRzRG9jdW1lbnRBY3RpdmF0aW9uQ2FsbGJh Y2tzKGZhbHNlKQogICAgICwgbV9zaW11bGF0ZWRNb3VzZUNsaWNrVGltZXIodGhpcywgJkhUTUxQ bHVnSW5JbWFnZUVsZW1lbnQ6OnNpbXVsYXRlZE1vdXNlQ2xpY2tUaW1lckZpcmVkLCBzaW11bGF0 ZWRNb3VzZUNsaWNrVGltZXJEZWxheSkKICAgICAsIG1fc3dhcFJlbmRlcmVyVGltZXIodGhpcywg JkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnN3YXBSZW5kZXJlclRpbWVyRmlyZWQpCisgICAgLCBt X3JlbW92ZVNuYXBzaG90VGltZXIodGhpcywgJkhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnJlbW92 ZVNuYXBzaG90VGltZXJGaXJlZCkKICAgICAsIG1fY3JlYXRlZER1cmluZ1VzZXJHZXN0dXJlKFNj cmlwdENvbnRyb2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpKQorICAgICwgbV9yZXN0YXJ0 ZWRQbHVnaW4oZmFsc2UpCiB7CiAgICAgc2V0SGFzQ3VzdG9tU3R5bGVDYWxsYmFja3MoKTsKIH0K QEAgLTkzLDYgKzk2LDEzIEBAIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c2V0RGlzcGxh eVN0YXRlKERpc3BsYXlTdGF0ZSBzdGF0ZSkKICAgICBIVE1MUGx1Z0luRWxlbWVudDo6c2V0RGlz cGxheVN0YXRlKHN0YXRlKTsKICAgICBpZiAoZGlzcGxheVN0YXRlKCkgPT0gRGlzcGxheWluZ1Nu YXBzaG90KQogICAgICAgICBtX3N3YXBSZW5kZXJlclRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKKwor I2lmIFBMQVRGT1JNKE1BQykKKyAgICBpZiAoZGlzcGxheVN0YXRlKCkgPT0gUmVzdGFydGluZ1dp dGhQZW5kaW5nTW91c2VDbGljayB8fCBkaXNwbGF5U3RhdGUoKSA9PSBSZXN0YXJ0aW5nKSB7Cisg ICAgICAgIG1fcmVzdGFydGVkUGx1Z2luID0gdHJ1ZTsKKyAgICAgICAgbV9yZW1vdmVTbmFwc2hv dFRpbWVyLnN0YXJ0T25lU2hvdChyZW1vdmVTbmFwc2hvdFRpbWVyRGVsYXkpOworICAgIH0KKyNl bmRpZgogfQogCiBSZW5kZXJFbWJlZGRlZE9iamVjdCogSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6 cmVuZGVyRW1iZWRkZWRPYmplY3QoKSBjb25zdApAQCAtMTE4LDcgKzEyOCw3IEBAIGJvb2wgSFRN TFBsdWdJbkltYWdlRWxlbWVudDo6aXNJbWFnZVR5cGUoKQogfQogCiAvLyBXZSBkb24ndCB1c2Ug bV91cmwsIGFzIGl0IG1heSBub3QgYmUgdGhlIGZpbmFsIFVSTCB0aGF0IHRoZSBvYmplY3QgbG9h ZHMsCi0vLyBkZXBlbmRpbmcgb24gPHBhcmFtPiB2YWx1ZXMuIAorLy8gZGVwZW5kaW5nIG9uIDxw YXJhbT4gdmFsdWVzLgogYm9vbCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50OjphbGxvd2VkVG9Mb2Fk RnJhbWVVUkwoY29uc3QgU3RyaW5nJiB1cmwpCiB7CiAgICAgS1VSTCBjb21wbGV0ZVVSTCA9IGRv Y3VtZW50KCktPmNvbXBsZXRlVVJMKHVybCk7CkBAIC0xMzEsNyArMTQxLDcgQEAgYm9vbCBIVE1M UGx1Z0luSW1hZ2VFbGVtZW50OjphbGxvd2VkVG9Mb2FkRnJhbWVVUkwoY29uc3QgU3RyaW5nJiB1 cmwpCiB9CiAKIC8vIFdlIGRvbid0IHVzZSBtX3VybCwgb3IgbV9zZXJ2aWNlVHlwZSBhcyB0aGV5 IG1heSBub3QgYmUgdGhlIGZpbmFsIHZhbHVlcwotLy8gdGhhdCA8b2JqZWN0PiB1c2VzIGRlcGVu ZGluZyBvbiA8cGFyYW0+IHZhbHVlcy4gCisvLyB0aGF0IDxvYmplY3Q+IHVzZXMgZGVwZW5kaW5n IG9uIDxwYXJhbT4gdmFsdWVzLgogYm9vbCBIVE1MUGx1Z0luSW1hZ2VFbGVtZW50Ojp3b3VsZExv YWRBc05ldHNjYXBlUGx1Z2luKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHNlcnZp Y2VUeXBlKQogewogICAgIEFTU0VSVChkb2N1bWVudCgpKTsKQEAgLTE5MCw3ICsyMDAsNyBAQCB2 b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OmF0dGFjaCgpCiAgICAgUG9zdEF0dGFjaENhbGxi YWNrRGlzYWJsZXIgZGlzYWJsZXIodGhpcyk7CiAKICAgICBib29sIGlzSW1hZ2UgPSBpc0ltYWdl VHlwZSgpOwotICAgIAorCiAgICAgaWYgKCFpc0ltYWdlKQogICAgICAgICBxdWV1ZVBvc3RBdHRh Y2hDYWxsYmFjaygmSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6dXBkYXRlV2lkZ2V0Q2FsbGJhY2ss IHRoaXMpOwogCkBAIC0yMzIsMTAgKzI0MiwxMCBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1l bnQ6OmZpbmlzaFBhcnNpbmdDaGlsZHJlbigpCiAgICAgSFRNTFBsdWdJbkVsZW1lbnQ6OmZpbmlz aFBhcnNpbmdDaGlsZHJlbigpOwogICAgIGlmICh1c2VGYWxsYmFja0NvbnRlbnQoKSkKICAgICAg ICAgcmV0dXJuOwotICAgIAorCiAgICAgc2V0TmVlZHNXaWRnZXRVcGRhdGUodHJ1ZSk7CiAgICAg aWYgKGluRG9jdW1lbnQoKSkKLSAgICAgICAgc2V0TmVlZHNTdHlsZVJlY2FsYygpOyAgICAKKyAg ICAgICAgc2V0TmVlZHNTdHlsZVJlY2FsYygpOwogfQogCiB2b2lkIEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ6OmRpZE1vdmVUb05ld0RvY3VtZW50KERvY3VtZW50KiBvbGREb2N1bWVudCkKQEAgLTI2 OCw3ICsyNzgsNyBAQCB2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OmRvY3VtZW50RGlkUmVz dW1lRnJvbVBhZ2VDYWNoZSgpCiAgICAgICAgIG1fY3VzdG9tU3R5bGVGb3JQYWdlQ2FjaGUgPSAw OwogICAgICAgICByZWNhbGNTdHlsZShGb3JjZSk7CiAgICAgfQotICAgIAorCiAgICAgSFRNTFBs dWdJbkVsZW1lbnQ6OmRvY3VtZW50RGlkUmVzdW1lRnJvbVBhZ2VDYWNoZSgpOwogfQogCkBAIC0z OTYsNiArNDA2LDEzIEBAIHZvaWQgSFRNTFBsdWdJbkltYWdlRWxlbWVudDo6c3dhcFJlbmRlcmVy VGltZXJGaXJlZChUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50CiAgICAgZW5zdXJlVXNlckFn ZW50U2hhZG93Um9vdCgpOwogfQogCit2b2lkIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQ6OnJlbW92 ZVNuYXBzaG90VGltZXJGaXJlZChUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50PiopCit7Cisg ICAgbV9zbmFwc2hvdEltYWdlID0gbnVsbHB0cjsKKyAgICBtX3Jlc3RhcnRlZFBsdWdpbiA9IGZh bHNlOworICAgIHJlbmRlcmVyKCktPnJlcGFpbnQoKTsKK30KKwogc3RhdGljIHZvaWQgYWRkUGx1 Z0luc0Zyb21Ob2RlTGlzdE1hdGNoaW5nUGx1Z0luT3JpZ2luKEhUTUxQbHVnSW5JbWFnZUVsZW1l bnRMaXN0JiBwbHVnSW5MaXN0LCBQYXNzUmVmUHRyPE5vZGVMaXN0PiBjb2xsZWN0aW9uLCBjb25z dCBTdHJpbmcmIHBsdWdJbk9yaWdpbiwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsKICAgICBm b3IgKHVuc2lnbmVkIGkgPSAwLCBsZW5ndGggPSBjb2xsZWN0aW9uLT5sZW5ndGgoKTsgaSA8IGxl bmd0aDsgaSsrKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5J bWFnZUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVu dC5oCmluZGV4IGYxY2RiYTRhNDhlYmY4ZWVjMWI2YWQ2NmExODgwYmJhODI2OTgzYzQuLjU5MzRj ZWNjNDJlM2Q2ZjViMjBiMGFkNzZmN2VjMTI3MWNhNWFiMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTFBsdWdJbkltYWdlRWxlbWVudC5oCkBAIC04MSw3ICs4MSw3IEBAIHB1YmxpYzoK ICAgICAvLyBQbHVnLWluIFVSTCBtaWdodCBub3QgYmUgdGhlIHNhbWUgYXMgdXJsKCkgd2l0aCBv dmVycmlkaW5nIHBhcmFtZXRlcnMuCiAgICAgdm9pZCBzdWJmcmFtZUxvYWRlcldpbGxDcmVhdGVQ bHVnSW4oY29uc3QgS1VSTCYgcGx1Z0luVVJMKTsKICAgICB2b2lkIHN1YmZyYW1lTG9hZGVyRGlk Q3JlYXRlUGx1Z0luKGNvbnN0IFdpZGdldCopOwotICAgIAorCiAgICAgdm9pZCBzZXRJc1ByaW1h cnlTbmFwc2hvdHRlZFBsdWdJbihib29sKTsKIAogcHJvdGVjdGVkOgpAQCAtOTMsNyArOTMsNyBA QCBwcm90ZWN0ZWQ6CiAgICAgU3RyaW5nIG1fc2VydmljZVR5cGU7CiAgICAgU3RyaW5nIG1fdXJs OwogICAgIEtVUkwgbV9sb2FkZWRVcmw7Ci0gICAgCisKICAgICBzdGF0aWMgdm9pZCB1cGRhdGVX aWRnZXRDYWxsYmFjayhOb2RlKiwgdW5zaWduZWQgPSAwKTsKICAgICB2aXJ0dWFsIHZvaWQgYXR0 YWNoKCk7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaCgpOwpAQCAtMTAyLDEzICsxMDIsMTQgQEAg cHJvdGVjdGVkOgogICAgIGJvb2wgd291bGRMb2FkQXNOZXRzY2FwZVBsdWdpbihjb25zdCBTdHJp bmcmIHVybCwgY29uc3QgU3RyaW5nJiBzZXJ2aWNlVHlwZSk7CiAKICAgICB2aXJ0dWFsIHZvaWQg ZGlkTW92ZVRvTmV3RG9jdW1lbnQoRG9jdW1lbnQqIG9sZERvY3VtZW50KSBPVkVSUklERTsKLSAg ICAKKwogICAgIHZpcnR1YWwgdm9pZCBkb2N1bWVudFdpbGxTdXNwZW5kRm9yUGFnZUNhY2hlKCkg T1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGRvY3VtZW50RGlkUmVzdW1lRnJvbVBhZ2VDYWNo ZSgpIE9WRVJSSURFOwogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBjdXN0 b21TdHlsZUZvclJlbmRlcmVyKCkgT1ZFUlJJREU7CiAKICAgICB2b2lkIHJlc3RhcnRTbmFwc2hv dHRlZFBsdWdJbigpOworICAgIHZpcnR1YWwgYm9vbCByZXN0YXJ0ZWRQbHVnaW4oKSBjb25zdCBP VkVSUklERSB7IHJldHVybiBtX3Jlc3RhcnRlZFBsdWdpbjsgfQogCiBwcml2YXRlOgogICAgIHZp cnR1YWwgUmVuZGVyT2JqZWN0KiBjcmVhdGVSZW5kZXJlcihSZW5kZXJBcmVuYSosIFJlbmRlclN0 eWxlKik7CkBAIC0xMzEsNiArMTMyLDggQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgYm9vbCBp c1BsdWdJbkltYWdlRWxlbWVudCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KIAor ICAgIHZvaWQgcmVtb3ZlU25hcHNob3RUaW1lckZpcmVkKFRpbWVyPEhUTUxQbHVnSW5JbWFnZUVs ZW1lbnQ+Kik7CisKICAgICBib29sIG1fbmVlZHNXaWRnZXRVcGRhdGU7CiAgICAgYm9vbCBtX3No b3VsZFByZWZlclBsdWdJbnNGb3JJbWFnZXM7CiAgICAgYm9vbCBtX25lZWRzRG9jdW1lbnRBY3Rp dmF0aW9uQ2FsbGJhY2tzOwpAQCAtMTM4LDggKzE0MSwxMCBAQCBwcml2YXRlOgogICAgIFJlZlB0 cjxNb3VzZUV2ZW50PiBtX3BlbmRpbmdDbGlja0V2ZW50RnJvbVNuYXBzaG90OwogICAgIERlZmVy cmFibGVPbmVTaG90VGltZXI8SFRNTFBsdWdJbkltYWdlRWxlbWVudD4gbV9zaW11bGF0ZWRNb3Vz ZUNsaWNrVGltZXI7CiAgICAgVGltZXI8SFRNTFBsdWdJbkltYWdlRWxlbWVudD4gbV9zd2FwUmVu ZGVyZXJUaW1lcjsKKyAgICBUaW1lcjxIVE1MUGx1Z0luSW1hZ2VFbGVtZW50PiBtX3JlbW92ZVNu YXBzaG90VGltZXI7CiAgICAgUmVmUHRyPEltYWdlPiBtX3NuYXBzaG90SW1hZ2U7CiAgICAgYm9v bCBtX2NyZWF0ZWREdXJpbmdVc2VyR2VzdHVyZTsKKyAgICBib29sIG1fcmVzdGFydGVkUGx1Z2lu OwogfTsKIAogaW5saW5lIEhUTUxQbHVnSW5JbWFnZUVsZW1lbnQqIHRvSFRNTFBsdWdJbkltYWdl RWxlbWVudChOb2RlKiBub2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbWJlZGRlZE9iamVjdC5jcHAKaW5kZXggMzgwODkwMzQwMDRhMzIwMzMwNjllZDg4OWU0ODRk ODcwOTFjYzlmOS4uZDBkNDU1YTc2MGUyZmU5ODQ0NGNiODM4N2NmNmMyMTVhMTJhOTZjYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRkZWRPYmplY3QuY3Bw CkBAIC0xNzcsOSArMTc3LDExIEBAIHZvaWQgUmVuZGVyRW1iZWRkZWRPYmplY3Q6OnBhaW50Q29u dGVudHMoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50CiAgICAgICAgIHJl dHVybjsKIAogICAgIEhUTUxQbHVnSW5FbGVtZW50KiBwbHVnSW5FbGVtZW50ID0gdG9IVE1MUGx1 Z0luRWxlbWVudChlbGVtZW50KTsKKwogICAgIGlmIChwbHVnSW5FbGVtZW50LT5kaXNwbGF5U3Rh dGUoKSA+IEhUTUxQbHVnSW5FbGVtZW50OjpEaXNwbGF5aW5nU25hcHNob3QpIHsKICAgICAgICAg UmVuZGVyUGFydDo6cGFpbnRDb250ZW50cyhwYWludEluZm8sIHBhaW50T2Zmc2V0KTsKLSAgICAg ICAgcmV0dXJuOworICAgICAgICBpZiAoIXBsdWdJbkVsZW1lbnQtPnJlc3RhcnRlZFBsdWdpbigp KQorICAgICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGlmICghcGx1Z0luRWxlbWVudC0+ aXNQbHVnSW5JbWFnZUVsZW1lbnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggYzRhZGU3Zjg5MjNlZWNiMWVkMzhiMGFkZjQxOTU5 OWU0YWY2ZDYzNS4uMTAyOTk5ZWIzNGYzYTYzYWI4ZGViOWNmZWNkZTJiYjhlZWFjYTIzMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAg LTQyLDYgKzQyLDcgQEAKICNpbmNsdWRlICJIVE1MSUZyYW1lRWxlbWVudC5oIgogI2luY2x1ZGUg IkhUTUxNZWRpYUVsZW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKKyNpbmNsdWRlICJI VE1MUGx1Z0luRWxlbWVudC5oIgogI2luY2x1ZGUgIkluc3BlY3Rvckluc3RydW1lbnRhdGlvbi5o IgogI2luY2x1ZGUgIktleWZyYW1lTGlzdC5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgi CkBAIC0xNDQ5LDYgKzE0NTAsMTggQEAgYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OnBhaW50c0No aWxkcmVuKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK3N0YXRpYyBib29sIGlzUmVz dGFydGVkUGx1Z2luKFJlbmRlck9iamVjdCogcmVuZGVyZXIpCit7CisgICAgaWYgKCFyZW5kZXJl ci0+aXNFbWJlZGRlZE9iamVjdCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBFbGVt ZW50KiBlbGVtZW50ID0gdG9FbGVtZW50KHJlbmRlcmVyLT5ub2RlKCkpOworICAgIGlmICghZWxl bWVudCB8fCAhZWxlbWVudC0+aXNQbHVnaW5FbGVtZW50KCkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIHJldHVybiB0b0hUTUxQbHVnSW5FbGVtZW50KGVsZW1lbnQpLT5yZXN0YXJ0ZWRQ bHVnaW4oKTsKK30KKwogc3RhdGljIGJvb2wgaXNDb21wb3NpdGVkUGx1Z2luKFJlbmRlck9iamVj dCogcmVuZGVyZXIpCiB7CiAgICAgcmV0dXJuIHJlbmRlcmVyLT5pc0VtYmVkZGVkT2JqZWN0KCkg JiYgdG9SZW5kZXJFbWJlZGRlZE9iamVjdChyZW5kZXJlciktPmFsbG93c0FjY2VsZXJhdGVkQ29t cG9zaXRpbmcoKTsKQEAgLTE0NjMsOSArMTQ3Niw5IEBAIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5n Ojppc1NpbXBsZUNvbnRhaW5lckNvbXBvc2l0aW5nTGF5ZXIoKSBjb25zdAogICAgIGlmIChyZW5k ZXJPYmplY3QtPmhhc01hc2soKSkgLy8gbWFza3MgcmVxdWlyZSBzcGVjaWFsIHRyZWF0bWVudAog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAocmVuZGVyT2JqZWN0LT5pc1JlcGxhY2Vk KCkgJiYgIWlzQ29tcG9zaXRlZFBsdWdpbihyZW5kZXJPYmplY3QpKQorICAgIGlmIChyZW5kZXJP YmplY3QtPmlzUmVwbGFjZWQoKSAmJiAoIWlzQ29tcG9zaXRlZFBsdWdpbihyZW5kZXJPYmplY3Qp IHx8IGlzUmVzdGFydGVkUGx1Z2luKHJlbmRlck9iamVjdCkpKQogICAgICAgICByZXR1cm4gZmFs c2U7Ci0gICAgCisKICAgICBpZiAocGFpbnRzQm94RGVjb3JhdGlvbnMoKSB8fCBwYWludHNDaGls ZHJlbigpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5oIGIvU291cmNlL1dlYktpdDIvUGx1Z2lu UHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmgKaW5kZXggYzk2OTllZmVlMGVkMzM3ZDdkYmM4OWJkNGQw ZTkxNjFjNTRmYTJkOC4uZGJlMGI1N2FjZWYzNTI1Y2U0OThmYTRhMmYxZWMwNTZjMjdkMDViYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmgK KysrIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Qcm9jZXNzLmgKQEAgLTQ0 LDcgKzQ0LDggQEAgcHVibGljOgogICAgIGVudW0gVHlwZSB7CiAgICAgICAgIC8vIFN0YXJ0IHdp dGggdmFsdWUgb25lIHNpbmNlIGRlZmF1bHQgSGFzaFRyYWl0czw+IGRpc2FsbG93cyB6ZXJvIGFz IGtleS4KICAgICAgICAgVHlwZVJlZ3VsYXJQcm9jZXNzID0gMSwKLSAgICAgICAgVHlwZVNuYXBz aG90UHJvY2VzcworICAgICAgICBUeXBlU25hcHNob3RQcm9jZXNzLAorICAgICAgICBUeXBlUmVz dGFydGVkUHJvY2VzcwogICAgIH07CiAKICAgICBzdGF0aWMgUGx1Z2luUHJvY2VzcyYgc2hhcmVk KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvbWFjL1BsdWdpblByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL21hYy9QbHVnaW5Qcm94eU1hYy5tbQppbmRleCA0MTYwNjU2OThkMTNkN2Nj OGNjZjUwYTc2NzkxMjkwMWFjMjZkNmExLi5jZjg5M2I5ZjY5YWI0ZTE2NzFkOTFlZjgwZTUxYTIz MjFjOTkwOTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvbWFjL1BsdWdpblByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvUGx1Z2luUHJveHlNYWMubW0KQEAgLTMxLDggKzMx LDExIEBACiAjaW1wb3J0ICJQbHVnaW5Db250cm9sbGVyLmgiCiAjaW1wb3J0ICJQbHVnaW5Db250 cm9sbGVyUHJveHlNZXNzYWdlcy5oIgogI2ltcG9ydCAiUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24u aCIKKyNpbXBvcnQgPFF1YXJ0ekNvcmUvUXVhcnR6Q29yZS5oPgogI2ltcG9ydCA8V2ViS2l0U3lz dGVtSW50ZXJmYWNlLmg+CiAKK2NvbnN0IHN0YXRpYyBkb3VibGUgZmFkZUluRHVyYXRpb24gPSAw LjU7CisKIG5hbWVzcGFjZSBXZWJLaXQgewogCiBzdGF0aWMgdm9pZCBtYWtlUmVuZGVyTGF5ZXIo Q0FMYXllciAqcGx1Z2luTGF5ZXIsIHVpbnQzMl90IGxheWVySG9zdGluZ0NvbnRleHRJRCkKQEAg LTUxLDYgKzU0LDE1IEBAIFBsYXRmb3JtTGF5ZXIqIFBsdWdpblByb3h5OjpwbHVnaW5MYXllcigp CiAgICAgICAgIG1fcGx1Z2luTGF5ZXIuYWRvcHROUyhbW0NBTGF5ZXIgYWxsb2NdIGluaXRdKTsK ICAgICAgICAgW21fcGx1Z2luTGF5ZXIuZ2V0KCkgc2V0R2VvbWV0cnlGbGlwcGVkOllFU107CiAK KyAgICAgICAgaWYgKG1fcHJvY2Vzc1R5cGUgPT0gUGx1Z2luUHJvY2Vzczo6VHlwZVJlc3RhcnRl ZFByb2Nlc3MpIHsKKyAgICAgICAgICAgIENBQmFzaWNBbmltYXRpb24gKmZhZGVJbkFuaW1hdGlv biA9IFtDQUJhc2ljQW5pbWF0aW9uIGFuaW1hdGlvbldpdGhLZXlQYXRoOkAib3BhY2l0eSJdOwor ICAgICAgICAgICAgZmFkZUluQW5pbWF0aW9uLmZyb21WYWx1ZSA9IFtOU051bWJlciBudW1iZXJX aXRoRmxvYXQ6MF07CisgICAgICAgICAgICBmYWRlSW5BbmltYXRpb24udG9WYWx1ZSA9IFtOU051 bWJlciBudW1iZXJXaXRoRmxvYXQ6MV07CisgICAgICAgICAgICBmYWRlSW5BbmltYXRpb24uZHVy YXRpb24gPSBmYWRlSW5EdXJhdGlvbjsKKyAgICAgICAgICAgIGZhZGVJbkFuaW1hdGlvbi5yZW1v dmVkT25Db21wbGV0aW9uID0gTk87CisgICAgICAgICAgICBbbV9wbHVnaW5MYXllci5nZXQoKSBh ZGRBbmltYXRpb246ZmFkZUluQW5pbWF0aW9uIGZvcktleTpAInJlc3RhcnRlZC1wbHVnaW4tZmFk ZS1pbiJdOworICAgICAgICB9CisKICAgICAgICAgbWFrZVJlbmRlckxheWVyKG1fcGx1Z2luTGF5 ZXIuZ2V0KCksIG1fcmVtb3RlTGF5ZXJDbGllbnRJRCk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZjUwNjZjODQ4MWNiZWIz NDcxNGIzZDY1NmMxMmJkMTM0YzgwNWI1NS4uNWRmODU3ZjBiMWZlMDMwOGJkNjMyN2FmMjI3ZTFi OWRkM2RkYjRmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcApAQCAtNTU4LDcgKzU1OCwxMiBAQCBQYXNzUmVmUHRyPFBsdWdpbj4gV2ViUGFnZTo6 Y3JlYXRlUGx1Z2luKFdlYkZyYW1lKiBmcmFtZSwgSFRNTFBsdWdJbkVsZW1lbnQqIHBsdQogICAg IH0KIAogI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKLSAgICBQbHVnaW5Qcm9jZXNzOjpUeXBl IHByb2Nlc3NUeXBlID0gKHBsdWdpbkVsZW1lbnQtPmRpc3BsYXlTdGF0ZSgpID09IEhUTUxQbHVn SW5FbGVtZW50OjpXYWl0aW5nRm9yU25hcHNob3QgPyBQbHVnaW5Qcm9jZXNzOjpUeXBlU25hcHNo b3RQcm9jZXNzIDogUGx1Z2luUHJvY2Vzczo6VHlwZVJlZ3VsYXJQcm9jZXNzKTsKKworICAgIFBs dWdpblByb2Nlc3M6OlR5cGUgcHJvY2Vzc1R5cGUgPSBQbHVnaW5Qcm9jZXNzOjpUeXBlUmVndWxh clByb2Nlc3M7CisgICAgaWYgKHBsdWdpbkVsZW1lbnQtPmRpc3BsYXlTdGF0ZSgpID09IEhUTUxQ bHVnSW5FbGVtZW50OjpXYWl0aW5nRm9yU25hcHNob3QpCisgICAgICAgIHByb2Nlc3NUeXBlID0g UGx1Z2luUHJvY2Vzczo6VHlwZVNuYXBzaG90UHJvY2VzczsKKyAgICBlbHNlIGlmIChwbHVnaW5F bGVtZW50LT5kaXNwbGF5U3RhdGUoKSA9PSBIVE1MUGx1Z0luRWxlbWVudDo6UmVzdGFydGluZyB8 fCBwbHVnaW5FbGVtZW50LT5kaXNwbGF5U3RhdGUoKSA9PSBIVE1MUGx1Z0luRWxlbWVudDo6UmVz dGFydGluZ1dpdGhQZW5kaW5nTW91c2VDbGljaykKKyAgICAgICAgcHJvY2Vzc1R5cGUgPSBQbHVn aW5Qcm9jZXNzOjpUeXBlUmVzdGFydGVkUHJvY2VzczsKICAgICByZXR1cm4gUGx1Z2luUHJveHk6 OmNyZWF0ZShwbHVnaW5QYXRoLCBwcm9jZXNzVHlwZSk7CiAjZWxzZQogICAgIE5ldHNjYXBlUGx1 Z2luOjpzZXRTZXRFeGNlcHRpb25GdW5jdGlvbihOUFJ1bnRpbWVPYmplY3RNYXA6OnNldEdsb2Jh bEV4Y2VwdGlvbik7Cg==