94973 2012-08-24 14:47:51 -0700 [chromium] Clean up WebAnimation animationId/groupId generation 2012-08-24 16:24:43 -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 fishd tkent+wkapi vollick webkit.review.bot oldest_to_newest 704431 0 jamesr 2012-08-24 14:47:51 -0700 [chromium] Clean up WebAnimation animationId/groupId generation 704434 1 160504 jamesr 2012-08-24 14:54:50 -0700 Created attachment 160504 Patch 704436 2 jamesr 2012-08-24 14:55:23 -0700 Goal here is to get rid of AnimationIdVendor since it's used by both bindings code and WebCore code that's staying put. 704439 3 webkit.review.bot 2012-08-24 14:57:42 -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. 704478 4 160504 enne 2012-08-24 15:55:58 -0700 Comment on attachment 160504 Patch R=me. 704503 5 jamesr 2012-08-24 16:24:43 -0700 Committed r126650: <http://trac.webkit.org/changeset/126650> 160504 2012-08-24 14:54:50 -0700 2012-08-24 15:55:58 -0700 Patch bug-94973-20120824145446.patch text/plain 22938 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NjA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3OGQzM2E3MGE0NWI4 OWM2MGQ3MDZhOWZhZDk4ODBkOGQzMzU1ZDZjLi5hNzE0Y2VmZDg0MjY5ZmY3NGU2ODU3MTNhNGU0 ZjJlNTM1YTE4NWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wOC0yNCAg SmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1 bV0gQ2xlYW4gdXAgV2ViQW5pbWF0aW9uIGFuaW1hdGlvbklkL2dyb3VwSWQgZ2VuZXJhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ5NzMKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHJlbW92 ZXMgdGhlIHVudXNlZCBncm91cElkIGZyb20gdGhlIHB1YmxpYyBpbnRlcmZhY2UgYW5kIG1ha2Vz IHRoZSBpbXBsaWNpdCBhbmltYXRpb24gaWQgZ2VuZXJhdGlvbiBhIGJpdAorICAgICAgICBjbGVh cmVyLgorCisgICAgICAgICogY2hyb21pdW0vcHVibGljL1dlYkFuaW1hdGlvbi5oOgorICAgICAg ICAoV2ViQW5pbWF0aW9uKToKKwogMjAxMi0wOC0yNCAgVG9tbXkgV2lkZW5mbHljaHQgIDx0b21t eXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBNZWRpYVN0cmVhbSBBUEk6IEFkZCByZWFkeVN0YXRl IGZ1bmN0aW9uYWxpdHkgdG8gUlRDUGVlckNvbm5lY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZmY2MmI1 OTM4M2E5MWFiNDA3NDIxMzIyZTYyYWM0Y2M1YWJjMDgxLi5lNWIyNGVkOWM4ZDY5YmI1MmY3Nzc4 ZDNjOWJiYjg1NmZkZDQzMzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTItMDgt MjQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hy b21pdW1dIENsZWFuIHVwIFdlYkFuaW1hdGlvbiBhbmltYXRpb25JZC9ncm91cElkIGdlbmVyYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0OTcz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBn ZXRzIHJpZCBvZiBBbmltYXRpb25JZFZlbmRvciBhbmQgc2ltcGxpZmllcyBHcmFwaGljc0xheWVy Q2hyb21pdW0ncyBuYW1lPC0+aWQgbWFwcGluZy4gV2Ugb25seSBoYXZlIHRvCisgICAgICAgIHRy YWNrIHRoZSBJRHMgb2YgYW5pbWF0aW9ucyB0aGF0IHdlIGhhdmUgc3RhcnRlZCBhbmQgY2FuIGxl dCBXZWJBbmltYXRpb24gZ2VuZXJhdGUgbmV3IElEcyBpZiB3ZSBoYXZlbid0IHNlZW4KKyAgICAg ICAgdGhlIG5hbWUgYmVmb3JlLgorCisgICAgICAgICogV2ViQ29yZS5neXBpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvbklkVmVuZG9yLmNwcDogUmVtb3Zl ZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25JZFZlbmRv ci5oOiBSZW1vdmVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1h dGlvblRyYW5zbGF0aW9uVXRpbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVXZWJBbmlt YXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRy YW5zbGF0aW9uVXRpbC5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vR3JhcGhpY3NMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6YWRkQW5pbWF0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6cGF1c2VBbmltYXRpb24pOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NMYXllckNocm9taXVtOjpyZW1vdmVBbmltYXRpb24pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oOgor CiAyMDEyLTA4LTI0ICBDcmlzIE5lY2thciAgPGNkbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg QWRkIHN1cHBvcnQgZm9yIGNvbnN1bWFibGUgdXNlciBnZXN0dXJlcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwppbmRleCA0NGQxODdkNzNhZGQ3MjAzODBmYThiNjY5MzZiOTg1NDRjNDljMjk5Li42 Y2MwOWFkMmIwYzgzZDFmOGE1ZDkwNjdmYmMwMTIxMmY2MTkxMDA2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA4LTI0ICBKYW1lcyBSb2JpbnNvbiAg PGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBDbGVhbiB1cCBXZWJB bmltYXRpb24gYW5pbWF0aW9uSWQvZ3JvdXBJZCBnZW5lcmF0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDk3MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL1dlYkFuaW1hdGlvbkltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJBbmltYXRpb246OmNyZWF0ZSk6CisgICAgICAgIChXZWJL aXQ6OldlYkFuaW1hdGlvbkltcGw6OldlYkFuaW1hdGlvbkltcGwpOgorICAgICAgICAoV2ViS2l0 OjpXZWJBbmltYXRpb25JbXBsOjppZCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNy Yy9XZWJBbmltYXRpb25JbXBsLmg6CisgICAgICAgIChXZWJBbmltYXRpb25JbXBsKToKKyAgICAg ICAgKiB0ZXN0cy9BbmltYXRpb25UcmFuc2xhdGlvblV0aWxUZXN0LmNwcDoKKyAgICAgICAgKFdl YktpdDo6YW5pbWF0aW9uQ2FuQmVUcmFuc2xhdGVkKToKKyAgICAgICAgKiB0ZXN0cy9HcmFwaGlj c0xheWVyQ2hyb21pdW1UZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VEVTVF9GKToKKwogMjAx Mi0wOC0yNCAgQ3JpcyBOZWNrYXIgIDxjZG5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFBsdW1i IGNvbnN1bWVVc2VyR2VzdHVyZSgpIHRvIHRoZSBjaHJvbWl1bSBwbGF0Zm9ybSBsYXllci4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViQW5pbWF0aW9uLmgg Yi9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkFuaW1hdGlvbi5oCmluZGV4IDYy MTMzMGM3YzI4NmJiZjViNGI3NjA3ZDk4NmE2OTUyYzVjMWUyM2MuLmZiM2IyNDdjM2UxMjlkOTY4 ODhjN2I2M2Y3OTdiNDYxYzg4YjAxMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJv bWl1bS9wdWJsaWMvV2ViQW5pbWF0aW9uLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9XZWJBbmltYXRpb24uaApAQCAtNTAsMTUgKzUwLDE1IEBAIHB1YmxpYzoKICAgICB9 OwogCiAgICAgLy8gVGhlIGNhbGxlciB0YWtlcyBvd25lcnNoaXAgb2YgdGhlIHJldHVybmVkIHZh bHVlLgotICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdlYkFuaW1hdGlvbiogY3JlYXRlKGNvbnN0 IFdlYkFuaW1hdGlvbkN1cnZlJiwgVGFyZ2V0UHJvcGVydHkpOwotCi0gICAgLy8gQW4gYW5pbWF0 aW9uSWQgaXMgZWZmZWN0aXZlbHkgdGhlIGFuaW1hdGlvbidzIG5hbWUsIGFuZCBpdCBpcyBub3Qg dW5pcXVlLgotICAgIC8vIEFuaW1hdGlvbnMgd2l0aCB0aGUgc2FtZSBncm91cElkIGFyZSBydW4g YXQgdGhlIHNhbWUgdGltZS4gQW4gYW5pbWF0aW9uCi0gICAgLy8gbWF5IGJlIHVuaXF1ZWx5IGlk ZW50aWZpZWQgYnkgYSBjb21iaW5hdGlvbiBvZiBncm91cElkIGFuZCB0YXJnZXQgcHJvcGVydHku Ci0gICAgV0VCS0lUX0VYUE9SVCBzdGF0aWMgV2ViQW5pbWF0aW9uKiBjcmVhdGUoY29uc3QgV2Vi QW5pbWF0aW9uQ3VydmUmLCBpbnQgYW5pbWF0aW9uSWQsIGludCBncm91cElkLCBUYXJnZXRQcm9w ZXJ0eSk7CisgICAgLy8gUGFzcyBhIG5vbi16ZXJvIHZhbHVlIGZvciBhbmltYXRpb25JZCBzcGVj aWZ5IGFuIGlkIHRvIHVzZSBmb3IgdGhpcyBhbmltYXRpb24sIG90aGVyd2lzZSBvbmUgd2lsbAor ICAgIC8vIGJlIGdlbmVyYXRlZCBmb3IgeW91LgorICAgIFdFQktJVF9FWFBPUlQgc3RhdGljIFdl YkFuaW1hdGlvbiogY3JlYXRlKGNvbnN0IFdlYkFuaW1hdGlvbkN1cnZlJiwgVGFyZ2V0UHJvcGVy dHksIGludCBhbmltYXRpb25JZCA9IDApOwogCiAgICAgdmlydHVhbCB+V2ViQW5pbWF0aW9uKCkg eyB9CiAKKyAgICAvLyBBbiBpZCBpcyBlZmZlY3RpdmVseSB0aGUgYW5pbWF0aW9uJ3MgbmFtZSwg YW5kIGl0IGlzIG5vdCB1bmlxdWUuCisgICAgdmlydHVhbCBpbnQgaWQoKSA9IDA7CisKICAgICB2 aXJ0dWFsIFRhcmdldFByb3BlcnR5IHRhcmdldFByb3BlcnR5KCkgY29uc3QgPSAwOwogCiAgICAg Ly8gVGhpcyBpcyB0aGUgbnVtYmVyIG9mIHRpbWVzIHRoYXQgdGhlIGFuaW1hdGlvbiB3aWxsIHBs YXkuIElmIHRoaXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaSBiL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQppbmRleCBhNTUyNWVlNmU1ZDE0NjhhNTZkNGRjYmYx MmRlZjc1NzJkNjc2ZjgxLi5jOTczNzVhMmRhZmJmZWZmZjVmYzY3OGY1NTg3MmI4OGFjMWI2OTJm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKKysrIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5neXBpCkBAIC0zNjQ4LDggKzM2NDgsNiBAQAogICAgICAgICAgICAgJ3Bs YXRmb3JtL2dyYXBoaWNzL2NnL1BhdGhDRy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dy YXBoaWNzL2NnL1BhdHRlcm5DRy5jcHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNz L2NnL1RyYW5zZm9ybWF0aW9uTWF0cml4Q0cuY3BwJywKLSAgICAgICAgICAgICdwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25JZFZlbmRvci5jcHAnLAotICAgICAgICAgICAgJ3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvbklkVmVuZG9yLmgnLAogICAgICAgICAg ICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRpbC5j cHAnLAogICAgICAgICAgICAgJ3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlvblRy YW5zbGF0aW9uVXRpbC5oJywKICAgICAgICAgICAgICdwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9DYW52YXMyRExheWVyQnJpZGdlLmNwcCcsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25JZFZlbmRvci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25JZFZlbmRvci5jcHAK ZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDQxYWVjZWEwMzA2MGU4YTgwMTFiYTM5Zjcy MzdjNGQxOGQ4NzZmMGQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9u SWRWZW5kb3IuY3BwCisrKyAvZGV2L251bGwKQEAgLTEsNTMgKzAsMCBAQAotLyoKLSogQ29weXJp Z2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0qCi0qIFJlZGlz dHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAotKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKLSogYXJlIG1ldDoKLSoKLSogMS4gIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0qICAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu Ci0qIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlIGNvcHlyaWdodAotKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBh bmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotKiAgICAgZG9jdW1lbnRhdGlvbiBh bmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSog IAotKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVU T1JTICJBUyBJUyIgQU5EIEFOWQotKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0qIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUK LSogRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWQotKiBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUwotKiAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VS VklDRVM7Ci0qIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAotKiBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElU WSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotKiAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9G IFRIRSBVU0UgT0YKLSogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSovCi0KLSNpbmNsdWRlICJjb25maWcuaCIKLQotI2lu Y2x1ZGUgIkFuaW1hdGlvbklkVmVuZG9yLmgiCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotaW50 IEFuaW1hdGlvbklkVmVuZG9yOjpzX25leHRBbmltYXRpb25JZCA9IEZpcnN0QXZhaWxhYmxlQW5p bWF0aW9uSWQ7Ci1pbnQgQW5pbWF0aW9uSWRWZW5kb3I6OnNfbmV4dEdyb3VwSWQgPSBGaXJzdEF2 YWlsYWJsZUdyb3VwSWQ7Ci0KLWludCBBbmltYXRpb25JZFZlbmRvcjo6Z2V0TmV4dEFuaW1hdGlv bklkKCkKLXsKLSAgICBpbnQgaWQgPSBzX25leHRBbmltYXRpb25JZCsrOwotICAgIGlmIChzX25l eHRBbmltYXRpb25JZCA9PSBEb250VXNlQW5pbWF0aW9uSWQpCi0gICAgICAgIHNfbmV4dEFuaW1h dGlvbklkID0gRmlyc3RBdmFpbGFibGVBbmltYXRpb25JZDsKLQotICAgIHJldHVybiBpZDsKLX0K LQotaW50IEFuaW1hdGlvbklkVmVuZG9yOjpnZXROZXh0R3JvdXBJZCgpCi17Ci0gICAgaW50IGlk ID0gc19uZXh0R3JvdXBJZCsrOwotICAgIGlmIChzX25leHRHcm91cElkID09IERvbnRVc2VHcm91 cElkKQotICAgICAgICBzX25leHRHcm91cElkID0gRmlyc3RBdmFpbGFibGVHcm91cElkOwotCi0g ICAgcmV0dXJuIGlkOwotfQotCi19IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25JZFZlbmRv ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9u SWRWZW5kb3IuaApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNjlhNDM1MzJlZGRlNmJj ODI3Njk1NjVlMGE0ZWJmOWE0YjIwNDc0Yy4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9BbmltYXRpb25JZFZlbmRvci5oCisrKyAvZGV2L251bGwKQEAgLTEsNDYgKzAsMCBAQAotLyoK LSAgMiAgKiBDb3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KLSAgMyAgKgotKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHBy b3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0qIGFyZSBtZXQ6Ci0qCi0qIDEu ICBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNv cHlyaWdodAotKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgotKiAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSogICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSog ICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRo ZSBkaXN0cmlidXRpb24uCi0qICAKLSogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBM RSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKLSogRVhQUkVTUyBPUiBJTVBM SUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElF RAotKiBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSIFBVUlBPU0UgQVJFCi0qIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExF IE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKLSogRElSRUNULCBJTkRJUkVD VCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMKLSogKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJT VElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOwotKiBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQKLSogT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKLSogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCi0qIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCi0qLwotCi0jaWZuZGVm IEFuaW1hdGlvbklkVmVuZG9yX2gKLSNkZWZpbmUgQW5pbWF0aW9uSWRWZW5kb3JfaAotCi1uYW1l c3BhY2UgV2ViQ29yZSB7Ci0KLWNsYXNzIEFuaW1hdGlvbklkVmVuZG9yIHsKLXB1YmxpYzoKLSAg ICBlbnVtIEFuaW1hdGlvbklkU2VxdWVuY2UgeyBEb250VXNlQW5pbWF0aW9uSWQgPSAwLCBMaW5r SGlnaGxpZ2h0QW5pbWF0aW9uSWQsIEZpcnN0QXZhaWxhYmxlQW5pbWF0aW9uSWQgfTsKLSAgICBl bnVtIEdyb3VwSWRTZXF1ZW5jZSB7IERvbnRVc2VHcm91cElkID0gMCwgRmlyc3RBdmFpbGFibGVH cm91cElkIH07Ci0KLSAgICBzdGF0aWMgaW50IGdldE5leHRBbmltYXRpb25JZCgpOwotICAgIHN0 YXRpYyBpbnQgZ2V0TmV4dEdyb3VwSWQoKTsKLQotcHJpdmF0ZToKLSAgICBzdGF0aWMgaW50IHNf bmV4dEFuaW1hdGlvbklkOwotICAgIHN0YXRpYyBpbnQgc19uZXh0R3JvdXBJZDsKLX07Ci0KLX0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKLQotI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25UcmFuc2xhdGlvblV0aWwuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9uVHJh bnNsYXRpb25VdGlsLmNwcAppbmRleCA4MDY0YWUzOGVkMjA2N2YxMzA1MTU5N2Y0YjY5Nzk0ZmM0 MmZhZDRhLi41YjRmOTk3ZjNiMGJjMzFmOTUyMDc0OTk1MDUzZTc1YWNiNjk2ZDc0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9BbmltYXRpb25U cmFuc2xhdGlvblV0aWwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRpbC5jcHAKQEAgLTIxMyw3ICsyMTMsNyBA QCBib29sIGFwcGVuZEtleWZyYW1lV2l0aEN1c3RvbUJlemllclRpbWluZ0Z1bmN0aW9uPFRyYW5z Zm9ybUFuaW1hdGlvblZhbHVlLCBXZWJUcgogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgVmFsdWUsIGNs YXNzIEtleWZyYW1lLCBjbGFzcyBDdXJ2ZT4KLVBhc3NPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRp b24+IGNyZWF0ZVdlYkFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVMaXN0 LCBjb25zdCBBbmltYXRpb24qIGFuaW1hdGlvbiwgc2l6ZV90IGFuaW1hdGlvbklkLCBzaXplX3Qg Z3JvdXBJZCwgZG91YmxlIHRpbWVPZmZzZXQsIFdlYktpdDo6V2ViQW5pbWF0aW9uOjpUYXJnZXRQ cm9wZXJ0eSB0YXJnZXRQcm9wZXJ0eSwgY29uc3QgRmxvYXRTaXplJiBib3hTaXplKQorUGFzc093 blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtleWZy YW1lVmFsdWVMaXN0JiB2YWx1ZUxpc3QsIGNvbnN0IEFuaW1hdGlvbiogYW5pbWF0aW9uLCBpbnQg YW5pbWF0aW9uSWQsIGRvdWJsZSB0aW1lT2Zmc2V0LCBXZWJLaXQ6OldlYkFuaW1hdGlvbjo6VGFy Z2V0UHJvcGVydHkgdGFyZ2V0UHJvcGVydHksIGNvbnN0IEZsb2F0U2l6ZSYgYm94U2l6ZSkKIHsK ICAgICBib29sIGFsdGVybmF0ZSA9IGZhbHNlOwogICAgIGJvb2wgcmV2ZXJzZSA9IGZhbHNlOwpA QCAtMjg0LDcgKzI4NCw3IEBAIFBhc3NPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRpb24+IGNyZWF0 ZVdlYkFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsCiAgICAgICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKLSAgICBPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRpb24+ IGFuaW0oYWRvcHRQdHIoV2ViS2l0OjpXZWJBbmltYXRpb246OmNyZWF0ZSgqY3VydmUsIGFuaW1h dGlvbklkLCBncm91cElkLCB0YXJnZXRQcm9wZXJ0eSkpKTsKKyAgICBPd25QdHI8V2ViS2l0OjpX ZWJBbmltYXRpb24+IGFuaW0oYWRvcHRQdHIoV2ViS2l0OjpXZWJBbmltYXRpb246OmNyZWF0ZSgq Y3VydmUsIHRhcmdldFByb3BlcnR5LCBhbmltYXRpb25JZCkpKTsKIAogICAgIGludCBpdGVyYXRp b25zID0gKGFuaW1hdGlvbiAmJiBhbmltYXRpb24tPmlzSXRlcmF0aW9uQ291bnRTZXQoKSkgPyBh bmltYXRpb24tPml0ZXJhdGlvbkNvdW50KCkgOiAxOwogICAgIGFuaW0tPnNldEl0ZXJhdGlvbnMo aXRlcmF0aW9ucyk7CkBAIC0yOTYsMTMgKzI5NiwxMyBAQCBQYXNzT3duUHRyPFdlYktpdDo6V2Vi QW5pbWF0aW9uPiBjcmVhdGVXZWJBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZh bAogICAgIHJldHVybiBhbmltLnJlbGVhc2UoKTsKIH0KIAotUGFzc093blB0cjxXZWJLaXQ6Oldl YkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2 YWx1ZXMsIGNvbnN0IEFuaW1hdGlvbiogYW5pbWF0aW9uLCBzaXplX3QgYW5pbWF0aW9uSWQsIHNp emVfdCBncm91cElkLCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgRmxvYXRTaXplJiBib3hTaXpl KQorUGFzc093blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4gY3JlYXRlV2ViQW5pbWF0aW9uKGNv bnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZXMsIGNvbnN0IEFuaW1hdGlvbiogYW5pbWF0aW9u LCBpbnQgYW5pbWF0aW9uSWQsIGRvdWJsZSB0aW1lT2Zmc2V0LCBjb25zdCBGbG9hdFNpemUmIGJv eFNpemUpCiB7CiAgICAgaWYgKHZhbHVlcy5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVydHlX ZWJraXRUcmFuc2Zvcm0pCi0gICAgICAgIHJldHVybiBjcmVhdGVXZWJBbmltYXRpb248VHJhbnNm b3JtQW5pbWF0aW9uVmFsdWUsIFdlYlRyYW5zZm9ybUtleWZyYW1lLCBXZWJUcmFuc2Zvcm1Bbmlt YXRpb25DdXJ2ZT4odmFsdWVzLCBhbmltYXRpb24sIGFuaW1hdGlvbklkLCBncm91cElkLCB0aW1l T2Zmc2V0LCBXZWJLaXQ6OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlUcmFuc2Zvcm0sIEZs b2F0U2l6ZShib3hTaXplKSk7CisgICAgICAgIHJldHVybiBjcmVhdGVXZWJBbmltYXRpb248VHJh bnNmb3JtQW5pbWF0aW9uVmFsdWUsIFdlYlRyYW5zZm9ybUtleWZyYW1lLCBXZWJUcmFuc2Zvcm1B bmltYXRpb25DdXJ2ZT4odmFsdWVzLCBhbmltYXRpb24sIGFuaW1hdGlvbklkLCB0aW1lT2Zmc2V0 LCBXZWJLaXQ6OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlUcmFuc2Zvcm0sIEZsb2F0U2l6 ZShib3hTaXplKSk7CiAKICAgICBpZiAodmFsdWVzLnByb3BlcnR5KCkgPT0gQW5pbWF0ZWRQcm9w ZXJ0eU9wYWNpdHkpCi0gICAgICAgIHJldHVybiBjcmVhdGVXZWJBbmltYXRpb248RmxvYXRBbmlt YXRpb25WYWx1ZSwgV2ViRmxvYXRLZXlmcmFtZSwgV2ViRmxvYXRBbmltYXRpb25DdXJ2ZT4odmFs dWVzLCBhbmltYXRpb24sIGFuaW1hdGlvbklkLCBncm91cElkLCB0aW1lT2Zmc2V0LCBXZWJLaXQ6 OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVydHlPcGFjaXR5LCBGbG9hdFNpemUoKSk7CisgICAg ICAgIHJldHVybiBjcmVhdGVXZWJBbmltYXRpb248RmxvYXRBbmltYXRpb25WYWx1ZSwgV2ViRmxv YXRLZXlmcmFtZSwgV2ViRmxvYXRBbmltYXRpb25DdXJ2ZT4odmFsdWVzLCBhbmltYXRpb24sIGFu aW1hdGlvbklkLCB0aW1lT2Zmc2V0LCBXZWJLaXQ6OldlYkFuaW1hdGlvbjo6VGFyZ2V0UHJvcGVy dHlPcGFjaXR5LCBGbG9hdFNpemUoKSk7CiAKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0FuaW1hdGlv blRyYW5zbGF0aW9uVXRpbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsLmgKaW5kZXggNWQ4OGEyZWQ4MzVhNzdlOWM2 YzkxYWIwYWFlNmM3Nzc0NGExZDg2NC4uODczOWFiNzZhYmYxODJlMWIyMTk0OWIwYjNiOWFlYjE1 YzlmZmRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsLmgKQEAgLTQ5 LDcgKzQ5LDcgQEAgY2xhc3MgRmxvYXRTaXplOwogLy8gICAtIGEgc3RlcHMgdGltaW5nIGZ1bmN0 aW9uIGlzIHVzZWQsCiAvLyAgIC0gYSBwcm9wZXJ0eSBvdGhlciB0aGFuIEFuaW1hdGVkUHJvcGVy dHlXZWJraXRUcmFuc2Zvcm0sIG9yIEFuaW1hdGVkUHJvcGVydHlPcGFjaXR5IGlzIGFuaW1hdGVk LCBvcgogLy8gICAtIGEgdHJhbnNmb3JtIGFuaW1hdGlvbiBpbnZvbHZlcyBhIG5vbi1pbnZlcnRh YmxlIHRyYW5zZm9ybS4KLVBhc3NPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRpb24+IGNyZWF0ZVdl YkFuaW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYsIGNvbnN0IEFuaW1hdGlvbiosIHNp emVfdCBhbmltYXRpb25JZCwgc2l6ZV90IGdyb3VwSWQsIGRvdWJsZSB0aW1lT2Zmc2V0LCBjb25z dCBGbG9hdFNpemUmIGJveFNpemUpOworUGFzc093blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlvbj4g Y3JlYXRlV2ViQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiwgY29uc3QgQW5pbWF0 aW9uKiwgaW50IGFuaW1hdGlvbklkLCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgRmxvYXRTaXpl JiBib3hTaXplKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hyb21p dW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR3JhcGhp Y3NMYXllckNocm9taXVtLmNwcAppbmRleCBjZjQ0MzViZGExOGZkMDJlYWU4OTY1MGVmMDgwNDQx MDY5ZjVhNDVjLi43NjVlNDUwOThlZDIzMjFhMWU0OWFjMmM4MWM1NTVkMTkzMjk2YmJjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGlj c0xheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQ1LDcgKzQ1LDYgQEAKIAog I2luY2x1ZGUgIkdyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oIgogCi0jaW5jbHVkZSAiQW5pbWF0aW9u SWRWZW5kb3IuaCIKICNpbmNsdWRlICJBbmltYXRpb25UcmFuc2xhdGlvblV0aWwuaCIKICNpbmNs dWRlICJDb250ZW50TGF5ZXJDaHJvbWl1bS5oIgogI2luY2x1ZGUgIkZsb2F0Q29udmVyc2lvbi5o IgpAQCAtNTI4LDEyICs1MjcsMTcgQEAgYm9vbCBHcmFwaGljc0xheWVyQ2hyb21pdW06OmFkZEFu aW1hdGlvbihjb25zdCBLZXlmcmFtZVZhbHVlTGlzdCYgdmFsdWVzLCBjb25zdAogewogICAgIHBs YXRmb3JtTGF5ZXIoKS0+c2V0QW5pbWF0aW9uRGVsZWdhdGUodGhpcyk7CiAKLSAgICBpbnQgYW5p bWF0aW9uSWQgPSBtYXBBbmltYXRpb25OYW1lVG9JZChhbmltYXRpb25OYW1lKTsKLSAgICBpbnQg Z3JvdXBJZCA9IEFuaW1hdGlvbklkVmVuZG9yOjpnZXROZXh0R3JvdXBJZCgpOworICAgIGludCBh bmltYXRpb25JZCA9IDA7CiAKLSAgICBPd25QdHI8V2ViS2l0OjpXZWJBbmltYXRpb24+IHRvQWRk KGNyZWF0ZVdlYkFuaW1hdGlvbih2YWx1ZXMsIGFuaW1hdGlvbiwgYW5pbWF0aW9uSWQsIGdyb3Vw SWQsIHRpbWVPZmZzZXQsIGJveFNpemUpKTsKKyAgICBpZiAobV9hbmltYXRpb25JZE1hcC5jb250 YWlucyhhbmltYXRpb25OYW1lKSkKKyAgICAgICAgYW5pbWF0aW9uSWQgPSBtX2FuaW1hdGlvbklk TWFwLmdldChhbmltYXRpb25OYW1lKTsKKworICAgIE93blB0cjxXZWJLaXQ6OldlYkFuaW1hdGlv bj4gdG9BZGQoY3JlYXRlV2ViQW5pbWF0aW9uKHZhbHVlcywgYW5pbWF0aW9uLCBhbmltYXRpb25J ZCwgdGltZU9mZnNldCwgYm94U2l6ZSkpOwogCiAgICAgaWYgKHRvQWRkKSB7CisgICAgICAgIGFu aW1hdGlvbklkID0gdG9BZGQtPmlkKCk7CisgICAgICAgIG1fYW5pbWF0aW9uSWRNYXAuc2V0KGFu aW1hdGlvbk5hbWUsIGFuaW1hdGlvbklkKTsKKwogICAgICAgICAvLyBSZW1vdmUgYW55IGV4aXN0 aW5nIGFuaW1hdGlvbnMgd2l0aCB0aGUgc2FtZSBhbmltYXRpb24gaWQgYW5kIHRhcmdldCBwcm9w ZXJ0eS4KICAgICAgICAgcGxhdGZvcm1MYXllcigpLT5yZW1vdmVBbmltYXRpb24oYW5pbWF0aW9u SWQsIHRvQWRkLT50YXJnZXRQcm9wZXJ0eSgpKTsKICAgICAgICAgcmV0dXJuIHBsYXRmb3JtTGF5 ZXIoKS0+YWRkQW5pbWF0aW9uKHRvQWRkLmdldCgpKTsKQEAgLTU0NCwxMiArNTQ4LDE0IEBAIGJv b2wgR3JhcGhpY3NMYXllckNocm9taXVtOjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVWYWx1 ZUxpc3QmIHZhbHVlcywgY29uc3QKIAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnBhdXNl QW5pbWF0aW9uKGNvbnN0IFN0cmluZyYgYW5pbWF0aW9uTmFtZSwgZG91YmxlIHRpbWVPZmZzZXQp CiB7Ci0gICAgcGxhdGZvcm1MYXllcigpLT5wYXVzZUFuaW1hdGlvbihtYXBBbmltYXRpb25OYW1l VG9JZChhbmltYXRpb25OYW1lKSwgdGltZU9mZnNldCk7CisgICAgaWYgKG1fYW5pbWF0aW9uSWRN YXAuY29udGFpbnMoYW5pbWF0aW9uTmFtZSkpCisgICAgICAgIHBsYXRmb3JtTGF5ZXIoKS0+cGF1 c2VBbmltYXRpb24obV9hbmltYXRpb25JZE1hcC5nZXQoYW5pbWF0aW9uTmFtZSksIHRpbWVPZmZz ZXQpOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5ZXJDaHJvbWl1bTo6cmVtb3ZlQW5pbWF0aW9uKGNv bnN0IFN0cmluZyYgYW5pbWF0aW9uTmFtZSkKIHsKLSAgICBwbGF0Zm9ybUxheWVyKCktPnJlbW92 ZUFuaW1hdGlvbihtYXBBbmltYXRpb25OYW1lVG9JZChhbmltYXRpb25OYW1lKSk7CisgICAgaWYg KG1fYW5pbWF0aW9uSWRNYXAuY29udGFpbnMoYW5pbWF0aW9uTmFtZSkpCisgICAgICAgIHBsYXRm b3JtTGF5ZXIoKS0+cmVtb3ZlQW5pbWF0aW9uKG1fYW5pbWF0aW9uSWRNYXAuZ2V0KGFuaW1hdGlv bk5hbWUpKTsKIH0KIAogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06OnN1c3BlbmRBbmltYXRp b25zKGRvdWJsZSB3YWxsQ2xvY2tUaW1lKQpAQCAtODMyLDE3ICs4MzgsNiBAQCB2b2lkIEdyYXBo aWNzTGF5ZXJDaHJvbWl1bTo6cGFpbnQoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBJ bnRSZWN0JiBjbGlwKQogICAgIHBhaW50R3JhcGhpY3NMYXllckNvbnRlbnRzKGNvbnRleHQsIGNs aXApOwogfQogCi1pbnQgR3JhcGhpY3NMYXllckNocm9taXVtOjptYXBBbmltYXRpb25OYW1lVG9J ZChjb25zdCBTdHJpbmcmIGFuaW1hdGlvbk5hbWUpCi17Ci0gICAgaWYgKGFuaW1hdGlvbk5hbWUu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gMDsKLQotICAgIGlmICghbV9hbmltYXRpb25JZE1h cC5jb250YWlucyhhbmltYXRpb25OYW1lKSkKLSAgICAgICAgbV9hbmltYXRpb25JZE1hcC5hZGQo YW5pbWF0aW9uTmFtZSwgQW5pbWF0aW9uSWRWZW5kb3I6OmdldE5leHRBbmltYXRpb25JZCgpKTsK LQotICAgIHJldHVybiBtX2FuaW1hdGlvbklkTWFwLmZpbmQoYW5pbWF0aW9uTmFtZSktPnNlY29u ZDsKLX0KLQogdm9pZCBHcmFwaGljc0xheWVyQ2hyb21pdW06Om5vdGlmeUFuaW1hdGlvblN0YXJ0 ZWQoZG91YmxlIHN0YXJ0VGltZSkKIHsKICAgICBpZiAobV9jbGllbnQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HcmFwaGljc0xheWVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBo aWNzTGF5ZXJDaHJvbWl1bS5oCmluZGV4IDRmYzhkMWNmZGYyZjczN2Q1ODlhNTI2Mzg4ZWI2ZDQ1 OGEwYzc4OTkuLjA1OTVmYWQwMWIzMzEwODgyZWE0YmU5NmUwMmMwODRjNmQ5ZGQxOWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dyYXBoaWNz TGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0dyYXBoaWNzTGF5ZXJDaHJvbWl1bS5oCkBAIC0xNzIsOCArMTcyLDYgQEAgcHJpdmF0 ZToKICAgICB2b2lkIHNldENvbnRlbnRzVG8oQ29udGVudHNMYXllclB1cnBvc2UsIFdlYktpdDo6 V2ViTGF5ZXIqKTsKICAgICB2b2lkIHNldHVwQ29udGVudHNMYXllcihXZWJLaXQ6OldlYkxheWVy Kik7CiAKLSAgICBpbnQgbWFwQW5pbWF0aW9uTmFtZVRvSWQoY29uc3QgU3RyaW5nJiBhbmltYXRp b25OYW1lKTsKLQogICAgIFN0cmluZyBtX25hbWVCYXNlOwogCiAgICAgT3duUHRyPFdlYktpdDo6 V2ViQ29udGVudExheWVyPiBtX2xheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQW5pbWF0aW9uSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJBbmltYXRpb25JbXBsLmNwcAppbmRleCBlNWQ5ZWYyYTMxNmRhN2IzMjQxMGMzNWZkMGIx OWZjMGQzN2Q3ZTg0Li4xMTBkYTc0MjE2ZTJjZTYxZjA3MTA2YTJiYzUzZGUyNjcxNmIzNGNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBbmltYXRpb25JbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBbmltYXRpb25JbXBsLmNwcApA QCAtMjYsNyArMjYsNiBAQAogCiAjaW5jbHVkZSAiV2ViQW5pbWF0aW9uSW1wbC5oIgogCi0jaW5j bHVkZSAiQW5pbWF0aW9uSWRWZW5kb3IuaCIKICNpbmNsdWRlICJDQ0FjdGl2ZUFuaW1hdGlvbi5o IgogI2luY2x1ZGUgIkNDQW5pbWF0aW9uQ3VydmUuaCIKICNpbmNsdWRlICJXZWJGbG9hdEFuaW1h dGlvbkN1cnZlSW1wbC5oIgpAQCAtMzYsMjIgKzM1LDE4IEBACiAjaW5jbHVkZSA8d3RmL093blB0 ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAKLXVzaW5nIFdlYkNvcmU6OkFuaW1h dGlvbklkVmVuZG9yOwogdXNpbmcgV2ViQ29yZTo6Q0NBY3RpdmVBbmltYXRpb247CiAKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1XZWJBbmltYXRpb24qIFdlYkFuaW1hdGlvbjo6Y3JlYXRlKGNvbnN0 IFdlYkFuaW1hdGlvbkN1cnZlJiBjdXJ2ZSwgVGFyZ2V0UHJvcGVydHkgdGFyZ2V0UHJvcGVydHkp CitXZWJBbmltYXRpb24qIFdlYkFuaW1hdGlvbjo6Y3JlYXRlKGNvbnN0IFdlYkFuaW1hdGlvbkN1 cnZlJiBjdXJ2ZSwgVGFyZ2V0UHJvcGVydHkgdGFyZ2V0UHJvcGVydHksIGludCBhbmltYXRpb25J ZCkKIHsKLSAgICByZXR1cm4gV2ViQW5pbWF0aW9uOjpjcmVhdGUoY3VydmUsIEFuaW1hdGlvbklk VmVuZG9yOjpnZXROZXh0QW5pbWF0aW9uSWQoKSwgQW5pbWF0aW9uSWRWZW5kb3I6OmdldE5leHRH cm91cElkKCksIHRhcmdldFByb3BlcnR5KTsKKyAgICBzdGF0aWMgaW50IG5leHRHcm91cElkID0g MTsKKyAgICBzdGF0aWMgaW50IG5leHRBbmltYXRpb25JZCA9IDE7CisgICAgcmV0dXJuIG5ldyBX ZWJBbmltYXRpb25JbXBsKGN1cnZlLCB0YXJnZXRQcm9wZXJ0eSwgYW5pbWF0aW9uSWQgPyBhbmlt YXRpb25JZCA6IG5leHRBbmltYXRpb25JZCsrLCBuZXh0R3JvdXBJZCsrKTsKIH0KIAotV2ViQW5p bWF0aW9uKiBXZWJBbmltYXRpb246OmNyZWF0ZShjb25zdCBXZWJBbmltYXRpb25DdXJ2ZSYgY3Vy dmUsIGludCBhbmltYXRpb25JZCwgaW50IGdyb3VwSWQsIFRhcmdldFByb3BlcnR5IHRhcmdldFBy b3BlcnR5KQotewotICAgIHJldHVybiBuZXcgV2ViQW5pbWF0aW9uSW1wbChjdXJ2ZSwgYW5pbWF0 aW9uSWQsIGdyb3VwSWQsIHRhcmdldFByb3BlcnR5KTsKLX0KLQotV2ViQW5pbWF0aW9uSW1wbDo6 V2ViQW5pbWF0aW9uSW1wbChjb25zdCBXZWJBbmltYXRpb25DdXJ2ZSYgd2ViQ3VydmUsIGludCBh bmltYXRpb25JZCwgaW50IGdyb3VwSWQsIFRhcmdldFByb3BlcnR5IHRhcmdldFByb3BlcnR5KQor V2ViQW5pbWF0aW9uSW1wbDo6V2ViQW5pbWF0aW9uSW1wbChjb25zdCBXZWJBbmltYXRpb25DdXJ2 ZSYgd2ViQ3VydmUsIFRhcmdldFByb3BlcnR5IHRhcmdldFByb3BlcnR5LCBpbnQgYW5pbWF0aW9u SWQsIGludCBncm91cElkKQogewogICAgIFdlYkFuaW1hdGlvbkN1cnZlOjpBbmltYXRpb25DdXJ2 ZVR5cGUgY3VydmVUeXBlID0gd2ViQ3VydmUudHlwZSgpOwogICAgIE93blB0cjxXZWJDb3JlOjpD Q0FuaW1hdGlvbkN1cnZlPiBjdXJ2ZTsKQEAgLTc0LDYgKzY5LDExIEBAIFdlYkFuaW1hdGlvbklt cGw6On5XZWJBbmltYXRpb25JbXBsKCkKIHsKIH0KIAoraW50IFdlYkFuaW1hdGlvbkltcGw6Omlk KCkKK3sKKyAgICByZXR1cm4gbV9hbmltYXRpb24tPmlkKCk7Cit9CisKIFdlYkFuaW1hdGlvbjo6 VGFyZ2V0UHJvcGVydHkgV2ViQW5pbWF0aW9uSW1wbDo6dGFyZ2V0UHJvcGVydHkoKSBjb25zdAog ewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJBbmltYXRpb25JbXBsOjpUYXJnZXRQcm9wZXJ0 eT4obV9hbmltYXRpb24tPnRhcmdldFByb3BlcnR5KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViQW5pbWF0aW9uSW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQW5pbWF0aW9uSW1wbC5oCmluZGV4IGQ3Y2ViYTUxZjc4MThkNTI1YTk2OTFj YzA2YTY1NmQ0YzVjMjYwZjcuLjZjYTEwYWQ4YzI3OGJkYmY4NGYwZGU5ZDY0ZjYzNjkwZjIwN2U3 MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkFuaW1hdGlvbklt cGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBbmltYXRpb25JbXBsLmgK QEAgLTM3LDEwICszNywxMSBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViQW5pbWF0 aW9uSW1wbCA6IHB1YmxpYyBXZWJBbmltYXRpb24gewogcHVibGljOgotICAgIFdlYkFuaW1hdGlv bkltcGwoY29uc3QgV2ViQW5pbWF0aW9uQ3VydmUmLCBpbnQgYW5pbWF0aW9uSWQsIGludCBncm91 cElkLCBUYXJnZXRQcm9wZXJ0eSk7CisgICAgV2ViQW5pbWF0aW9uSW1wbChjb25zdCBXZWJBbmlt YXRpb25DdXJ2ZSYsIFRhcmdldFByb3BlcnR5LCBpbnQgYW5pbWF0aW9uSWQsIGludCBncm91cElk KTsKICAgICB2aXJ0dWFsIH5XZWJBbmltYXRpb25JbXBsKCk7CiAKICAgICAvLyBXZWJBbmltYXRp b24gaW1wbGVtZW50YXRpb24KKyAgICB2aXJ0dWFsIGludCBpZCgpIE9WRVJSSURFOwogICAgIHZp cnR1YWwgVGFyZ2V0UHJvcGVydHkgdGFyZ2V0UHJvcGVydHkoKSBjb25zdCBPVkVSUklERTsKICAg ICB2aXJ0dWFsIGludCBpdGVyYXRpb25zKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIHNldEl0ZXJhdGlvbnMoaW50KSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsVGVzdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0FuaW1hdGlvblRyYW5zbGF0aW9uVXRpbFRlc3QuY3Bw CmluZGV4IDcwZGE2NWVmNjVlOGFhYjM4NTVmNDhhZmM1YjQ5ZDI4MjJjMzkxNDguLjdmNjNlMWY3 M2QyZTY3OWY0MDgwOWEyZmRmNGI1MzdhNzEzZmIxNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvQW5pbWF0aW9uVHJhbnNsYXRpb25VdGlsVGVzdC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9BbmltYXRpb25UcmFuc2xhdGlvblV0aWxUZXN0 LmNwcApAQCAtNDUsNyArNDUsNyBAQCBuYW1lc3BhY2UgewogYm9vbCBhbmltYXRpb25DYW5CZVRy YW5zbGF0ZWQoY29uc3QgS2V5ZnJhbWVWYWx1ZUxpc3QmIHZhbHVlcywgQW5pbWF0aW9uKiBhbmlt YXRpb24pCiB7CiAgICAgSW50U2l6ZSBib3hTaXplOwotICAgIHJldHVybiBjcmVhdGVXZWJBbmlt YXRpb24odmFsdWVzLCBhbmltYXRpb24sIDAsIDAsIDAsIGJveFNpemUpOworICAgIHJldHVybiBj cmVhdGVXZWJBbmltYXRpb24odmFsdWVzLCBhbmltYXRpb24sIDAsIDAsIGJveFNpemUpOwogfQog CiBURVNUKEFuaW1hdGlvblRyYW5zbGF0aW9uVXRpbFRlc3QsIGNyZWF0ZU9wYWNpdHlBbmltYXRp b24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0dyYXBoaWNzTGF5 ZXJDaHJvbWl1bVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9HcmFwaGlj c0xheWVyQ2hyb21pdW1UZXN0LmNwcAppbmRleCBjMGE5Y2YyZWY1ZmI0YjA1Y2YwZTY5MDFmMzNi ZWFhNTJjYjQwNmQ1Li40MGRmMjc5OTJjMzE3ZjRhMjU2NmRlNzVkOGI1MTM0NDFmMjFhMmRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0dyYXBoaWNzTGF5ZXJDaHJv bWl1bVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvR3JhcGhpY3NM YXllckNocm9taXVtVGVzdC5jcHAKQEAgLTk4LDcgKzk4LDggQEAgVEVTVF9GKEdyYXBoaWNzTGF5 ZXJDaHJvbWl1bVRlc3QsIHVwZGF0ZUxheWVyUHJlc2VydmVzM0RXaXRoQW5pbWF0aW9ucykKIAog ICAgIE93blB0cjxXZWJGbG9hdEFuaW1hdGlvbkN1cnZlPiBjdXJ2ZSA9IGFkb3B0UHRyKFdlYkZs b2F0QW5pbWF0aW9uQ3VydmU6OmNyZWF0ZSgpKTsKICAgICBjdXJ2ZS0+YWRkKFdlYkZsb2F0S2V5 ZnJhbWUoMC4wLCAwLjApKTsKLSAgICBPd25QdHI8V2ViQW5pbWF0aW9uPiBmbG9hdEFuaW1hdGlv bihhZG9wdFB0cihXZWJBbmltYXRpb246OmNyZWF0ZSgqY3VydmUsIDEsIDEsIFdlYkFuaW1hdGlv bjo6VGFyZ2V0UHJvcGVydHlPcGFjaXR5KSkpOworICAgIE93blB0cjxXZWJBbmltYXRpb24+IGZs b2F0QW5pbWF0aW9uKGFkb3B0UHRyKFdlYkFuaW1hdGlvbjo6Y3JlYXRlKCpjdXJ2ZSwgV2ViQW5p bWF0aW9uOjpUYXJnZXRQcm9wZXJ0eU9wYWNpdHkpKSk7CisgICAgaW50IGFuaW1hdGlvbklkID0g ZmxvYXRBbmltYXRpb24tPmlkKCk7CiAgICAgQVNTRVJUX1RSVUUobV9wbGF0Zm9ybUxheWVyLT5h ZGRBbmltYXRpb24oZmxvYXRBbmltYXRpb24uZ2V0KCkpKTsKIAogICAgIEFTU0VSVF9UUlVFKG1f cGxhdGZvcm1MYXllci0+aGFzQWN0aXZlQW5pbWF0aW9uKCkpOwpAQCAtMTA5LDcgKzExMCw3IEBA IFRFU1RfRihHcmFwaGljc0xheWVyQ2hyb21pdW1UZXN0LCB1cGRhdGVMYXllclByZXNlcnZlczNE V2l0aEFuaW1hdGlvbnMpCiAgICAgQVNTRVJUX1RSVUUobV9wbGF0Zm9ybUxheWVyKTsKIAogICAg IEFTU0VSVF9UUlVFKG1fcGxhdGZvcm1MYXllci0+aGFzQWN0aXZlQW5pbWF0aW9uKCkpOwotICAg IG1fcGxhdGZvcm1MYXllci0+cmVtb3ZlQW5pbWF0aW9uKDEpOworICAgIG1fcGxhdGZvcm1MYXll ci0+cmVtb3ZlQW5pbWF0aW9uKGFuaW1hdGlvbklkKTsKICAgICBBU1NFUlRfRkFMU0UobV9wbGF0 Zm9ybUxheWVyLT5oYXNBY3RpdmVBbmltYXRpb24oKSk7CiAKICAgICBtX2dyYXBoaWNzTGF5ZXIt PnNldFByZXNlcnZlczNEKGZhbHNlKTsK