92928 2012-08-01 18:08:09 -0700 [chromium] Use new-style tracing macros with explicit category 2012-08-01 22:26:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr abarth cc-bugs enne haraken japhet jbates nduca senorblanco webkit.review.bot oldest_to_newest 684832 0 jamesr 2012-08-01 18:08:09 -0700 [chromium] Use new-style tracing macros with explicit category 684833 1 155939 jamesr 2012-08-01 18:10:09 -0700 Created attachment 155939 Patch 684834 2 jamesr 2012-08-01 18:10:50 -0700 This is to have better category data for trace data originating in WebKit and to have better compatibility with chromium code. 684836 3 155939 abarth 2012-08-01 18:13:19 -0700 Comment on attachment 155939 Patch ok 684901 4 155939 webkit.review.bot 2012-08-01 19:29:56 -0700 Comment on attachment 155939 Patch Clearing flags on attachment: 155939 Committed r124400: <http://trac.webkit.org/changeset/124400> 684903 5 webkit.review.bot 2012-08-01 19:30:01 -0700 All reviewed patches have been landed. Closing bug. 684979 6 nduca 2012-08-01 22:26:45 -0700 Thank you! 155939 2012-08-01 18:10:09 -0700 2012-08-01 19:29:56 -0700 Patch bug-92928-20120801180951.patch text/plain 16497 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Mzk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjY5ZDg5MzVjNGU4Mjgx OWFiODQ0OGYwNWEwYmNhN2YyY2MwZDdiZi4uNmFhNTY0NzRkNmU0NTk4NTM4MTZkOGY4YjIzYWI1 MGI2M2FkNWY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA4LTAxICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBV c2UgbmV3LXN0eWxlIHRyYWNpbmcgbWFjcm9zIHdpdGggZXhwbGljaXQgY2F0ZWdvcnkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyOTI4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNocm9taXVtIHRy YWNpbmcgc3lzdGVtIHN1cHBvcnRzIHVzaW5nIGEgc3RyaW5nIGlkZW50aWZpZXIgZm9yIHRyYWNl IGNhdGVnb3JpZXMgdGhhdCBjYW4gYmUgdXNlZCB0byBmaWx0ZXIKKyAgICAgICAgZXZlbnRzLiBU aGlzIHN3aXRjaGVzIG92ZXIgdG8gc2V0dGluZyBhbiBleHBsaWNpdCBjYXRlZ29yeSBmb3IgYWxs IHRyYWNlcyBhbmQgcmVtb3ZlcyB0aGUgb2xkLXN0eWxlCisgICAgICAgIFRSQUNFX0VWRU5UKCkg bWFjcm8uCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9TY2hlZHVsZWRBY3Rpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2NoZWR1bGVkQWN0aW9uOjpleGVjdXRlKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxBbmltYXRvck5vbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5p bWF0b3JOb25lOjpzY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JOb25l OjphbmltYXRpb25UaW1lckZpcmVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9UcmFj ZUV2ZW50Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUHJvZ3JhbUJp bmRpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3JhbUJpbmRpbmdCYXNlOjppbml0KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpkcmF3UmVzYW1wbGVkQml0bWFwKToKKyAgICAgICAgKFdlYkNvcmU6OnBhaW50 U2tCaXRtYXApOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2U6OmRyYXdQYXR0ZXJuKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpOYXRpdmVJbWFnZVNraWE6OnJlc2l6ZWRCaXRtYXApOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpiaXRtYXApOgorICAgICAgICAqIHBsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL2JtcC9CTVBJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Qk1QSW1hZ2VEZWNvZGVyOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0lGSW1h Z2VEZWNvZGVyOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2lj by9JQ09JbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SUNPSW1hZ2VEZWNvZGVy OjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0lt YWdlRGVjb2Rlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VEZWNvZGVyOjpkZWNv ZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3BuZy9QTkdJbWFnZURlY29k ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UE5HSW1hZ2VEZWNvZGVyOjpkZWNvZGUpOgorICAg ICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VCUEltYWdlRGVjb2Rlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpXRUJQSW1hZ2VEZWNvZGVyOjpkZWNvZGUpOgorCiAyMDEyLTA4 LTAxICBBbnRvaW5lIExhYm91ciAgPHBpbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hy b21pdW1dIGZhY3RvciBvdXQgdGhlIG9wdGltaXphdGlvbiBwYXNzIGluIENDUmVuZGVyU3VyZmFj ZUZpbHRlcnM6OmFwcGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGEzYTY4MWVkMTcz MDllMjk4ODEzZjQ0MjE5MWUxZGE3YjIxOTA3NjkuLmZiNWQzMGYwYTFmZjI0ZjUzOWMxOWQxNGZk YjY5NzdlZDA1Zjk1MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDgtMDEgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbY2hyb21pdW1dIFVzZSBuZXctc3R5bGUgdHJhY2luZyBtYWNyb3Mgd2l0aCBleHBs aWNpdCBjYXRlZ29yeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTI5MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBTZXQgdGhlIGNhdGVnb3J5IGV4cGxpY2l0bHkgaW4gdHJhY2VzLgorCisgICAgICAgICog c3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnVwZGF0 ZUFuaW1hdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6bGF5b3V0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNldElzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0Fj dGl2ZSk6CisKIDIwMTItMDgtMDEgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtjaHJvbWl1bV0gTWFrZSBXZWJLaXQgQVBJIHN1cHBvcnQgZHJhZ2dhYmxlIHJlZ2lv biBjaGFuZ2UgdXBkYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y2hlZHVsZWRBY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NoZWR1bGVk QWN0aW9uLmNwcAppbmRleCBjNDA2MDQ3NmI4ZjhhM2Y3Yjg2YzI3NzA1NGUyNjliNmEwNmYzZWYy Li5mNTY0NTc2YTJjMzdlMTM2NGMzNDEwZjExYWMwN2NhY2E3OGEzYTFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY2hlZHVsZWRBY3Rpb24uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjaGVkdWxlZEFjdGlvbi5jcHAKQEAgLTEyMyw3ICsxMjMs NyBAQCB2b2lkIFNjaGVkdWxlZEFjdGlvbjo6ZXhlY3V0ZShWOFByb3h5KiBwcm94eSkKICAgICAg ICAgcmV0dXJuOyAvLyBKUyBtYXkgbm90IGJlIGVuYWJsZWQuCiAKICNpZiBQTEFURk9STShDSFJP TUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiU2NoZWR1bGVkQWN0aW9uOjpleGVjdXRlIiwgdGhpcywg MCk7CisgICAgVFJBQ0VfRVZFTlQwKCJ2OCIsICJTY2hlZHVsZWRBY3Rpb246OmV4ZWN1dGUiKTsK ICNlbmRpZgogCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxBbmltYXRvck5vbmUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3JOb25lLmNwcAppbmRleCBiODA0 YTkyODE4ZTU4NDQ2NTNiNmIzODBjMjc3MGVmNDRkY2Q1NzBjLi40NWNjMWU1ODc3MzU5ZjM2MTg4 M2RkYTliYzM5OWU2ZjM5MmVmNDIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxBbmltYXRvck5vbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbEFuaW1hdG9yTm9uZS5jcHAKQEAgLTQxNyw3ICs0MTcsNyBAQCBib29sIFNjcm9sbEFuaW1h dG9yTm9uZTo6c2Nyb2xsKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aW9uLCBTY3JvbGxH cmFudWxhcgogICAgICAgICByZXR1cm4gU2Nyb2xsQW5pbWF0b3I6OnNjcm9sbChvcmllbnRhdGlv biwgZ3JhbnVsYXJpdHksIHN0ZXAsIG11bHRpcGxpZXIpOwogCiAjaWYgUExBVEZPUk0oQ0hST01J VU0pCi0gICAgVFJBQ0VfRVZFTlQoIlNjcm9sbEFuaW1hdG9yTm9uZTo6c2Nyb2xsIiwgdGhpcywg MCk7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiU2Nyb2xsQW5pbWF0b3JOb25lOjpzY3Jv bGwiKTsKICNlbmRpZgogCiAgICAgLy8gRklYTUU6IGdldCB0aGUgdHlwZSBwYXNzZWQgaW4uIE1v dXNlV2hlZWwgY291bGQgYWxzbyBiZSBieSBsaW5lLCBidXQgc2hvdWxkIHN0aWxsIGhhdmUgZGlm ZmVyZW50CkBAIC01MzIsNyArNTMyLDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvck5vbmU6OmFuaW1h dGlvblRpbWVyRmlyZWQoVGltZXI8U2Nyb2xsQW5pbWF0b3JOb25lPiogdGltZXIpCiB2b2lkIFNj cm9sbEFuaW1hdG9yTm9uZTo6YW5pbWF0aW9uVGltZXJGaXJlZCgpCiB7CiAjaWYgUExBVEZPUk0o Q0hST01JVU0pCi0gICAgVFJBQ0VfRVZFTlQoIlNjcm9sbEFuaW1hdG9yTm9uZTo6YW5pbWF0aW9u VGltZXJGaXJlZCIsIHRoaXMsIDApOworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIlNjcm9s bEFuaW1hdG9yTm9uZTo6YW5pbWF0aW9uVGltZXJGaXJlZCIpOwogI2VuZGlmCiAKICAgICBkb3Vi bGUgY3VycmVudFRpbWUgPSBXVEY6Om1vbm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOwpAQCAt NTYyLDcgKzU2Miw3IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JOb25lOjphbmltYXRpb25UaW1lckZp cmVkKCkKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCi0gICAgVFJBQ0VfRVZFTlQo IlNjcm9sbEFuaW1hdG9yTm9uZTo6bm90aWZ5UG9zaXRpb25DaGFuZ2VkIiwgdGhpcywgMCk7Cisg ICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiU2Nyb2xsQW5pbWF0b3JOb25lOjpub3RpZnlQb3Np dGlvbkNoYW5nZWQiKTsKICNlbmRpZgogICAgIG5vdGlmeVBvc2l0aW9uQ2hhbmdlZCgpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9UcmFjZUV2ZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9UcmFjZUV2ZW50LmgKaW5kZXggZjc4 NGE1OTZkZjg5NzNkZTY4MGFjNmIyNjNhYzk1ODY5YTAxMGEwZC4uODllZjg1ZWNkMjFhZWUwYWQ0 ZjY4NDdhZDEwMmNhYzIyNjAyOWZjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY2hyb21pdW0vVHJhY2VFdmVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1RyYWNlRXZlbnQuaApAQCAtMTY4LDkgKzE2OCw2IEBACiAjaW5jbHVkZSA8d3RmL0R5 bmFtaWNBbm5vdGF0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotLy8g SXNzdWVzIGJlZ2luIHRyYWNlIGV2ZW50IGhlcmUgYW5kIGVuZCB0cmFjZSBldmVudCB3aGVuIHRo ZSBjdXJyZW50IHNjb3BlIGVuZHMuCi0jZGVmaW5lIFRSQUNFX0VWRU5UKG5hbWUsIGlkLCBleHRy YSkgVFJBQ0VfRVZFTlQyKCJ3ZWJraXQiLCBuYW1lLCAiaWQiLCBpZCwgImV4dHJhIiwgZXh0cmEp Ci0KIC8vIEJ5IGRlZmF1bHQsIGNvbnN0IGNoYXIqIGFyZ3VtZW50IHZhbHVlcyBhcmUgYXNzdW1l ZCB0byBoYXZlIGxvbmctbGl2ZWQgc2NvcGUKIC8vIGFuZCB3aWxsIG5vdCBiZSBjb3BpZWQuIFVz ZSB0aGlzIG1hY3JvIHRvIGZvcmNlIGEgY29uc3QgY2hhciogdG8gYmUgY29waWVkLgogI2RlZmlu ZSBUUkFDRV9TVFJfQ09QWShzdHIpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL1Byb2dyYW1CaW5kaW5nLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1Byb2dyYW1CaW5kaW5nLmNwcAppbmRleCAxYWJj MjE4NmEzY2YwMDEyMGE2MGQ4N2QwMGU2NGFlYjBhYWVmMTJmLi4yZjZjYTIyODY1MzI0MDI2OGY5 Yzk5ZDI4MDFiNjJjNzI5YTMyNzljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9Qcm9ncmFtQmluZGluZy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUHJvZ3JhbUJpbmRpbmcuY3BwCkBAIC02NSw3 ICs2NSw3IEBAIHN0YXRpYyBib29sIGNvbnRleHRMb3N0KFdlYkdyYXBoaWNzQ29udGV4dDNEKiBj b250ZXh0KQogCiB2b2lkIFByb2dyYW1CaW5kaW5nQmFzZTo6aW5pdChXZWJHcmFwaGljc0NvbnRl eHQzRCogY29udGV4dCwgY29uc3QgU3RyaW5nJiB2ZXJ0ZXhTaGFkZXIsIGNvbnN0IFN0cmluZyYg ZnJhZ21lbnRTaGFkZXIpCiB7Ci0gICAgVFJBQ0VfRVZFTlQoIlByb2dyYW1CaW5kaW5nQmFzZTo6 aW5pdCIsIHRoaXMsIDApOworICAgIFRSQUNFX0VWRU5UMCgiY2MiLCAiUHJvZ3JhbUJpbmRpbmdC YXNlOjppbml0Iik7CiAgICAgbV92ZXJ0ZXhTaGFkZXJJZCA9IGxvYWRTaGFkZXIoY29udGV4dCwg R3JhcGhpY3NDb250ZXh0M0Q6OlZFUlRFWF9TSEFERVIsIHZlcnRleFNoYWRlcik7CiAgICAgaWYg KCFtX3ZlcnRleFNoYWRlcklkKSB7CiAgICAgICAgIGlmICghY29udGV4dExvc3QoY29udGV4dCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdl U2tpYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlU2tp YS5jcHAKaW5kZXggNDYxNDM0YWIzNmEwNWEzM2IwMjBiYzgxZGQ0YTYwZDkxZTM0YjhhOC4uYTBh ZjNkNjRhMWFmNjY3NDFiYzI1OTY4MzA3MDMxMTNmMTZjYWMyNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZVNraWEuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VTa2lhLmNwcApAQCAtMTc4LDcg KzE3OCw3IEBAIHN0YXRpYyBSZXNhbXBsaW5nTW9kZSBsaW1pdFJlc2FtcGxpbmdNb2RlKFBsYXRm b3JtQ29udGV4dFNraWEqIHBsYXRmb3JtQ29udGV4dCwKIHN0YXRpYyB2b2lkIGRyYXdSZXNhbXBs ZWRCaXRtYXAoU2tDYW52YXMmIGNhbnZhcywgU2tQYWludCYgcGFpbnQsIGNvbnN0IE5hdGl2ZUlt YWdlU2tpYSYgYml0bWFwLCBjb25zdCBTa0lSZWN0JiBzcmNJUmVjdCwgY29uc3QgU2tSZWN0JiBk ZXN0UmVjdCkKIHsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiZHJh d1Jlc2FtcGxlZEJpdG1hcCIsICZjYW52YXMsIDApOworICAgIFRSQUNFX0VWRU5UMCgic2tpYSIs ICJkcmF3UmVzYW1wbGVkQml0bWFwIik7CiAjZW5kaWYKICAgICAvLyBBcHBseSBmb3J3YXJkIHRy YW5zZm9ybSB0byBkZXN0UmVjdCB0byBlc3RpbWF0ZSByZXF1aXJlZCBzaXplIG9mCiAgICAgLy8g cmUtc2FtcGxlZCBiaXRtYXAsIGFuZCB1c2Ugb25seSBpbiBjYWxscyByZXF1aXJlZCB0byByZXNp emUsIG9yIHRoYXQKQEAgLTIyNyw3ICsyMjcsNyBAQCBzdGF0aWMgYm9vbCBoYXNOb245MHJvdGF0 aW9uKFBsYXRmb3JtQ29udGV4dFNraWEqIGNvbnRleHQpCiBzdGF0aWMgdm9pZCBwYWludFNrQml0 bWFwKFBsYXRmb3JtQ29udGV4dFNraWEqIHBsYXRmb3JtQ29udGV4dCwgY29uc3QgTmF0aXZlSW1h Z2VTa2lhJiBiaXRtYXAsIGNvbnN0IFNrSVJlY3QmIHNyY1JlY3QsIGNvbnN0IFNrUmVjdCYgZGVz dFJlY3QsIGNvbnN0IFNrWGZlcm1vZGU6Ok1vZGUmIGNvbXBPcCkKIHsKICNpZiBQTEFURk9STShD SFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgicGFpbnRTa0JpdG1hcCIsIHBsYXRmb3JtQ29udGV4 dCwgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJza2lhIiwgInBhaW50U2tCaXRtYXAiKTsKICNlbmRp ZgogICAgIFNrUGFpbnQgcGFpbnQ7CiAgICAgcGFpbnQuc2V0WGZlcm1vZGVNb2RlKGNvbXBPcCk7 CkBAIC0zMTMsNyArMzEzLDcgQEAgdm9pZCBJbWFnZTo6ZHJhd1BhdHRlcm4oR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgRmxvYXRSZWN0JiBk ZXN0UmVjdCkKIHsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiSW1h Z2U6OmRyYXdQYXR0ZXJuIiwgdGhpcywgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJza2lhIiwgIklt YWdlOjpkcmF3UGF0dGVybiIpOwogI2VuZGlmCiAgICAgRmxvYXRSZWN0IG5vcm1TcmNSZWN0ID0g bm9ybWFsaXplUmVjdChmbG9hdFNyY1JlY3QpOwogICAgIGlmIChkZXN0UmVjdC5pc0VtcHR5KCkg fHwgbm9ybVNyY1JlY3QuaXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9OYXRpdmVJbWFnZVNraWEuY3BwCmluZGV4IDdjYzIzYzRm NGY5MmMyZDg4ZWMyNjBjNmY4NDk1NDBkMzljYWM3NDEuLjdlMzRjMDc5ZDg1NjY3MzU3YjVhYWQ4 OTYwYzU0Y2E2ZTU2ZTJkOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3NraWEvTmF0aXZlSW1hZ2VTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9za2lhL05hdGl2ZUltYWdlU2tpYS5jcHAKQEAgLTc1LDcgKzc1LDcgQEAg U2tCaXRtYXAgTmF0aXZlSW1hZ2VTa2lhOjpyZXNpemVkQml0bWFwKGNvbnN0IFNrSVJlY3QmIHNy Y1N1YnNldCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBT a0lSZWN0JiBkZXN0VmlzaWJsZVN1YnNldCkgY29uc3QKIHsKICNpZiBQTEFURk9STShDSFJPTUlV TSkKLSAgICBUUkFDRV9FVkVOVCgiTmF0aXZlSW1hZ2VTa2lhOjpyZXNpemVkQml0bWFwIiwgY29u c3RfY2FzdDxOYXRpdmVJbWFnZVNraWEqPih0aGlzKSwgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJz a2lhIiwgIk5hdGl2ZUltYWdlU2tpYTo6cmVzaXplZEJpdG1hcCIpOwogI2VuZGlmCiAgICAgaWYg KCFoYXNSZXNpemVkQml0bWFwKHNyY1N1YnNldCwgZGVzdFdpZHRoLCBkZXN0SGVpZ2h0KSkgewog ICAgICAgICBib29sIHNob3VsZENhY2hlID0gaXNEYXRhQ29tcGxldGUoKQpAQCAtODUsNyArODUs NyBAQCBTa0JpdG1hcCBOYXRpdmVJbWFnZVNraWE6OnJlc2l6ZWRCaXRtYXAoY29uc3QgU2tJUmVj dCYgc3JjU3Vic2V0LAogICAgICAgICBtX2ltYWdlLmV4dHJhY3RTdWJzZXQoJnN1YnNldCwgc3Jj U3Vic2V0KTsKICAgICAgICAgaWYgKCFzaG91bGRDYWNoZSkgewogI2lmIFBMQVRGT1JNKENIUk9N SVVNKQotICAgICAgICAgICAgVFJBQ0VfRVZFTlQoIm5vbkNhY2hlZFJlc2l6ZSIsIGNvbnN0X2Nh c3Q8TmF0aXZlSW1hZ2VTa2lhKj4odGhpcyksIDApOworICAgICAgICAgICAgVFJBQ0VfRVZFTlQw KCJza2lhIiwgIm5vbkNhY2hlZFJlc2l6ZSIpOwogI2VuZGlmCiAgICAgICAgICAgICAvLyBKdXN0 IHJlc2l6ZSB0aGUgdmlzaWJsZSBzdWJzZXQgYW5kIHJldHVybiBpdC4KICAgICAgICAgICAgIFNr Qml0bWFwIHJlc2l6ZWRJbWFnZSA9IHNraWE6OkltYWdlT3BlcmF0aW9uczo6UmVzaXplKHN1YnNl dCwgc2tpYTo6SW1hZ2VPcGVyYXRpb25zOjpSRVNJWkVfTEFOQ1pPUzMsIGRlc3RXaWR0aCwgZGVz dEhlaWdodCwgZGVzdFZpc2libGVTdWJzZXQpOwpAQCAtOTMsNyArOTMsNyBAQCBTa0JpdG1hcCBO YXRpdmVJbWFnZVNraWE6OnJlc2l6ZWRCaXRtYXAoY29uc3QgU2tJUmVjdCYgc3JjU3Vic2V0LAog ICAgICAgICAgICAgcmV0dXJuIHJlc2l6ZWRJbWFnZTsKICAgICAgICAgfSBlbHNlIHsKICNpZiBQ TEFURk9STShDSFJPTUlVTSkKLSAgICAgICAgICAgIFRSQUNFX0VWRU5UKCJjYWNoZWRSZXNpemUi LCBjb25zdF9jYXN0PE5hdGl2ZUltYWdlU2tpYSo+KHRoaXMpLCAwKTsKKyAgICAgICAgICAgIFRS QUNFX0VWRU5UMCgic2tpYSIsICJjYWNoZWRSZXNpemUiKTsKICNlbmRpZgogICAgICAgICAgICAg bV9yZXNpemVkSW1hZ2UgPSBza2lhOjpJbWFnZU9wZXJhdGlvbnM6OlJlc2l6ZShzdWJzZXQsIHNr aWE6OkltYWdlT3BlcmF0aW9uczo6UkVTSVpFX0xBTkNaT1MzLCBkZXN0V2lkdGgsIGRlc3RIZWln aHQpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAppbmRleCA1MGRmNzExNDY2 NDA1MjQyNTk4NDZmYzIxNjViNDdjOTFiOWQ2Y2UyLi4zOTQ2ODhmNGE5YmU0YzNhMzFkMGJmMGUz YzU2MmU4OGYyZGNjZjBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKQEAgLTU4Myw3ICs1 ODMsNyBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnBhaW50U2tQYWludChjb25zdCBTa1Jl Y3QmIHJlY3QsCiBjb25zdCBTa0JpdG1hcCogUGxhdGZvcm1Db250ZXh0U2tpYTo6Yml0bWFwKCkg Y29uc3QKIHsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiUGxhdGZv cm1Db250ZXh0U2tpYTo6Yml0bWFwIiwgdGhpcywgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJza2lh IiwgIlBsYXRmb3JtQ29udGV4dFNraWE6OmJpdG1hcCIpOwogI2VuZGlmCiAgICAgcmV0dXJuICZt X2NhbnZhcy0+Z2V0RGV2aWNlKCktPmFjY2Vzc0JpdG1hcChmYWxzZSk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9ibXAvQk1QSW1hZ2VEZWNv ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2JtcC9CTVBJ bWFnZURlY29kZXIuY3BwCmluZGV4IDIwYTI0OGM3ZDNiY2IxMWNhZDdjNjc2OTVlYjgyNzU3NTI3 ODI0OTMuLjQzZWY1MThkZTg3ODk2ZTQzNzhhMGI3NDk1ZGYyNjk5YWE3YmI0ODggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2JtcC9CTVBJbWFnZURl Y29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2Jt cC9CTVBJbWFnZURlY29kZXIuY3BwCkBAIC05NSw3ICs5NSw3IEBAIGJvb2wgQk1QSW1hZ2VEZWNv ZGVyOjpzZXRGYWlsZWQoKQogdm9pZCBCTVBJbWFnZURlY29kZXI6OmRlY29kZShib29sIG9ubHlT aXplKQogewogI2lmIFBMQVRGT1JNKENIUk9NSVVNKQotICAgIFRSQUNFX0VWRU5UKCJCTVBJbWFn ZURlY29kZXI6OmRlY29kZSIsIHRoaXMsIDApOworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0Iiwg IkJNUEltYWdlRGVjb2Rlcjo6ZGVjb2RlIik7CiAjZW5kaWYKICAgICBpZiAoZmFpbGVkKCkpCiAg ICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdl LWRlY29kZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW1hZ2UtZGVjb2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5jcHAKaW5kZXggNWY2MTkzYjhm OWUxYmE5MzdiNmUzZmM3MzE3NDkyNDM0ZGFhZTJkYS4uNzI0ZWEwZDEzYjZlZGI1MjVmZWJhNWJl YTVmZTBkODMxYWQxMDBiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1h Z2UtZGVjb2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5jcHAKQEAgLTMxNSw3 ICszMTUsNyBAQCB2b2lkIEdJRkltYWdlRGVjb2Rlcjo6Z2lmQ29tcGxldGUoKQogdm9pZCBHSUZJ bWFnZURlY29kZXI6OmRlY29kZSh1bnNpZ25lZCBoYWx0QXRGcmFtZSwgR0lGUXVlcnkgcXVlcnkp CiB7CiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCi0gICAgVFJBQ0VfRVZFTlQoIkdJRkltYWdlRGVj b2Rlcjo6ZGVjb2RlIiwgdGhpcywgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiR0lG SW1hZ2VEZWNvZGVyOjpkZWNvZGUiKTsKICNlbmRpZgogICAgIGlmIChmYWlsZWQoKSkKICAgICAg ICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVj b2RlcnMvaWNvL0lDT0ltYWdlRGVjb2Rlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9p bWFnZS1kZWNvZGVycy9pY28vSUNPSW1hZ2VEZWNvZGVyLmNwcAppbmRleCAzYTAzZTU0Yzk5Njc3 ZGNlNDczMGE2YTJlNzRmYjViNGI0MzYwMWY5Li4zNmRkZTFjZGQ1NmQwMDg0ZTRmNmRlNTJiM2Y3 NDU1ZDZhMDY5OWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1k ZWNvZGVycy9pY28vSUNPSW1hZ2VEZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pbWFnZS1kZWNvZGVycy9pY28vSUNPSW1hZ2VEZWNvZGVyLmNwcApAQCAtMTU4LDcgKzE1 OCw3IEBAIHZvaWQgSUNPSW1hZ2VEZWNvZGVyOjpzZXREYXRhRm9yUE5HRGVjb2RlckF0SW5kZXgo c2l6ZV90IGluZGV4KQogdm9pZCBJQ09JbWFnZURlY29kZXI6OmRlY29kZShzaXplX3QgaW5kZXgs IGJvb2wgb25seVNpemUpCiB7CiAjaWYgUExBVEZPUk0oQ0hST01JVU0pCi0gICAgVFJBQ0VfRVZF TlQoIklDT0ltYWdlRGVjb2Rlcjo6ZGVjb2RlIiwgdGhpcywgMCk7CisgICAgVFJBQ0VfRVZFTlQw KCJ3ZWJraXQiLCAiSUNPSW1hZ2VEZWNvZGVyOjpkZWNvZGUiKTsKICNlbmRpZgogICAgIGlmIChm YWlsZWQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAK aW5kZXggOTFmMTIzNmIzNTliYzE1NWFmMzdjN2ZlMmNlMzZlYTczYzUwOTQ5Ni4uYmVmNDIwM2E1 NzcwMzQ2ODkxMWZjYjdkNzZlNDkxZmE5MDIwZWE5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURl Y29kZXIuY3BwCkBAIC02NDgsNyArNjQ4LDcgQEAgdm9pZCBKUEVHSW1hZ2VEZWNvZGVyOjpqcGVn Q29tcGxldGUoKQogdm9pZCBKUEVHSW1hZ2VEZWNvZGVyOjpkZWNvZGUoYm9vbCBvbmx5U2l6ZSkK IHsKICNpZiBQTEFURk9STShDSFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiSlBFR0ltYWdlRGVj b2Rlcjo6ZGVjb2RlIiwgdGhpcywgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiSlBF R0ltYWdlRGVjb2Rlcjo6ZGVjb2RlIik7CiAjZW5kaWYKICAgICBpZiAoZmFpbGVkKCkpCiAgICAg ICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL3BuZy9QTkdJbWFnZURlY29kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKaW5kZXggMTM4ZDVjNTEyOTFl YTI2ZjY5NjQzZjZhYTQ0ODg0YmI1YzY0ODBlZi4uMTU4ZGViYjVhYjFjMzhjMWUxYTdiYWEzYWQw ZDNhZjRkNzM2NDlhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvcG5nL1BOR0ltYWdlRGVjb2Rlci5jcHAKQEAgLTUzMSw3ICs1 MzEsNyBAQCB2b2lkIFBOR0ltYWdlRGVjb2Rlcjo6cG5nQ29tcGxldGUoKQogdm9pZCBQTkdJbWFn ZURlY29kZXI6OmRlY29kZShib29sIG9ubHlTaXplKQogewogI2lmIFBMQVRGT1JNKENIUk9NSVVN KQotICAgIFRSQUNFX0VWRU5UKCJQTkdJbWFnZURlY29kZXI6OmRlY29kZSIsIHRoaXMsIDApOwor ICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIlBOR0ltYWdlRGVjb2Rlcjo6ZGVjb2RlIik7CiAj ZW5kaWYKICAgICBpZiAoZmFpbGVkKCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VCUEltYWdlRGVjb2Rl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy93ZWJwL1dFQlBJ bWFnZURlY29kZXIuY3BwCmluZGV4IDA4MmUzM2RkYjJhMzYwZTM4ODhkNzliMDNhOWMyMWNjZGI4 YzAzYzIuLjYxMjg5MGYzMTI1MmJlMTcwYmY3OWYzYzFmMDVlNTI3NTAzNTgyOWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL3dlYnAvV0VCUEltYWdl RGVjb2Rlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv d2VicC9XRUJQSW1hZ2VEZWNvZGVyLmNwcApAQCAtODgsNyArODgsNyBAQCBJbWFnZUZyYW1lKiBX RUJQSW1hZ2VEZWNvZGVyOjpmcmFtZUJ1ZmZlckF0SW5kZXgoc2l6ZV90IGluZGV4KQogYm9vbCBX RUJQSW1hZ2VEZWNvZGVyOjpkZWNvZGUoYm9vbCBvbmx5U2l6ZSkKIHsKICNpZiBQTEFURk9STShD SFJPTUlVTSkKLSAgICBUUkFDRV9FVkVOVCgiV0VCUEltYWdlRGVjb2Rlcjo6ZGVjb2RlIiwgdGhp cywgMCk7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiV0VCUEltYWdlRGVjb2Rlcjo6ZGVj b2RlIik7CiAjZW5kaWYKICAgICBpZiAoZmFpbGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBkODc1MGUz OGEyODdlYjE5MDczNzQ0Y2MwMzllMmM0YTI0ZDRlYzk0Li5hOWEwNDlkMmVlMDk4ZmFmMTRjYTNj NTZhMTdkMTQ5MGYyMzE2MzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwCkBAIC0xNjMyLDcgKzE2MzIsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkaWRCZWdp bkZyYW1lKCkKIHZvaWQgV2ViVmlld0ltcGw6OnVwZGF0ZUFuaW1hdGlvbnMoZG91YmxlIG1vbm90 b25pY0ZyYW1lQmVnaW5UaW1lKQogewogI2lmIEVOQUJMRShSRVFVRVNUX0FOSU1BVElPTl9GUkFN RSkKLSAgICBUUkFDRV9FVkVOVCgiV2ViVmlld0ltcGw6OnVwZGF0ZUFuaW1hdGlvbnMiLCB0aGlz LCAwKTsKKyAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJWaWV3SW1wbDo6dXBkYXRlQW5p bWF0aW9ucyIpOwogCiAgICAgV2ViRnJhbWVJbXBsKiB3ZWJmcmFtZSA9IG1haW5GcmFtZUltcGwo KTsKICAgICBpZiAoIXdlYmZyYW1lKQpAQCAtMTY1NSw3ICsxNjU1LDcgQEAgdm9pZCBXZWJWaWV3 SW1wbDo6dXBkYXRlQW5pbWF0aW9ucyhkb3VibGUgbW9ub3RvbmljRnJhbWVCZWdpblRpbWUpCiAK IHZvaWQgV2ViVmlld0ltcGw6OmxheW91dCgpCiB7Ci0gICAgVFJBQ0VfRVZFTlQoIldlYlZpZXdJ bXBsOjpsYXlvdXQiLCB0aGlzLCAwKTsKKyAgICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJXZWJW aWV3SW1wbDo6bGF5b3V0Iik7CiAgICAgUGFnZVdpZGdldERlbGVnYXRlOjpsYXlvdXQobV9wYWdl LmdldCgpKTsKIH0KIApAQCAtMzYzMCw3ICszNjMwLDcgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2V0 SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKGJvb2wgYWN0aXZlKQogCiAgICAgICAgIG1f Y2xpZW50LT5kaWRBY3RpdmF0ZUNvbXBvc2l0b3IobV9sYXllclRyZWVWaWV3LmNvbXBvc2l0b3JJ ZGVudGlmaWVyKCkpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIFRSQUNFX0VWRU5UKCJXZWJWaWV3 SW1wbDo6c2V0SXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nQWN0aXZlKHRydWUpIiwgdGhpcywgMCk7 CisgICAgICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIldlYlZpZXdJbXBsOjpzZXRJc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdBY3RpdmUodHJ1ZSkiKTsKIAogICAgICAgICBXZWJMYXllclRyZWVW aWV3OjpTZXR0aW5ncyBsYXllclRyZWVWaWV3U2V0dGluZ3M7CiAgICAgICAgIGxheWVyVHJlZVZp ZXdTZXR0aW5ncy5hY2NlbGVyYXRlUGFpbnRpbmcgPSBwYWdlKCktPnNldHRpbmdzKCktPmFjY2Vs ZXJhdGVkRHJhd2luZ0VuYWJsZWQoKTsK