82959 2012-04-02 15:48:32 -0700 [chromium] Enable sparkline FPS counter in threaded compositing mode 2012-04-03 13:36:51 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs enne nduca shawnsingh webkit.review.bot oldest_to_newest 593941 0 jamesr 2012-04-02 15:48:32 -0700 [chromium] Enable sparkline FPS counter in threaded compositing mode 593944 1 135210 jamesr 2012-04-02 15:52:24 -0700 Created attachment 135210 Patch 593945 2 jamesr 2012-04-02 15:52:54 -0700 This is a stopgap for debugging stability issues with the threaded scheduler more easily. 593952 3 135210 nduca 2012-04-02 15:59:57 -0700 Comment on attachment 135210 Patch Did you consider making initFont and drawFPSCounterText early out rather than making the call conditional? No matter, LrGTM. :) 593966 4 jamesr 2012-04-02 16:05:32 -0700 Yeah, I figured it was weirder to call a function and have it do nothing than to make the caller decide if it wanted to try to init fonts / draw the text. Could go either way. 594811 5 135210 enne 2012-04-03 13:24:44 -0700 Comment on attachment 135210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135210&action=review R=me. Just not drawing the text sounds like a reasonable short term solution. > Source/WebCore/ChangeLog:12 > + There are no tests for the HUD since it's a developer-facing feature and not user-facing. ಠ_ಠ 594814 6 135210 jamesr 2012-04-03 13:26:28 -0700 Comment on attachment 135210 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135210&action=review >> Source/WebCore/ChangeLog:12 >> + There are no tests for the HUD since it's a developer-facing feature and not user-facing. > > ಠ_ಠ ¯\(°_o)/¯ 594827 7 135210 webkit.review.bot 2012-04-03 13:36:47 -0700 Comment on attachment 135210 Patch Clearing flags on attachment: 135210 Committed r113081: <http://trac.webkit.org/changeset/113081> 594828 8 webkit.review.bot 2012-04-03 13:36:51 -0700 All reviewed patches have been landed. Closing bug. 135210 2012-04-02 15:52:24 -0700 2012-04-03 13:36:47 -0700 Patch bug-82959-20120402155223.patch text/plain 11248 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyODk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDI1MDI4YzI2NWE1ZDgy M2I0ZTJhZTJlOWE0NWRkZGM2MTU2MjA3Yy4uY2FjMDE2OGJlODQ0MTQ4NTg4MzAxOWYwNmQzOGMx ZmQzZTYzZGFlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA0LTAyICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBF bmFibGUgc3BhcmtsaW5lIEZQUyBjb3VudGVyIGluIHRocmVhZGVkIGNvbXBvc2l0aW5nIG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyOTU5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBlbmFi bGVzIHJlbmRlcmluZyB0aGUgRlBTIGNvdW50ZXIgc3BhcmtsaW5lIHdoZW4gaW4gdGhyZWFkZWQg Y29tcG9zaXRpbmcgbW9kZS4gV2UgZG9uJ3QgY3VycmVudGx5IGhhdmUgYQorICAgICAgICB3YXkg dG8gZHJhdyB0ZXh0IGZyb20gdGhlIHRocmVhZCAoc2luY2Ugd2UgY2FuJ3QgaW50ZXJhY3Qgd2l0 aCBXZWJDb3JlOjpGb250IG9iamVjdHMgZnJvbSBhIG5vbi1tYWluIHRocmVhZCksCisgICAgICAg IGJ1dCBoYXZpbmcgYSBzcGFya2xpbmUgaXMgc3RpbGwgdXNlZnVsIGZvciBqdWRnaW5nIGZyYW1l cmF0ZSBzdGFiaWxpdHkuCisKKyAgICAgICAgVGhlcmUgYXJlIG5vIHRlc3RzIGZvciB0aGUgSFVE IHNpbmNlIGl0J3MgYSBkZXZlbG9wZXItZmFjaW5nIGZlYXR1cmUgYW5kIG5vdCB1c2VyLWZhY2lu Zy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERp c3BsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q0NIZWFkc1VwRGlzcGxheTo6Q0NIZWFkc1Vw RGlzcGxheSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNV cERpc3BsYXk6On5DQ0hlYWRzVXBEaXNwbGF5KToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNV cERpc3BsYXk6OmluaXRpYWxpemVGb250cyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0hlYWRzVXBE aXNwbGF5OjplbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNVcERpc3BsYXk6OnNo b3dQbGF0Zm9ybUxheWVyVHJlZSk6CisgICAgICAgIChXZWJDb3JlOjpDQ0hlYWRzVXBEaXNwbGF5 OjpkcmF3KToKKyAgICAgICAgKFdlYkNvcmU6OkNDSGVhZHNVcERpc3BsYXk6OmRyYXdIdWRDb250 ZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRl cik6CisgICAgICAgIChXZWJDb3JlOjpDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3RlBTQ291bnRlclRl eHQpOgorICAgICAgICAoV2ViQ29yZTo6Q0NIZWFkc1VwRGlzcGxheTo6ZHJhd1BsYXRmb3JtTGF5 ZXJUcmVlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRz VXBEaXNwbGF5Lmg6CisgICAgICAgIChDQ0hlYWRzVXBEaXNwbGF5KToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q0NMYXllclRyZWVIb3N0Ojppbml0aWFsaXplKToKKwogMjAxMi0wNC0wMiAgRXJp YyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5hbWluZyBw YXJhbWV0ZXJzIGZvciBwb3NpdGlvbmluZyBhIHRyYWNrIGN1ZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRz VXBEaXNwbGF5LmNwcAppbmRleCAyYjgwODA1ZmI5Mjg1ZWVkNjhjZjg0MmJhYTQ1YzgwOGRhMzJl NjEyLi5lNGIxNWQ3MjFmNzNhYmI5NWJlYWE5OGNkNDAzNzUxOTcxYTA1YTE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBE aXNwbGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmNwcApAQCAtNTksNiArNTksMTkgQEAgQ0NIZWFkc1VwRGlz cGxheTo6Q0NIZWFkc1VwRGlzcGxheShMYXllclJlbmRlcmVyQ2hyb21pdW0qIG93bmVyKQogICAg IGZvciAoaW50IGkgPSAyOyBpIDwga0JlZ2luRnJhbWVIaXN0b3J5U2l6ZTsgaSsrKQogICAgICAg ICBtX2JlZ2luVGltZUhpc3RvcnlJblNlY1tpXSA9IDA7CiAKKyAgICAvLyBXZSBjYW4ndCBkcmF3 IHRleHQgaW4gdGhyZWFkZWQgbW9kZSB3aXRoIHRoZSBjdXJyZW50IG1lY2hhbmlzbS4KKyAgICAv LyBGSVhNRTogRmlndXJlIG91dCBhIHdheSB0byBkcmF3IHRleHQgaW4gdGhyZWFkZWQgbW9kZS4K KyAgICBpZiAoIUNDUHJveHk6OmltcGxUaHJlYWQoKSkKKyAgICAgICAgaW5pdGlhbGl6ZUZvbnRz KCk7Cit9CisKK0NDSGVhZHNVcERpc3BsYXk6On5DQ0hlYWRzVXBEaXNwbGF5KCkKK3sKK30KKwor dm9pZCBDQ0hlYWRzVXBEaXNwbGF5Ojppbml0aWFsaXplRm9udHMoKQoreworICAgIEFTU0VSVCgh Q0NQcm94eTo6aW1wbFRocmVhZCgpKTsKICAgICBGb250RGVzY3JpcHRpb24gbWVkaXVtRm9udERl c2M7CiAgICAgbWVkaXVtRm9udERlc2Muc2V0R2VuZXJpY0ZhbWlseShGb250RGVzY3JpcHRpb246 Ok1vbm9zcGFjZUZhbWlseSk7CiAgICAgbWVkaXVtRm9udERlc2Muc2V0Q29tcHV0ZWRTaXplKDIw KTsKQEAgLTc0LDEwICs4Nyw2IEBAIENDSGVhZHNVcERpc3BsYXk6OkNDSGVhZHNVcERpc3BsYXko TGF5ZXJSZW5kZXJlckNocm9taXVtKiBvd25lcikKICAgICBtX3NtYWxsRm9udC0+dXBkYXRlKDAp OwogfQogCi1DQ0hlYWRzVXBEaXNwbGF5Ojp+Q0NIZWFkc1VwRGlzcGxheSgpCi17Ci19Ci0KIHZv aWQgQ0NIZWFkc1VwRGlzcGxheTo6b25GcmFtZUJlZ2luKGRvdWJsZSB0aW1lc3RhbXApCiB7CiAg ICAgbV9iZWdpblRpbWVIaXN0b3J5SW5TZWNbbV9jdXJyZW50RnJhbWVOdW1iZXIgJSBrQmVnaW5G cmFtZUhpc3RvcnlTaXplXSA9IHRpbWVzdGFtcDsKQEAgLTkwLDEwICs5OSwxMiBAQCB2b2lkIEND SGVhZHNVcERpc3BsYXk6Om9uU3dhcEJ1ZmZlcnMoKQogCiBib29sIENDSGVhZHNVcERpc3BsYXk6 OmVuYWJsZWQoKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBIVUQgZG9lcyBub3Qgd29yayBpbiBj b21wb3NpdG9yIHRocmVhZCBtb2RlLgotICAgIGlmIChDQ1Byb3h5OjpoYXNJbXBsVGhyZWFkKCkp Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gc2V0dGluZ3MoKS5zaG93UGxhdGZv cm1MYXllclRyZWUgfHwgc2V0dGluZ3MoKS5zaG93RlBTQ291bnRlcjsKKyAgICByZXR1cm4gc2hv d1BsYXRmb3JtTGF5ZXJUcmVlKCkgfHwgc2V0dGluZ3MoKS5zaG93RlBTQ291bnRlcjsKK30KKwor Ym9vbCBDQ0hlYWRzVXBEaXNwbGF5OjpzaG93UGxhdGZvcm1MYXllclRyZWUoKSBjb25zdAorewor ICAgIHJldHVybiBzZXR0aW5ncygpLnNob3dQbGF0Zm9ybUxheWVyVHJlZSAmJiAhQ0NQcm94eTo6 aW1wbFRocmVhZCgpOwogfQogCiB2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXcoKQpAQCAtMTA0 LDcgKzExNSw3IEBAIHZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhdygpCiAKICAgICAvLyBVc2Ug YSBmdWxsc2NyZWVuIHRleHR1cmUgb25seSBpZiB3ZSBuZWVkIHRvLi4uCiAgICAgSW50U2l6ZSBo dWRTaXplOwotICAgIGlmIChzZXR0aW5ncygpLnNob3dQbGF0Zm9ybUxheWVyVHJlZSkgeworICAg IGlmIChzaG93UGxhdGZvcm1MYXllclRyZWUoKSkgewogICAgICAgICBodWRTaXplLnNldFdpZHRo KG1pbigyMDQ4LCBtX2xheWVyUmVuZGVyZXItPnZpZXdwb3J0V2lkdGgoKSkpOwogICAgICAgICBo dWRTaXplLnNldEhlaWdodChtaW4oMjA0OCwgbV9sYXllclJlbmRlcmVyLT52aWV3cG9ydEhlaWdo dCgpKSk7CiAgICAgfSBlbHNlIHsKQEAgLTE2MywxNiArMTc0LDE0IEBAIHZvaWQgQ0NIZWFkc1Vw RGlzcGxheTo6ZHJhdygpCiAgICAgbV9odWRUZXh0dXJlLT51bnJlc2VydmUoKTsKIH0KIAotdm9p ZCBDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3SHVkQ29udGVudHMoR3JhcGhpY3NDb250ZXh0KiBjdHgs IGNvbnN0IEludFNpemUmIGh1ZFNpemUpCit2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXdIdWRD b250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEludFNpemUmIGh1ZFNpemUp CiB7Ci0gICAgRm9udENhY2hlUHVyZ2VQcmV2ZW50ZXIgZm9udENhY2hlUHVyZ2VQcmV2ZW50ZXI7 Ci0KLSAgICBpZiAoc2V0dGluZ3MoKS5zaG93UGxhdGZvcm1MYXllclRyZWUpIHsKLSAgICAgICAg Y3R4LT5zZXRGaWxsQ29sb3IoQ29sb3IoMCwgMCwgMCwgMTkyKSwgQ29sb3JTcGFjZURldmljZVJH Qik7Ci0gICAgICAgIGN0eC0+ZmlsbFJlY3QoRmxvYXRSZWN0KDAsIDAsIGh1ZFNpemUud2lkdGgo KSwgaHVkU2l6ZS5oZWlnaHQoKSkpOworICAgIGlmIChzaG93UGxhdGZvcm1MYXllclRyZWUoKSkg eworICAgICAgICBjb250ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3IoMCwgMCwgMCwgMTkyKSwgQ29s b3JTcGFjZURldmljZVJHQik7CisgICAgICAgIGNvbnRleHQtPmZpbGxSZWN0KEZsb2F0UmVjdCgw LCAwLCBodWRTaXplLndpZHRoKCksIGh1ZFNpemUuaGVpZ2h0KCkpKTsKICAgICB9CiAKLSAgICBp bnQgZnBzQ291bnRlckhlaWdodCA9IG1fbWVkaXVtRm9udC0+Zm9udE1ldHJpY3MoKS5mbG9hdEhl aWdodCgpICsgMjsKKyAgICBpbnQgZnBzQ291bnRlckhlaWdodCA9IDI1OwogICAgIGludCBmcHND b3VudGVyVG9wID0gMjsKICAgICBpbnQgcGxhdGZvcm1MYXllclRyZWVUb3A7CiAgICAgaWYgKHNl dHRpbmdzKCkuc2hvd0ZQU0NvdW50ZXIpCkBAIC0xODEsMTMgKzE5MCwxMyBAQCB2b2lkIENDSGVh ZHNVcERpc3BsYXk6OmRyYXdIdWRDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGN0eCwgY29uc3Qg SW50U2l6ZSYgaHVkUwogICAgICAgICBwbGF0Zm9ybUxheWVyVHJlZVRvcCA9IDA7CiAKICAgICBp ZiAoc2V0dGluZ3MoKS5zaG93RlBTQ291bnRlcikKLSAgICAgICAgZHJhd0ZQU0NvdW50ZXIoY3R4 LCBmcHNDb3VudGVyVG9wLCBmcHNDb3VudGVySGVpZ2h0KTsKKyAgICAgICAgZHJhd0ZQU0NvdW50 ZXIoY29udGV4dCwgZnBzQ291bnRlclRvcCwgZnBzQ291bnRlckhlaWdodCk7CiAKLSAgICBpZiAo c2V0dGluZ3MoKS5zaG93UGxhdGZvcm1MYXllclRyZWUpCi0gICAgICAgIGRyYXdQbGF0Zm9ybUxh eWVyVHJlZShjdHgsIHBsYXRmb3JtTGF5ZXJUcmVlVG9wKTsKKyAgICBpZiAoc2hvd1BsYXRmb3Jt TGF5ZXJUcmVlKCkpCisgICAgICAgIGRyYXdQbGF0Zm9ybUxheWVyVHJlZShjb250ZXh0LCBwbGF0 Zm9ybUxheWVyVHJlZVRvcCk7CiB9CiAKLXZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd0ZQU0Nv dW50ZXIoR3JhcGhpY3NDb250ZXh0KiBjdHgsIGludCB0b3AsIGludCBoZWlnaHQpCit2b2lkIEND SGVhZHNVcERpc3BsYXk6OmRyYXdGUFNDb3VudGVyKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwg aW50IHRvcCwgaW50IGhlaWdodCkKIHsKICAgICAvLyBOb3RlIHRoYXQgc2luY2Ugd2UgaGF2ZW4n dCBmaW5pc2hlZCB0aGUgY3VycmVudCBmcmFtZSwgdGhlIEZQUyBjb3VudGVyCiAgICAgLy8gYWN0 dWFsbHkgcmVwb3J0cyB0aGUgbGFzdCBmcmFtZSdzIHRpbWUuCkBAIC0yMDIsMjcgKzIxMSwyMSBA QCB2b2lkIENDSGVhZHNVcERpc3BsYXk6OmRyYXdGUFNDb3VudGVyKEdyYXBoaWNzQ29udGV4dCog Y3R4LCBpbnQgdG9wLCBpbnQgaGVpZ2h0KQogICAgIH0gZWxzZQogICAgICAgICBtX2ZpbHRlcmVk RnJhbWVUaW1lID0gKCgxLjAgLSBhbHBoYSkgKiBtX2ZpbHRlcmVkRnJhbWVUaW1lKSArIChhbHBo YSAqIHNlY0Zvckxhc3RGcmFtZSk7CiAKLSAgICAvLyBDcmVhdGUgJiBtZWFzdXJlIEZQUyB0ZXh0 LgotICAgIFN0cmluZyB0ZXh0KFN0cmluZzo6Zm9ybWF0KCJGUFM6ICU1LjFmIiwgMS4wIC8gbV9m aWx0ZXJlZEZyYW1lVGltZSkpOwotICAgIFRleHRSdW4gcnVuKHRleHQpOwotICAgIGZsb2F0IHRl eHRXaWR0aCA9IG1fbWVkaXVtRm9udC0+d2lkdGgocnVuKSArIDIuMGY7Ci0gICAgZmxvYXQgZ3Jh cGhXaWR0aCA9IGtCZWdpbkZyYW1lSGlzdG9yeVNpemU7CisgICAgZmxvYXQgdGV4dFdpZHRoID0g MDsKKyAgICBpZiAoIUNDUHJveHk6OmltcGxUaHJlYWQoKSkKKyAgICAgICAgdGV4dFdpZHRoID0g ZHJhd0ZQU0NvdW50ZXJUZXh0KGNvbnRleHQsIHRvcCwgaGVpZ2h0KTsKIAotICAgIC8vIERyYXcg YmFja2dyb3VuZC4KLSAgICBjdHgtPnNldEZpbGxDb2xvcihDb2xvcigwLCAwLCAwLCAyNTUpLCBD b2xvclNwYWNlRGV2aWNlUkdCKTsKLSAgICBjdHgtPmZpbGxSZWN0KEZsb2F0UmVjdCgyLCB0b3As IHRleHRXaWR0aCArIGdyYXBoV2lkdGgsIGhlaWdodCkpOworICAgIGZsb2F0IGdyYXBoV2lkdGgg PSBrQmVnaW5GcmFtZUhpc3RvcnlTaXplOwogCi0gICAgLy8gRHJhdyBGUFMgdGV4dC4KLSAgICBp ZiAobV9maWx0ZXJlZEZyYW1lVGltZSkgewotICAgICAgICBjdHgtPnNldEZpbGxDb2xvcihDb2xv cigyNTUsIDAsIDApLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKLSAgICAgICAgY3R4LT5kcmF3VGV4 dCgqbV9tZWRpdW1Gb250LCBydW4sIEludFBvaW50KDMsIHRvcCArIGhlaWdodCAtIDYpKTsKLSAg ICB9CisgICAgLy8gRHJhdyBiYWNrZ3JvdW5kIGZvciBncmFwaAorICAgIGNvbnRleHQtPnNldEZp bGxDb2xvcihDb2xvcigwLCAwLCAwLCAyNTUpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyAgICBj b250ZXh0LT5maWxsUmVjdChGbG9hdFJlY3QoMiArIHRleHRXaWR0aCwgdG9wLCBncmFwaFdpZHRo LCBoZWlnaHQpKTsKIAogICAgIC8vIERyYXcgRlBTIGdyYXBoLgogICAgIGNvbnN0IGRvdWJsZSBs b0ZQUyA9IDAuMDsKICAgICBjb25zdCBkb3VibGUgaGlGUFMgPSAxMjAuMDsKLSAgICBjdHgtPnNl dFN0cm9rZVN0eWxlKFNvbGlkU3Ryb2tlKTsKLSAgICBjdHgtPnNldFN0cm9rZUNvbG9yKENvbG9y KDI1NSwgMCwgMCksIENvbG9yU3BhY2VEZXZpY2VSR0IpOworICAgIGNvbnRleHQtPnNldFN0cm9r ZVN0eWxlKFNvbGlkU3Ryb2tlKTsKKyAgICBjb250ZXh0LT5zZXRTdHJva2VDb2xvcihDb2xvcigy NTUsIDAsIDApLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKICAgICBpbnQgZ3JhcGhMZWZ0ID0gc3Rh dGljX2Nhc3Q8aW50Pih0ZXh0V2lkdGggKyAzKTsKICAgICBJbnRQb2ludCBwcmV2KC0xLCAwKTsK ICAgICBpbnQgeCA9IDA7CkBAIC0yMzcsMjEgKzI0MCw0OSBAQCB2b2lkIENDSGVhZHNVcERpc3Bs YXk6OmRyYXdGUFNDb3VudGVyKEdyYXBoaWNzQ29udGV4dCogY3R4LCBpbnQgdG9wLCBpbnQgaGVp Z2h0KQogICAgICAgICAgICAgcCA9IDE7CiAgICAgICAgIEludFBvaW50IGN1cihncmFwaExlZnQg KyB4LCAxICsgdG9wICsgcCpoKTsKICAgICAgICAgaWYgKHByZXYueCgpICE9IC0xKQotICAgICAg ICAgICAgY3R4LT5kcmF3TGluZShwcmV2LCBjdXIpOworICAgICAgICAgICAgY29udGV4dC0+ZHJh d0xpbmUocHJldiwgY3VyKTsKICAgICAgICAgcHJldiA9IGN1cjsKICAgICAgICAgeCArPSAxOwog ICAgIH0KIH0KIAotdm9pZCBDQ0hlYWRzVXBEaXNwbGF5OjpkcmF3UGxhdGZvcm1MYXllclRyZWUo R3JhcGhpY3NDb250ZXh0KiBjdHgsIGludCB0b3ApCitmbG9hdCBDQ0hlYWRzVXBEaXNwbGF5Ojpk cmF3RlBTQ291bnRlclRleHQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBpbnQgdG9wLCBpbnQg aGVpZ2h0KQogeworICAgIEFTU0VSVCghQ0NQcm94eTo6aW1wbFRocmVhZCgpKTsKKworICAgIEZv bnRDYWNoZVB1cmdlUHJldmVudGVyIGZvbnRDYWNoZVB1cmdlUHJldmVudGVyOworCisgICAgLy8g Q3JlYXRlICYgbWVhc3VyZSBGUFMgdGV4dC4KKyAgICBTdHJpbmcgdGV4dChTdHJpbmc6OmZvcm1h dCgiRlBTOiAlNS4xZiIsIDEuMCAvIG1fZmlsdGVyZWRGcmFtZVRpbWUpKTsKKyAgICBUZXh0UnVu IHJ1bih0ZXh0KTsKKyAgICBmbG9hdCB0ZXh0V2lkdGggPSBtX21lZGl1bUZvbnQtPndpZHRoKHJ1 bikgKyAyLjBmOworCisgICAgLy8gRHJhdyBiYWNrZ3JvdW5kLgorICAgIGNvbnRleHQtPnNldEZp bGxDb2xvcihDb2xvcigwLCAwLCAwLCAyNTUpLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKKyAgICBj b250ZXh0LT5maWxsUmVjdChGbG9hdFJlY3QoMiwgdG9wLCB0ZXh0V2lkdGgsIGhlaWdodCkpOwor CisgICAgLy8gRHJhdyBGUFMgdGV4dC4KKyAgICBpZiAobV9maWx0ZXJlZEZyYW1lVGltZSkgewor ICAgICAgICBjb250ZXh0LT5zZXRGaWxsQ29sb3IoQ29sb3IoMjU1LCAwLCAwKSwgQ29sb3JTcGFj ZURldmljZVJHQik7CisgICAgICAgIGNvbnRleHQtPmRyYXdUZXh0KCptX21lZGl1bUZvbnQsIHJ1 biwgSW50UG9pbnQoMywgdG9wICsgaGVpZ2h0IC0gNikpOworICAgIH0KKworICAgIHJldHVybiB0 ZXh0V2lkdGg7Cit9CisKK3ZvaWQgQ0NIZWFkc1VwRGlzcGxheTo6ZHJhd1BsYXRmb3JtTGF5ZXJU cmVlKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgaW50IHRvcCkKK3sKKyAgICBBU1NFUlQoIUND UHJveHk6OmltcGxUaHJlYWQoKSk7CisKKyAgICBGb250Q2FjaGVQdXJnZVByZXZlbnRlciBmb250 Q2FjaGVQdXJnZVByZXZlbnRlcjsKKwogICAgIGZsb2F0IHNtYWxsRm9udEhlaWdodCA9IG1fc21h bGxGb250LT5mb250TWV0cmljcygpLmZsb2F0SGVpZ2h0KCk7CiAgICAgaW50IHkgPSB0b3AgKyBz bWFsbEZvbnRIZWlnaHQgLSA0OwotICAgIGN0eC0+c2V0RmlsbENvbG9yKENvbG9yKDI1NSwgMCwg MCksIENvbG9yU3BhY2VEZXZpY2VSR0IpOworICAgIGNvbnRleHQtPnNldEZpbGxDb2xvcihDb2xv cigyNTUsIDAsIDApLCBDb2xvclNwYWNlRGV2aWNlUkdCKTsKICAgICBWZWN0b3I8U3RyaW5nPiBs aW5lczsKICAgICBtX2xheWVyUmVuZGVyZXItPmxheWVyVHJlZUFzVGV4dCgpLnNwbGl0KCdcbics IGxpbmVzKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxpbmVzLnNpemUoKTsgKytpKSB7 Ci0gICAgICAgIGN0eC0+ZHJhd1RleHQoKm1fc21hbGxGb250LCBUZXh0UnVuKGxpbmVzW2ldKSwg SW50UG9pbnQoMiwgeSkpOworICAgICAgICBjb250ZXh0LT5kcmF3VGV4dCgqbV9zbWFsbEZvbnQs IFRleHRSdW4obGluZXNbaV0pLCBJbnRQb2ludCgyLCB5KSk7CiAgICAgICAgIHkgKz0gc21hbGxG b250SGVpZ2h0OwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDSGVhZHNVcERpc3BsYXkuaAppbmRleCAw NWNiMjBkNTI2OTc5ODU5MjY4ZTQxNzc0ZmNhYTRhNGNlMWJhMmE0Li41YWRjOWU5MDZiOGZmNThl YTgzN2YzYjIzMjY3YzA2MDg1MzFjODAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0hlYWRzVXBEaXNwbGF5LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NIZWFkc1VwRGlzcGxheS5o CkBAIC02NCw5ICs2NCwxNCBAQCBwcml2YXRlOgogICAgIGV4cGxpY2l0IENDSGVhZHNVcERpc3Bs YXkoTGF5ZXJSZW5kZXJlckNocm9taXVtKiBvd25lcik7CiAgICAgdm9pZCBkcmF3SHVkQ29udGVu dHMoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgSW50U2l6ZSYgaHVkU2l6ZSk7CiAgICAgdm9pZCBk cmF3RlBTQ291bnRlcihHcmFwaGljc0NvbnRleHQqLCBpbnQgdG9wLCBpbnQgaGVpZ2h0KTsKKyAg ICBmbG9hdCBkcmF3RlBTQ291bnRlclRleHQoR3JhcGhpY3NDb250ZXh0KiwgaW50IHRvcCwgaW50 IGhlaWdodCk7CiAgICAgdm9pZCBkcmF3UGxhdGZvcm1MYXllclRyZWUoR3JhcGhpY3NDb250ZXh0 KiwgaW50IHRvcCk7CiAgICAgY29uc3QgQ0NTZXR0aW5ncyYgc2V0dGluZ3MoKSBjb25zdDsKIAor ICAgIGJvb2wgc2hvd1BsYXRmb3JtTGF5ZXJUcmVlKCkgY29uc3Q7CisKKyAgICB2b2lkIGluaXRp YWxpemVGb250cygpOworCiAgICAgaW50IG1fY3VycmVudEZyYW1lTnVtYmVyOwogCiAgICAgZG91 YmxlIG1fZmlsdGVyZWRGcmFtZVRpbWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcApp bmRleCA1NzZmYzJiMzE5MGEyZDYzMDk1NzU5ODE3NWM0M2VlZjRlNzg4YzI3Li5iYmMyNzg2NWNj M2NhN2JkODZjOWRhYTQxZTU4M2M1NTExYzkyN2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVl SG9zdC5jcHAKQEAgLTg5LDEzICs4OSw5IEBAIENDTGF5ZXJUcmVlSG9zdDo6Q0NMYXllclRyZWVI b3N0KENDTGF5ZXJUcmVlSG9zdENsaWVudCogY2xpZW50LCBjb25zdCBDQ1NldHRpbmdzCiBib29s IENDTGF5ZXJUcmVlSG9zdDo6aW5pdGlhbGl6ZSgpCiB7CiAgICAgVFJBQ0VfRVZFTlQoIkNDTGF5 ZXJUcmVlSG9zdDo6aW5pdGlhbGl6ZSIsIHRoaXMsIDApOwotICAgIGlmIChDQ1Byb3h5OjpoYXNJ bXBsVGhyZWFkKCkpIHsKLSAgICAgICAgLy8gVGhlIEhVRCBkb2VzIG5vdCB3b3JrIGluIHRocmVh ZGVkIG1vZGUuIFR1cm4gaXQgb2ZmLgotICAgICAgICBtX3NldHRpbmdzLnNob3dGUFNDb3VudGVy ID0gZmFsc2U7Ci0gICAgICAgIG1fc2V0dGluZ3Muc2hvd1BsYXRmb3JtTGF5ZXJUcmVlID0gZmFs c2U7Ci0KKyAgICBpZiAoQ0NQcm94eTo6aGFzSW1wbFRocmVhZCgpKQogICAgICAgICBtX3Byb3h5 ID0gQ0NUaHJlYWRQcm94eTo6Y3JlYXRlKHRoaXMpOwotICAgIH0gZWxzZQorICAgIGVsc2UKICAg ICAgICAgbV9wcm94eSA9IENDU2luZ2xlVGhyZWFkUHJveHk6OmNyZWF0ZSh0aGlzKTsKICAgICBt X3Byb3h5LT5zdGFydCgpOwogCg==