75329 2011-12-28 16:00:40 -0800 [chromium] Make tiled layer's tiler always exist 2012-01-03 10:48:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne aelias cc-bugs enne jamesr reveman webkit.review.bot oldest_to_newest 527789 0 enne 2011-12-28 16:00:40 -0800 [chromium] Make tiled layer's tiler always exist 527792 1 120706 enne 2011-12-28 16:04:41 -0800 Created attachment 120706 Patch 527793 2 enne 2011-12-28 16:07:24 -0800 This is a refactoring that I ended up doing to fix bug 56591 and wanted to land separately. That bug would introduce some additional CCLayerTilingData members that I didn't want to also shadow in TiledLayerChromium and then have to remember to set again whenever the tiler got recreated. I think this ends up being much cleaner. 528638 3 120706 jamesr 2012-01-02 19:40:25 -0800 Comment on attachment 120706 Patch Cool! R=me 528847 4 enne 2012-01-03 10:48:22 -0800 Committed r103944: <http://trac.webkit.org/changeset/103944> 120706 2011-12-28 16:04:41 -0800 2012-01-02 19:40:25 -0800 Patch bug-75329-20111228160440.patch text/plain 17708 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZiNDg0NWMwOWZlYTNl MTRhNTU2YjJlMWZiOGQ3NGJmNmY4Yjk5OS4uMDZlOTM5MjkzOWIzN2YzOTZlMDFhOGE4NmVlNzU5 MDI2NGQyNzM0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDExLTEyLTI4ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAgICAgICAgW2Nocm9taXVtXSBNYWtl IHRpbGVkIGxheWVyJ3MgdGlsZXIgYWx3YXlzIGV4aXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTMyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRpbGVkTGF5ZXJDaHJvbWl1bSBoYXMgc29tZSBhd2t3 YXJkIGNvZGUgdG8gaGFuZGxlIGxhemlseSBjcmVhdGluZyB0aGUKKyAgICAgICAgdGlsZXIsIGlu Y2x1ZGluZyBsb3RzIG9mIG51bGwgY2hlY2tzIGFuZCBzaGFkb3dpbmcgdGhlIHRpbGUgc2l6ZS4K KyAgICAgICAgSW5zdGVhZCwgYWx3YXlzIGNyZWF0ZSB0aGUgdGlsZXIgdXAgZnJvbnQuIEFzIHZh bHVlcyBjaGFuZ2UgdGhhdAorICAgICAgICBpbnZhbGlkYXRlIGFsbCB0aWxlcywgcmVzZXQgaXQg cmF0aGVyIHRoYW4gY2xlYXIgdGhlIHBvaW50ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVy Q2hyb21pdW06OnNldElzTm9uQ29tcG9zaXRlZENvbnRlbnQpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6VGlsZWRMYXllckNocm9taXVtOjpUaWxlZExheWVyQ2hyb21pdW0pOgorICAgICAgICAoV2Vi Q29yZTo6VGlsZWRMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKToKKyAgICAgICAgKFdl YkNvcmU6OlRpbGVkTGF5ZXJDaHJvbWl1bTo6c2V0VGlsZVNpemUpOgorICAgICAgICAoV2ViQ29y ZTo6VGlsZWRMYXllckNocm9taXVtOjpzZXRCb3JkZXJUZXhlbE9wdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OmRyYXdzQ29udGVudCk6CisgICAgICAgIChXZWJD b3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnVwZGF0ZUNvbXBvc2l0b3JSZXNvdXJjZXMpOgorICAg ICAgICAoV2ViQ29yZTo6VGlsZWRMYXllckNocm9taXVtOjpzZXRUaWxpbmdPcHRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6VGlsZWRMYXllckNocm9taXVtOjpwdXNoUHJvcGVydGllc1RvKToKKyAg ICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5ZXJDaHJvbWl1bTo6c2V0SXNOb25Db21wb3NpdGVkQ29u dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OmludmFsaWRhdGVS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJvdGVjdFRpbGVU ZXh0dXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVU b1VwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVU b1VwZGF0ZUlkbGUpOgorICAgICAgICAoV2ViQ29yZTo6VGlsZWRMYXllckNocm9taXVtOjpuZWVk c0lkbGVQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OmlkbGVQ YWludFJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5 ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0ND TGF5ZXJUaWxpbmdEYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUaWxpbmdEYXRh OjpzZXRCb3JkZXJUZXhlbE9wdGlvbik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vY2MvQ0NMYXllclRpbGluZ0RhdGEuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9ncHUvVGlsaW5nRGF0YS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaWxpbmdEYXRhOjpzZXRI YXNCb3JkZXJUZXhlbHMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9UaWxpbmdE YXRhLmg6CisKIDIwMTEtMTItMjcgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW50cm9kdWNlIHN1cHBvcnQgZm9yIGV4cGVy aW1lbnRhbCBzZXR0aW5ncy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYzY0ZWZiNDk4 OGNhODA2M2NhZTQ2MmFkOGUzMGJkOTQ3ZDRhYjBkNi4uYjgwM2MyYTBhODE4YmMzMmE0M2E3ODFi NmMxYTE5N2NiZjJkMDFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxMS0xMi0yOCAgQWRyaWVubmUgV2Fsa2VyICA8ZW5uZUBnb29nbGUuY29tPgorCisg ICAgICAgIFtjaHJvbWl1bV0gTWFrZSB0aWxlZCBsYXllcidzIHRpbGVyIGFsd2F5cyBleGlzdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUzMjkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdGVz dCBkdWUgdG8gY2hhbmdpbmcgQVBJLiBBZGQgYSB0ZXN0IGZvciBjaGFuZ2luZyBib3JkZXIKKyAg ICAgICAgdGV4ZWwgb3B0aW9uIG9uIFRpbGluZ0RhdGEuCisKKyAgICAgICAgKiB0ZXN0cy9UaWxl ZExheWVyQ2hyb21pdW1UZXN0LmNwcDoKKyAgICAgICAgKFdURjo6RmFrZVRpbGVkTGF5ZXJDaHJv bWl1bTo6RmFrZVRpbGVkTGF5ZXJDaHJvbWl1bSk6CisgICAgICAgICogdGVzdHMvVGlsaW5nRGF0 YVRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VEVTVCk6CisKIDIwMTEtMTItMjQgIFJ5b3N1 a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGlu ZyBvdXQgcjEwMzYxOS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggNWVmYWRjZmYyYjExN2Qx ZWEyOWMzNTlmMDUxZTg1OGQ4NDk1MDI3Mi4uZTg4YzdkZDlhZGViNWIxNzc3MTY3MWNjYWRjODdh ZDI5MmFiOGI3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTEwNiw2ICsxMDYsMTEgQEAg dm9pZCBMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzUmVjdXJzaXZlKCkKICAgICBjbGVh bnVwUmVzb3VyY2VzKCk7CiB9CiAKK3ZvaWQgTGF5ZXJDaHJvbWl1bTo6c2V0SXNOb25Db21wb3Np dGVkQ29udGVudChib29sIGlzTm9uQ29tcG9zaXRlZENvbnRlbnQpCit7CisgICAgbV9pc05vbkNv bXBvc2l0ZWRDb250ZW50ID0gaXNOb25Db21wb3NpdGVkQ29udGVudDsKK30KKwogdm9pZCBMYXll ckNocm9taXVtOjpzZXRMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdCogaG9zdCkKIHsKICAg ICBpZiAobV9sYXllclRyZWVIb3N0ID09IGhvc3QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllckNocm9taXVtLmgKaW5kZXggZjkz NzU1ZjA5YmYxYzhlNjY1OTRjMzc0OGIwOTZmZjNlNmVjMDY4Ny4uNmI1MTE5YTZlODc4YjE2OTRh NjQxMGI3Yzc0ZTBkY2M1OTVmNzcyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyQ2hyb21pdW0uaApAQCAtMTQ3LDcgKzE0 Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFVzZXNMYXllckNsaXBwaW5nKGJvb2wgdXNlc0xh eWVyQ2xpcHBpbmcpIHsgbV91c2VzTGF5ZXJDbGlwcGluZyA9IHVzZXNMYXllckNsaXBwaW5nOyB9 CiAgICAgYm9vbCB1c2VzTGF5ZXJDbGlwcGluZygpIGNvbnN0IHsgcmV0dXJuIG1fdXNlc0xheWVy Q2xpcHBpbmc7IH0KIAotICAgIHZvaWQgc2V0SXNOb25Db21wb3NpdGVkQ29udGVudChib29sIGlz Tm9uQ29tcG9zaXRlZENvbnRlbnQpIHsgbV9pc05vbkNvbXBvc2l0ZWRDb250ZW50ID0gaXNOb25D b21wb3NpdGVkQ29udGVudDsgfQorICAgIHZpcnR1YWwgdm9pZCBzZXRJc05vbkNvbXBvc2l0ZWRD b250ZW50KGJvb2wpOwogICAgIGJvb2wgaXNOb25Db21wb3NpdGVkQ29udGVudCgpIGNvbnN0IHsg cmV0dXJuIG1faXNOb25Db21wb3NpdGVkQ29udGVudDsgfQogCiAgICAgdmlydHVhbCB2b2lkIHNl dExheWVyVHJlZUhvc3QoQ0NMYXllclRyZWVIb3N0Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9t aXVtLmNwcAppbmRleCAzMjk5MzIyOTBlN2E4MGU1ZDg0OTAxOThkMWMxZTgxOWE4ODIyMGEyLi4y MjU4MGRlMDk5Y2FmNTMxOGM0ZTQzMjhkMmI2MmY0ZjcwYzkwYTRjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTc2LDYgKzc2LDcgQEAgVGlsZWRMYXllckNocm9taXVtOjpU aWxlZExheWVyQ2hyb21pdW0oQ0NMYXllckRlbGVnYXRlKiBkZWxlZ2F0ZSkKICAgICAsIG1fc2Ft cGxlZFRleGVsRm9ybWF0KExheWVyVGV4dHVyZVVwZGF0ZXI6OlNhbXBsZWRUZXhlbEZvcm1hdElu dmFsaWQpCiAgICAgLCBtX3RpbGluZ09wdGlvbihBdXRvVGlsZSkKIHsKKyAgICBtX3RpbGVyID0g Q0NMYXllclRpbGluZ0RhdGE6OmNyZWF0ZShJbnRTaXplKGRlZmF1bHRUaWxlU2l6ZSwgZGVmYXVs dFRpbGVTaXplKSwgQ0NMYXllclRpbGluZ0RhdGE6Okhhc0JvcmRlclRleGVscyk7CiB9CiAKIFRp bGVkTGF5ZXJDaHJvbWl1bTo6flRpbGVkTGF5ZXJDaHJvbWl1bSgpCkBAIC05MSw3ICs5Miw3IEBA IHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCkKIHsKICAgICBMYXll ckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCk7CiAKLSAgICBtX3RpbGVyLmNsZWFyKCk7Cisg ICAgbV90aWxlci0+cmVzZXQoKTsKICAgICBtX3BhaW50UmVjdCA9IEludFJlY3QoKTsKICAgICBt X3JlcXVlc3RlZFVwZGF0ZVRpbGVzUmVjdCA9IEludFJlY3QoKTsKIH0KQEAgLTEyMywxMCArMTI0 LDEyIEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjp1cGRhdGVUaWxlU2l6ZUFuZFRpbGluZ09w dGlvbigpCiAKIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpzZXRUaWxlU2l6ZShjb25zdCBJbnRT aXplJiBzaXplKQogewotICAgIGlmIChtX3RpbGVyICYmIG1fdGlsZVNpemUgPT0gc2l6ZSkKLSAg ICAgICAgcmV0dXJuOwotICAgIG1fdGlsZVNpemUgPSBzaXplOwotICAgIG1fdGlsZXIuY2xlYXIo KTsgLy8gQ2hhbmdpbmcgdGhlIHRpbGUgc2l6ZSBpbnZhbGlkYXRlcyBhbGwgdGlsZXMsIHNvIHdl IGp1c3QgdGhyb3cgYXdheSB0aGUgdGlsaW5nIGRhdGEuCisgICAgbV90aWxlci0+c2V0VGlsZVNp emUoc2l6ZSk7Cit9CisKK3ZvaWQgVGlsZWRMYXllckNocm9taXVtOjpzZXRCb3JkZXJUZXhlbE9w dGlvbihDQ0xheWVyVGlsaW5nRGF0YTo6Qm9yZGVyVGV4ZWxPcHRpb24gYm9yZGVyVGV4ZWxPcHRp b24pCit7CisgICAgbV90aWxlci0+c2V0Qm9yZGVyVGV4ZWxPcHRpb24oYm9yZGVyVGV4ZWxPcHRp b24pOwogfQogCiBib29sIFRpbGVkTGF5ZXJDaHJvbWl1bTo6ZHJhd3NDb250ZW50KCkgY29uc3QK QEAgLTEzNCw5ICsxMzcsNiBAQCBib29sIFRpbGVkTGF5ZXJDaHJvbWl1bTo6ZHJhd3NDb250ZW50 KCkgY29uc3QKICAgICBpZiAoIW1fZGVsZWdhdGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAot ICAgIGlmICghbV90aWxlcikKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KICAgICBpZiAobV90aWxp bmdPcHRpb24gPT0gTmV2ZXJUaWxlICYmIG1fdGlsZXItPm51bVRpbGVzKCkgPiAxKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKQEAgLTE3MSwxOSArMTcxLDEwIEBAIHZvaWQgVGlsZWRMYXllckNo cm9taXVtOjpzZXRMYXllclRyZWVIb3N0KENDTGF5ZXJUcmVlSG9zdCogaG9zdCkKICAgICBtX3Nh bXBsZWRUZXhlbEZvcm1hdCA9IHRleHR1cmVVcGRhdGVyKCktPnNhbXBsZWRUZXhlbEZvcm1hdCht X3RleHR1cmVGb3JtYXQpOwogfQogCi12b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6Y3JlYXRlVGls ZXIoQ0NMYXllclRpbGluZ0RhdGE6OkJvcmRlclRleGVsT3B0aW9uIGJvcmRlclRleGVsT3B0aW9u KQotewotICAgIG1fdGlsZXIgPSBDQ0xheWVyVGlsaW5nRGF0YTo6Y3JlYXRlKG1fdGlsZVNpemUs IGJvcmRlclRleGVsT3B0aW9uKTsKLX0KLQogdm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnVwZGF0 ZUNvbXBvc2l0b3JSZXNvdXJjZXMoR3JhcGhpY3NDb250ZXh0M0QqLCBDQ1RleHR1cmVVcGRhdGVy JiB1cGRhdGVyKQogewotICAgIC8vIElmIHRoaXMgYXNzZXJ0IGlzIGhpdCwgaXQgbWVhbnMgdGhh dCBwYWludENvbnRlbnRzSWZEaXJ0eSBoYXNuJ3QgYmVlbgotICAgIC8vIGNhbGxlZCBvbiB0aGlz IGxheWVyLiBBbnkgbGF5ZXIgdGhhdCBpcyB1cGRhdGVkIHNob3VsZCBiZSBwYWludGVkIGZpcnN0 LgotICAgIEFTU0VSVChtX3NraXBzRHJhdyB8fCBtX3RpbGVyKTsKLQogICAgIC8vIFBhaW50aW5n IGNvdWxkIGNhdXNlIGNvbXBvc2l0aW5nIHRvIGdldCB0dXJuZWQgb2ZmLCB3aGljaCBtYXkgY2F1 c2UgdGhlIHRpbGVyIHRvIGJlY29tZSBpbnZhbGlkYXRlZCBtaWQtdXBkYXRlLgotICAgIGlmICht X3NraXBzRHJhdyB8fCBtX3JlcXVlc3RlZFVwZGF0ZVRpbGVzUmVjdC5pc0VtcHR5KCkgfHwgIW1f dGlsZXIgfHwgIW1fdGlsZXItPm51bVRpbGVzKCkpCisgICAgaWYgKG1fc2tpcHNEcmF3IHx8IG1f cmVxdWVzdGVkVXBkYXRlVGlsZXNSZWN0LmlzRW1wdHkoKSB8fCBtX3RpbGVyLT5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIGludCBsZWZ0ID0gbV9yZXF1ZXN0ZWRVcGRhdGVUaWxl c1JlY3QueCgpOwpAQCAtMjM0LDEwICsyMjUsNyBAQCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6 dXBkYXRlQ29tcG9zaXRvclJlc291cmNlcyhHcmFwaGljc0NvbnRleHQzRCosIENDVGV4dHVyZQog CiB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6c2V0VGlsaW5nT3B0aW9uKFRpbGluZ09wdGlvbiB0 aWxpbmdPcHRpb24pCiB7Ci0gICAgaWYgKG1fdGlsZXIgJiYgbV90aWxpbmdPcHRpb24gPT0gdGls aW5nT3B0aW9uKQotICAgICAgICByZXR1cm47CiAgICAgbV90aWxpbmdPcHRpb24gPSB0aWxpbmdP cHRpb247Ci0gICAgbV90aWxlci5jbGVhcigpOyAvLyBDaGFuZ2luZyB0aGUgdGlsaW5nIG9wdGlv biBpbnZhbGlkYXRlcyBhbGwgdGlsZXMsIHNvIHdlIGp1c3QgdGhyb3cgYXdheSB0aGUgdGlsaW5n IGRhdGEuCiB9CiAKIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpzZXRJc01hc2soYm9vbCBpc01h c2spCkBAIC0yNTAsMTAgKzIzOCw2IEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpwdXNoUHJv cGVydGllc1RvKENDTGF5ZXJJbXBsKiBsYXllcikKICAgICBMYXllckNocm9taXVtOjpwdXNoUHJv cGVydGllc1RvKGxheWVyKTsKIAogICAgIENDVGlsZWRMYXllckltcGwqIHRpbGVkTGF5ZXIgPSBz dGF0aWNfY2FzdDxDQ1RpbGVkTGF5ZXJJbXBsKj4obGF5ZXIpOwotICAgIGlmICghbV90aWxlcikg ewotICAgICAgICB0aWxlZExheWVyLT5zZXRTa2lwc0RyYXcodHJ1ZSk7Ci0gICAgICAgIHJldHVy bjsKLSAgICB9CiAKICAgICB0aWxlZExheWVyLT5zZXRTa2lwc0RyYXcobV9za2lwc0RyYXcpOwog ICAgIHRpbGVkTGF5ZXItPnNldENvbnRlbnRzU3dpenpsZWQobV9zYW1wbGVkVGV4ZWxGb3JtYXQg IT0gTGF5ZXJUZXh0dXJlVXBkYXRlcjo6U2FtcGxlZFRleGVsRm9ybWF0UkdCQSk7CkBAIC0zMDAs OSArMjg0LDIzIEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpzZXROZWVkc0Rpc3BsYXlSZWN0 KGNvbnN0IEZsb2F0UmVjdCYgZGlydHlSZWN0KQogICAgIExheWVyQ2hyb21pdW06OnNldE5lZWRz RGlzcGxheVJlY3QoZGlydHlSZWN0KTsKIH0KIAordm9pZCBUaWxlZExheWVyQ2hyb21pdW06OnNl dElzTm9uQ29tcG9zaXRlZENvbnRlbnQoYm9vbCBpc05vbkNvbXBvc2l0ZWRDb250ZW50KQorewor ICAgIExheWVyQ2hyb21pdW06OnNldElzTm9uQ29tcG9zaXRlZENvbnRlbnQoaXNOb25Db21wb3Np dGVkQ29udGVudCk7CisKKyAgICBDQ0xheWVyVGlsaW5nRGF0YTo6Qm9yZGVyVGV4ZWxPcHRpb24g Ym9yZGVyVGV4ZWxPcHRpb247CisjaWYgT1MoQU5EUk9JRCkKKyAgICAvLyBBbHdheXMgd2FudCBi b3JkZXIgdGV4ZWxzIGFuZCBHTF9MSU5FQVIgZHVlIHRvIHBpbmNoIHpvb20uCisgICAgYm9yZGVy VGV4ZWxPcHRpb24gPSBDQ0xheWVyVGlsaW5nRGF0YTo6SGFzQm9yZGVyVGV4ZWxzOworI2Vsc2UK KyAgICBib3JkZXJUZXhlbE9wdGlvbiA9IGlzTm9uQ29tcG9zaXRlZENvbnRlbnQgPyBDQ0xheWVy VGlsaW5nRGF0YTo6Tm9Cb3JkZXJUZXhlbHMgOiBDQ0xheWVyVGlsaW5nRGF0YTo6SGFzQm9yZGVy VGV4ZWxzOworI2VuZGlmCisgICAgc2V0Qm9yZGVyVGV4ZWxPcHRpb24oYm9yZGVyVGV4ZWxPcHRp b24pOworfQorCiB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6aW52YWxpZGF0ZVJlY3QoY29uc3Qg SW50UmVjdCYgY29udGVudFJlY3QpCiB7Ci0gICAgaWYgKCFtX3RpbGVyIHx8IGNvbnRlbnRSZWN0 LmlzRW1wdHkoKSB8fCBtX3NraXBzRHJhdykKKyAgICBpZiAobV90aWxlci0+aXNFbXB0eSgpIHx8 IGNvbnRlbnRSZWN0LmlzRW1wdHkoKSB8fCBtX3NraXBzRHJhdykKICAgICAgICAgcmV0dXJuOwog CiAgICAgLy8gRGlydHkgcmVjdHMgYXJlIGFsd2F5cyBpbiBsYXllciBzcGFjZSwgYXMgdGhlIGxh eWVyIGNvdWxkIGJlIHJlcG9zaXRpb25lZApAQCAtMzMwLDcgKzMyOCw3IEBAIHZvaWQgVGlsZWRM YXllckNocm9taXVtOjpwcm90ZWN0VmlzaWJsZVRpbGVUZXh0dXJlcygpCiAKIHZvaWQgVGlsZWRM YXllckNocm9taXVtOjpwcm90ZWN0VGlsZVRleHR1cmVzKGNvbnN0IEludFJlY3QmIGNvbnRlbnRS ZWN0KQogewotICAgIGlmICghbV90aWxlciB8fCBjb250ZW50UmVjdC5pc0VtcHR5KCkpCisgICAg aWYgKG1fdGlsZXItPmlzRW1wdHkoKSB8fCBjb250ZW50UmVjdC5pc0VtcHR5KCkpCiAgICAgICAg IHJldHVybjsKIAogICAgIGludCBsZWZ0LCB0b3AsIHJpZ2h0LCBib3R0b207CkBAIC00MzAsMTkg KzQyOCw2IEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVtOjpwcmVwYXJlVG9VcGRhdGVUaWxlcyhi b29sIGlkbGUsIGludCBsZWZ0LCBpbnQgdG9wLCBpbnQKIAogdm9pZCBUaWxlZExheWVyQ2hyb21p dW06OnByZXBhcmVUb1VwZGF0ZShjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKIHsKLSAgICBp ZiAoIW1fdGlsZXIpIHsKLSAgICAgICAgQ0NMYXllclRpbGluZ0RhdGE6OkJvcmRlclRleGVsT3B0 aW9uIGJvcmRlclRleGVsT3B0aW9uOwotI2lmIE9TKEFORFJPSUQpCi0gICAgICAgIC8vIEFsd2F5 cyB3YW50IGJvcmRlciB0ZXhlbHMgYW5kIEdMX0xJTkVBUiBkdWUgdG8gcGluY2ggem9vbS4KLSAg ICAgICAgYm9yZGVyVGV4ZWxPcHRpb24gPSBDQ0xheWVyVGlsaW5nRGF0YTo6SGFzQm9yZGVyVGV4 ZWxzOwotI2Vsc2UKLSAgICAgICAgYm9yZGVyVGV4ZWxPcHRpb24gPSBpc05vbkNvbXBvc2l0ZWRD b250ZW50KCkgPyBDQ0xheWVyVGlsaW5nRGF0YTo6Tm9Cb3JkZXJUZXhlbHMgOiBDQ0xheWVyVGls aW5nRGF0YTo6SGFzQm9yZGVyVGV4ZWxzOwotI2VuZGlmCi0gICAgICAgIGNyZWF0ZVRpbGVyKGJv cmRlclRleGVsT3B0aW9uKTsKLSAgICB9Ci0KLSAgICBBU1NFUlQobV90aWxlcik7Ci0KICAgICBt X3NraXBzRHJhdyA9IGZhbHNlOwogICAgIG1fc2tpcHNJZGxlUGFpbnQgPSBmYWxzZTsKICAgICBt X3JlcXVlc3RlZFVwZGF0ZVRpbGVzUmVjdCA9IEludFJlY3QoKTsKQEAgLTQ2OSw3ICs0NTQsNyBA QCB2b2lkIFRpbGVkTGF5ZXJDaHJvbWl1bTo6cHJlcGFyZVRvVXBkYXRlSWRsZShjb25zdCBJbnRS ZWN0JiBjb250ZW50UmVjdCkKIAogICAgIG1fdGlsZXItPmdyb3dMYXllclRvQ29udGFpbihJbnRS ZWN0KEludFBvaW50Ojp6ZXJvKCksIGNvbnRlbnRCb3VuZHMoKSkpOwogCi0gICAgaWYgKCFtX3Rp bGVyLT5udW1UaWxlcygpKQorICAgIGlmIChtX3RpbGVyLT5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIC8vIFByb3RlY3QgYW55IHRleHR1cmVzIGluIHRoZSBwcmUtcGFpbnQgYXJl YSBzbyB3ZSBkb24ndCBlbmQgdXAganVzdApAQCAtNTE1LDggKzUwMCw2IEBAIGJvb2wgVGlsZWRM YXllckNocm9taXVtOjpuZWVkc0lkbGVQYWludChjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkK ICAgICBpZiAobV9za2lwc0lkbGVQYWludCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg QVNTRVJUKG1fdGlsZXIpOwotCiAgICAgSW50UmVjdCBpZGxlUGFpbnRDb250ZW50UmVjdCA9IGlk bGVQYWludFJlY3QoY29udGVudFJlY3QpOwogCiAgICAgaW50IGxlZnQsIHRvcCwgcmlnaHQsIGJv dHRvbTsKQEAgLTUzNSw3ICs1MTgsNiBAQCBib29sIFRpbGVkTGF5ZXJDaHJvbWl1bTo6bmVlZHNJ ZGxlUGFpbnQoY29uc3QgSW50UmVjdCYgY29udGVudFJlY3QpCiAKIEludFJlY3QgVGlsZWRMYXll ckNocm9taXVtOjppZGxlUGFpbnRSZWN0KGNvbnN0IEludFJlY3QmIHZpc2libGVDb250ZW50UmVj dCkKIHsKLSAgICBBU1NFUlQobV90aWxlcik7CiAgICAgSW50UmVjdCBwcmVwYWludFJlY3QgPSB2 aXNpYmxlQ29udGVudFJlY3Q7CiAgICAgLy8gRklYTUU6IFRoaXMgY2FuIGJlIG1hZGUgYSBsb3Qg bGFyZ2VyIGlmIHdlIGNhbjoKICAgICAvLyAtIHJlc2VydmUgbWVtb3J5IGF0IGEgbG93ZXIgcHJp b3JpdHkgdGhhbiBmb3IgdmlzaWJsZSBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5o CmluZGV4IDRiMGNjNTU1MWNiYTAyNjhjODRlZTFmOTRkNTFmNWNkNWZmNjBjZTUuLjdkZjFhMDY4 MDUyZTA0ODFhNTQ4YjkyZjY5ODYwYzMzYjJmYWIxZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJv bWl1bS5oCkBAIC01NSw2ICs1NSw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRO ZWVkc0Rpc3BsYXlSZWN0KGNvbnN0IEZsb2F0UmVjdCYpOwogCisgICAgdmlydHVhbCB2b2lkIHNl dElzTm9uQ29tcG9zaXRlZENvbnRlbnQoYm9vbCk7CisKICAgICAvLyBSZXNlcnZlcyBhbGwgZXhp c3RpbmcgYW5kIHZhbGlkIHRpbGUgdGV4dHVyZXMgdG8gcHJvdGVjdCB0aGVtIGZyb20gYmVpbmcK ICAgICAvLyByZWN5Y2xlZCBieSB0aGUgdGV4dHVyZSBtYW5hZ2VyLgogICAgIHZvaWQgcHJvdGVj dFRpbGVUZXh0dXJlcyhjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCk7CkBAIC02Nyw4ICs2OSw4 IEBAIHByb3RlY3RlZDoKIAogICAgIC8vIEV4cG9zZWQgdG8gc3ViY2xhc3NlcyBmb3IgdGVzdGlu Zy4KICAgICB2b2lkIHNldFRpbGVTaXplKGNvbnN0IEludFNpemUmKTsKLSAgICB2b2lkIGNyZWF0 ZVRpbGVyKENDTGF5ZXJUaWxpbmdEYXRhOjpCb3JkZXJUZXhlbE9wdGlvbik7CiAgICAgdm9pZCBz ZXRUZXh0dXJlRm9ybWF0KEdDM0RlbnVtIHRleHR1cmVGb3JtYXQpIHsgbV90ZXh0dXJlRm9ybWF0 ID0gdGV4dHVyZUZvcm1hdDsgfQorICAgIHZvaWQgc2V0Qm9yZGVyVGV4ZWxPcHRpb24oQ0NMYXll clRpbGluZ0RhdGE6OkJvcmRlclRleGVsT3B0aW9uKTsKIAogICAgIHZpcnR1YWwgdm9pZCBjcmVh dGVUZXh0dXJlVXBkYXRlcihjb25zdCBDQ0xheWVyVHJlZUhvc3QqKSA9IDA7CiAgICAgdmlydHVh bCBMYXllclRleHR1cmVVcGRhdGVyKiB0ZXh0dXJlVXBkYXRlcigpIGNvbnN0ID0gMDsKQEAgLTEx Niw3ICsxMTgsNiBAQCBwcml2YXRlOgogICAgIExheWVyVGV4dHVyZVVwZGF0ZXI6OlNhbXBsZWRU ZXhlbEZvcm1hdCBtX3NhbXBsZWRUZXhlbEZvcm1hdDsKIAogICAgIFRpbGluZ09wdGlvbiBtX3Rp bGluZ09wdGlvbjsKLSAgICBJbnRTaXplIG1fdGlsZVNpemU7CiAgICAgT3duUHRyPENDTGF5ZXJU aWxpbmdEYXRhPiBtX3RpbGVyOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRpbGluZ0RhdGEuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRpbGluZ0RhdGEu Y3BwCmluZGV4IGM1NDJiN2Q0MjZiNzE0ZGQzZTkzMDI2NmZkMjk4MDRmN2M3NTNhZDEuLjg1MTE4 YjEzNzVlYWFmYjQyNWVjMjk3MjAzNjNiNTRkNDE1OGRiYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUaWxpbmdEYXRhLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xh eWVyVGlsaW5nRGF0YS5jcHAKQEAgLTU2LDYgKzU2LDE2IEBAIHZvaWQgQ0NMYXllclRpbGluZ0Rh dGE6OnNldFRpbGVTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiAgICAgbV90aWxpbmdEYXRhLnNl dE1heFRleHR1cmVTaXplKG1heChzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpKTsKIH0KIAor dm9pZCBDQ0xheWVyVGlsaW5nRGF0YTo6c2V0Qm9yZGVyVGV4ZWxPcHRpb24oQm9yZGVyVGV4ZWxP cHRpb24gYm9yZGVyVGV4ZWxPcHRpb24pCit7CisgICAgYm9vbCBib3JkZXJUZXhlbHMgPSBib3Jk ZXJUZXhlbE9wdGlvbiA9PSBIYXNCb3JkZXJUZXhlbHM7CisgICAgaWYgKGhhc0JvcmRlclRleGVs cygpID09IGJvcmRlclRleGVscykKKyAgICAgICAgcmV0dXJuOworCisgICAgcmVzZXQoKTsKKyAg ICBtX3RpbGluZ0RhdGEuc2V0SGFzQm9yZGVyVGV4ZWxzKGJvcmRlclRleGVscyk7Cit9CisKIGNv bnN0IENDTGF5ZXJUaWxpbmdEYXRhJiBDQ0xheWVyVGlsaW5nRGF0YTo6b3BlcmF0b3I9KGNvbnN0 IENDTGF5ZXJUaWxpbmdEYXRhJiB0aWxlcikKIHsKICAgICBtX3RpbGVTaXplID0gdGlsZXIubV90 aWxlU2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDTGF5ZXJUaWxpbmdEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVGlsaW5nRGF0YS5oCmluZGV4IGQxMmVhNzA2YjNl NjFiMzI4MDU5YmJmMWY5ZDA0M2Q4NjNlMTRkNWUuLjZlMWI3N2I0MTBiZTMzOGZjYWRjYjllYzli YTA0NWI1OTE2MDE0OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUaWxpbmdEYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRpbGluZ0RhdGEuaApAQCAtNTYs NiArNTYsOCBAQCBwdWJsaWM6CiAgICAgLy8gQ2hhbmdlIHRoZSB0aWxlIHNpemUuIFRoaXMgbWF5 IGludmFsaWRhdGUgYWxsIHRoZSBleGlzdGluZyB0aWxlcy4KICAgICB2b2lkIHNldFRpbGVTaXpl KGNvbnN0IEludFNpemUmKTsKICAgICBjb25zdCBJbnRTaXplJiB0aWxlU2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fdGlsZVNpemU7IH0KKyAgICAvLyBDaGFuZ2UgdGhlIGJvcmRlciB0ZXhlbCBzZXR0 aW5nLiBUaGlzIG1heSBpbnZhbGlkYXRlIGFsbCBleGlzdGluZyB0aWxlcy4KKyAgICB2b2lkIHNl dEJvcmRlclRleGVsT3B0aW9uKEJvcmRlclRleGVsT3B0aW9uKTsKICAgICBib29sIGhhc0JvcmRl clRleGVscygpIGNvbnN0IHsgcmV0dXJuIG1fdGlsaW5nRGF0YS5ib3JkZXJUZXhlbHMoKTsgfQog CiAgICAgYm9vbCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gIW1fdGlsaW5nRGF0YS5udW1UaWxl cygpIHx8ICF0aWxlcygpLnNpemUoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3B1L1RpbGluZ0RhdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L1RpbGluZ0RhdGEuY3BwCmluZGV4IGZmNzA4YzczZDZjM2E4OGNkZGYw MmMwNzIzYmJhZGUzMWMzMDA0ZWYuLjIwZGI0NDFjZTI1ZjU3YzZjN2ZmZWE2MjY1Yjc1MzdmYmEw OTUzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9U aWxpbmdEYXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUv VGlsaW5nRGF0YS5jcHAKQEAgLTczLDYgKzczLDEyIEBAIHZvaWQgVGlsaW5nRGF0YTo6c2V0TWF4 VGV4dHVyZVNpemUoaW50IG1heFRleHR1cmVTaXplKQogICAgIHJlY29tcHV0ZU51bVRpbGVzKCk7 CiB9CiAKK3ZvaWQgVGlsaW5nRGF0YTo6c2V0SGFzQm9yZGVyVGV4ZWxzKGJvb2wgaGFzQm9yZGVy VGV4ZWxzKQoreworICAgIG1fYm9yZGVyVGV4ZWxzID0gaGFzQm9yZGVyVGV4ZWxzID8gMSA6IDA7 CisgICAgcmVjb21wdXRlTnVtVGlsZXMoKTsKK30KKwogaW50IFRpbGluZ0RhdGE6OnRpbGVYSW5k ZXhGcm9tU3JjQ29vcmQoaW50IHNyY1BvcykgY29uc3QKIHsKICAgICBpZiAobnVtVGlsZXNYKCkg PD0gMSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9U aWxpbmdEYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGlsaW5n RGF0YS5oCmluZGV4IGRlNzIxNmVlZWQ1YTEzMjI0MDZjZTljZjQ0YTRhMjIyYjY4YjA1MWUuLmJj ODYxZWY2ODNhMzE3MmQ0ODgzZTQwYTQ1YWZmMzg4MDVhZmZiNTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9UaWxpbmdEYXRhLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L1RpbGluZ0RhdGEuaApAQCAtNDcsNiArNDcs NyBAQCBwdWJsaWM6CiAgICAgaW50IG1heFRleHR1cmVTaXplKCkgY29uc3QgeyByZXR1cm4gbV9t YXhUZXh0dXJlU2l6ZTsgfQogICAgIGludCB0b3RhbFNpemVYKCkgY29uc3QgeyByZXR1cm4gbV90 b3RhbFNpemVYOyB9CiAgICAgaW50IHRvdGFsU2l6ZVkoKSBjb25zdCB7IHJldHVybiBtX3RvdGFs U2l6ZVk7IH0KKyAgICB2b2lkIHNldEhhc0JvcmRlclRleGVscyhib29sKTsKICAgICBpbnQgYm9y ZGVyVGV4ZWxzKCkgY29uc3QgeyByZXR1cm4gbV9ib3JkZXJUZXhlbHM7IH0KIAogICAgIGludCBu dW1UaWxlcygpIGNvbnN0IHsgcmV0dXJuIG51bVRpbGVzWCgpICogbnVtVGlsZXNZKCk7IH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsZWRMYXllckNocm9taXVt VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGVkTGF5ZXJDaHJvbWl1 bVRlc3QuY3BwCmluZGV4IDhhYjYzYzg3NmJiNjVhZDFiNWNlNTQwNTc3ZGE1MDJhYjk5MDhlZTMu LmRkYmE1ZmFkNDYyYWU0Y2I1Mjg3OTNlY2ZlYzY2NmI3NGYzODE0ZmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsZWRMYXllckNocm9taXVtVGVzdC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UaWxlZExheWVyQ2hyb21pdW1UZXN0LmNw cApAQCAtODMsNyArODMsNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICBzZXRUaWxlU2l6ZShJ bnRTaXplKDEwMCwgMTAwKSk7CiAgICAgICAgIHNldFRleHR1cmVGb3JtYXQoR3JhcGhpY3NDb250 ZXh0M0Q6OlJHQkEpOwotICAgICAgICBjcmVhdGVUaWxlcihDQ0xheWVyVGlsaW5nRGF0YTo6Tm9C b3JkZXJUZXhlbHMpOworICAgICAgICBzZXRCb3JkZXJUZXhlbE9wdGlvbihDQ0xheWVyVGlsaW5n RGF0YTo6Tm9Cb3JkZXJUZXhlbHMpOwogICAgIH0KICAgICB2aXJ0dWFsIH5GYWtlVGlsZWRMYXll ckNocm9taXVtKCkgeyB9CiAKQEAgLTI1OSw0ICsyNTksMyBAQCBURVNUKFRpbGVkTGF5ZXJDaHJv bWl1bVRlc3QsIGlkbGVQYWludE91dE9mTWVtb3J5KQogfQogCiB9IC8vIG5hbWVzcGFjZQotCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RpbGluZ0RhdGFUZXN0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvVGlsaW5nRGF0YVRlc3QuY3BwCmluZGV4 IGQ0YzY4ZjU1NzQxZTdhY2I1NzlhZWJmMTg1ZGY2ZTM2YTMyZmUzZjcuLmMyOTc0M2Y4NmFkNDVi OTE2MWQ2MDUyMThmYWVhZWVjYzMxYzc4NDIgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvVGlsaW5nRGF0YVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvVGlsaW5nRGF0YVRlc3QuY3BwCkBAIC01MTIsNCArNTEyLDIzIEBAIFRFU1QoVGls aW5nRGF0YVRlc3QsIGFzc2lnbm1lbnQpCiAgICAgfQogfQogCitURVNUKFRpbGluZ0RhdGFUZXN0 LCBzZXRCb3JkZXJUZXhlbHMpCit7CisgICAgVGlsaW5nRGF0YSBkYXRhKDgsIDE2LCAzMiwgZmFs c2UpOworICAgIEVYUEVDVF9FUSgyLCBkYXRhLm51bVRpbGVzWCgpKTsKKyAgICBFWFBFQ1RfRVEo NCwgZGF0YS5udW1UaWxlc1koKSk7CisKKyAgICBkYXRhLnNldEhhc0JvcmRlclRleGVscyh0cnVl KTsKKyAgICBFWFBFQ1RfRVEoMywgZGF0YS5udW1UaWxlc1goKSk7CisgICAgRVhQRUNUX0VRKDUs IGRhdGEubnVtVGlsZXNZKCkpOworCisgICAgZGF0YS5zZXRIYXNCb3JkZXJUZXhlbHModHJ1ZSk7 CisgICAgRVhQRUNUX0VRKDMsIGRhdGEubnVtVGlsZXNYKCkpOworICAgIEVYUEVDVF9FUSg1LCBk YXRhLm51bVRpbGVzWSgpKTsKKworICAgIGRhdGEuc2V0SGFzQm9yZGVyVGV4ZWxzKGZhbHNlKTsK KyAgICBFWFBFQ1RfRVEoMiwgZGF0YS5udW1UaWxlc1goKSk7CisgICAgRVhQRUNUX0VRKDQsIGRh dGEubnVtVGlsZXNZKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZQo=