177598 2017-09-28 01:37:19 -0700 [Cairo] Remove the cairo_glyph_t complexity from GlyphBuffer 2017-09-28 07:55:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zan zan buildbot cgarcia mmaxfield webkit-bug-importer oldest_to_newest 1354063 0 zan 2017-09-28 01:37:19 -0700 [Cairo] Remove the cairo_glyph_t complexity from GlyphBuffer 1354064 1 322073 zan 2017-09-28 01:48:39 -0700 Created attachment 322073 Patch 1354069 2 322073 cgarcia 2017-09-28 03:31:49 -0700 Comment on attachment 322073 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=322073&action=review > Source/WebCore/ChangeLog:16 > + that will actually be drawn. This will likely in th future be leveraged th -> the 1354103 3 zan 2017-09-28 07:54:29 -0700 Committed r222610: <http://trac.webkit.org/changeset/222610> 1354104 4 webkit-bug-importer 2017-09-28 07:55:18 -0700 <rdar://problem/34713946> 322073 2017-09-28 01:48:39 -0700 2017-09-28 03:31:49 -0700 Patch bug-177598-20170928104838.patch text/plain 11267 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyNjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjcwYTg4MmI1NTc0OWYy ZGVkMWU2YzE0ZDE3NGM0MTQyYzViMWE2NS4uMDBhN2FhODY2YjFlYWIyNjc1YjE5YjU0ZTI3YmIw ZWI5YzAwN2IwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE3LTA5LTI4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbQ2Fpcm9dIFJlbW92 ZSB0aGUgY2Fpcm9fZ2x5cGhfdCBjb21wbGV4aXR5IGZyb20gR2x5cGhCdWZmZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzU5OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgZGVjYWRl LW9sZCB1c2Ugb2YgY2Fpcm9fZ2x5cGhfdCBhcyB0aGUgdW5kZXJseWluZyB0eXBlIGZvcgorICAg ICAgICBHbHlwaC4gVGhlIGZvcm1lciBzcGFucyAyNCBieXRlcyBpbiBzaXplLCB3aGlsZSB0aGUg bGF0dGUgaXMganVzdCAyCisgICAgICAgIGJ5dGVzLiBUaGUgeCBhbmQgeSBjb29yZGluYXRlIGF0 dHJpYnV0ZXMgb2YgY2Fpcm9fZ2x5cGhfdCB3ZXJlIG9ubHkKKyAgICAgICAgdXNlZCBpbiBGb250 Q2FzY2FkZTo6ZHJhd0dseXBocygpIGltcGxlbWVudGF0aW9uLCB3aGVyZSB0aGV5IHdlcmUKKyAg ICAgICAgb3ZlcnJpZGRlbiBldmVuIGlmIHRoZSBzYW1lIEdseXBoQnVmZmVyIG9iamVjdCB3YXMg dXNlZCBoZXJlIHJlcGVhdGVkbHkuCisKKyAgICAgICAgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMo KSBub3cgY3JlYXRlcyBhIG5ldyBWZWN0b3I8Y2Fpcm9fZ2x5cGhfdD4gb2JqZWN0CisgICAgICAg IGFuZCBmaWxscyBpdCBvbmx5IHdpdGggdGhlIGdseXBoIGluZGV4IGFuZCBjb29yZGluYXRlcyBk YXRhIGZvciBnbHlwaHMKKyAgICAgICAgdGhhdCB3aWxsIGFjdHVhbGx5IGJlIGRyYXduLiBUaGlz IHdpbGwgbGlrZWx5IGluIHRoIGZ1dHVyZSBiZSBsZXZlcmFnZWQKKyAgICAgICAgdG8gcGFjayB0 aGUgbmVjZXNzYXJ5IGRhdGEgYW5kIHBlcmZvcm0gdGhlIGRyYXdpbmcgb3BlcmF0aW9ucyBpbgor ICAgICAgICBwYXJhbGxlbGl6ZWQgdGFza3MuIEdseXBoQnVmZmVyIHVzYWdlcyB0aGF0IGJlZm9y ZSByZXF1aXJlZCBVU0UoQ0FJUk8pCisgICAgICAgIHNwZWNpYWwtY2FzaW5nIGNhbiBub3cgYmUg c2ltcGxpZmllZC4KKworICAgICAgICBUaGlzIGFsc28gcmVtb3ZlcyB0aGUgbmVlZCBmb3IgPGNh aXJvLmg+IGhlYWRlciBpbmNsdXNpb24gaW4gdGhlCisgICAgICAgIEdseXBoQnVmZmVyLmggaGVh ZGVyLiBUaGlzIGZ1cnRoZXIgcmVtb3ZlcyBDYWlybyBoZWFkZXIgaW5jbHVzaW9uIGluCisgICAg ICAgIHJvdWdobHkgNjAwIGJ1aWxkIHRhcmdldHMuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC0t IG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zv bnRDYXNjYWRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRDYXNjYWRlOjp3aWR0aEZvclNp bXBsZVRleHQgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVy Lmg6CisgICAgICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6Z2x5cGhBdCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpHbHlwaEJ1ZmZlcjo6YWRkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0dseXBoc1Rv Q29udGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpkcmF3R2x5cGhzU2hhZG93KToKKyAgICAgICAg KFdlYkNvcmU6OkZvbnRDYXNjYWRlOjpkcmF3R2x5cGhzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJdGVtcy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpEaXNwbGF5TGlzdDo6RHJhd0dseXBoczo6Z2VuZXJhdGVHbHlwaEJ1ZmZlciBjb25zdCk6 CisKIDIwMTctMDktMjcgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtDYWlyb10gUmVtb3ZlIHVubmVjZXNzYXJ5IGNhaXJvLmggaW5jbHVkZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggMjRjYmI5MWQzNTg2OWJkZmY0MjBlOWFlMjJhMjIzNWYzMjJjNTM2Zi4uZGU3YzllNWVh Zjg2ZTU1NzgwM2YyYTY2MWY2ZWJhZGI1ZDM4NzhjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNy0wOS0yOCAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CisKKyAg ICAgICAgW0NhaXJvXSBSZW1vdmUgdGhlIGNhaXJvX2dseXBoX3QgY29tcGxleGl0eSBmcm9tIEds eXBoQnVmZmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzc1OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFNoYXJlZC9BUEkvYy9jYWlyby9XS0ltYWdlQ2Fpcm8uY3BwOiBFeHBsaWNpdGx5IGluY2x1 ZGUgdGhlIDxjYWlyby5oPgorICAgICAgICBoZWFkZXIgaGVyZSBub3cgdGhhdCBpdCdzIG5vdCBp bmNsdWRlZCBpbiBHbHlwaEJ1ZmZlci5oLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvZ3RrL1dlYkRyYWdDbGllbnRHdGsuY3BwOiBEaXR0by4KKwogMjAxNy0wOS0yNyAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBX S0NvbnRlbnRSdWxlTGlzdCBub3RpZnkgYWN0aW9uIHR5cGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAppbmRleCAyMWQ2MDQ3OTRhZTI0MGVl YzNjYWMxZmIwMTgzNjQ0NGI5Nzc2NDBjLi42Y2I3MjA4OTQ2NmMyN2RlYWM4ZmFiMGE2YzJlYmIy ZTE3YTY1NjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9G b250Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dENhc2NhZGUuY3BwCkBAIC00MCwxMCArNDAsNiBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0F0b21p Y1N0cmluZ0hhc2guaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKLSNp ZiBVU0UoQ0FJUk8pCi0jaW5jbHVkZSA8Y2Fpcm8uaD4KLSNlbmRpZgotCiB1c2luZyBuYW1lc3Bh Y2UgV1RGOwogdXNpbmcgbmFtZXNwYWNlIFVuaWNvZGU7CiAKQEAgLTQxMSwxMyArNDA3LDcgQEAg ZmxvYXQgRm9udENhc2NhZGU6OndpZHRoRm9yU2ltcGxlVGV4dChTdHJpbmdWaWV3IHRleHQpIGNv bnN0CiAgICAgICAgIHJ1bldpZHRoICs9IGdseXBoV2lkdGg7CiAgICAgICAgIGlmICghaGFzS2Vy bmluZ09yTGlnYXR1cmVzKQogICAgICAgICAgICAgY29udGludWU7Ci0jaWYgVVNFKENBSVJPKQot ICAgICAgICBjYWlyb19nbHlwaF90IGNhaXJvR2x5cGg7Ci0gICAgICAgIGNhaXJvR2x5cGguaW5k ZXggPSBnbHlwaDsKLSAgICAgICAgZ2x5cGhzLmFwcGVuZChjYWlyb0dseXBoKTsKLSNlbHNlCiAg ICAgICAgIGdseXBocy5hcHBlbmQoZ2x5cGgpOwotI2VuZGlmCiAgICAgICAgIGFkdmFuY2VzLmFw cGVuZChGbG9hdFNpemUoZ2x5cGhXaWR0aCwgMCkpOwogICAgIH0KICAgICBpZiAoaGFzS2Vybmlu Z09yTGlnYXR1cmVzKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HbHlwaEJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR2x5 cGhCdWZmZXIuaAppbmRleCA2MWYzZjA1MGI0MzVjMjA0MDU4OTgzOWQ1NzU3MDdjYWI0Y2MxMTdh Li4xNzUyZGNiZDA4ZThmNmNjNzk5YmU0NTYzN2NjY2ZjYzUyZTc4YzNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HbHlwaEJ1ZmZlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dseXBoQnVmZmVyLmgKQEAgLTM5LDE4ICszOSwx MSBAQAogI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0dlb21ldHJ5Lmg+CiAjZW5kaWYKIAotI2lm IFVTRShDQUlSTykKLSNpbmNsdWRlIDxjYWlyby5oPgotI2VuZGlmCi0KIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogY2xhc3MgRm9udDsKIAotI2lmIFVTRShDQUlSTykKLS8vIEZJWE1FOiBXaHkgZG9l cyBDYWlybyB1c2Ugc3VjaCBhIGh1Z2Ugc3RydWN0IGluc3RlYWQgb2YganVzdCBhbiBvZmZzZXQg aW50byBhbiBhcnJheT8KLXR5cGVkZWYgY2Fpcm9fZ2x5cGhfdCBHbHlwaEJ1ZmZlckdseXBoOwot I2VsaWYgVVNFKFdJTkdESSkKKyNpZiBVU0UoV0lOR0RJKQogdHlwZWRlZiB3Y2hhcl90IEdseXBo QnVmZmVyR2x5cGg7CiAjZWxzZQogdHlwZWRlZiBHbHlwaCBHbHlwaEJ1ZmZlckdseXBoOwpAQCAt MTEwLDExICsxMDMsNyBAQCBwdWJsaWM6CiAgICAgCiAgICAgR2x5cGggZ2x5cGhBdCh1bnNpZ25l ZCBpbmRleCkgY29uc3QKICAgICB7Ci0jaWYgVVNFKENBSVJPKQotICAgICAgICByZXR1cm4gbV9n bHlwaHNbaW5kZXhdLmluZGV4OwotI2Vsc2UKICAgICAgICAgcmV0dXJuIG1fZ2x5cGhzW2luZGV4 XTsKLSNlbmRpZgogICAgIH0KIAogICAgIEdseXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNlQXQodW5z aWduZWQgaW5kZXgpIGNvbnN0CkBAIC0xMzYsMTQgKzEyNSw3IEBAIHB1YmxpYzoKICAgICB2b2lk IGFkZChHbHlwaCBnbHlwaCwgY29uc3QgRm9udCogZm9udCwgZmxvYXQgd2lkdGgsIHVuc2lnbmVk IG9mZnNldEluU3RyaW5nID0gbm9PZmZzZXQsIGNvbnN0IEZsb2F0U2l6ZSogb2Zmc2V0ID0gMCkK ICAgICB7CiAgICAgICAgIG1fZm9udC5hcHBlbmQoZm9udCk7Ci0KLSNpZiBVU0UoQ0FJUk8pCi0g ICAgICAgIGNhaXJvX2dseXBoX3QgY2Fpcm9HbHlwaDsKLSAgICAgICAgY2Fpcm9HbHlwaC5pbmRl eCA9IGdseXBoOwotICAgICAgICBtX2dseXBocy5hcHBlbmQoY2Fpcm9HbHlwaCk7Ci0jZWxzZQog ICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwotI2VuZGlmCiAKICNpZiBVU0UoQ0cpCiAg ICAgICAgIENHU2l6ZSBhZHZhbmNlID0geyB3aWR0aCwgMCB9OwpAQCAtMTY5LDEzICsxNTEsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBhZGQoR2x5cGggZ2x5cGgsIGNvbnN0IEZvbnQqIGZvbnQsIEds eXBoQnVmZmVyQWR2YW5jZSBhZHZhbmNlLCB1bnNpZ25lZCBvZmZzZXRJblN0cmluZyA9IG5vT2Zm c2V0KQogICAgIHsKICAgICAgICAgbV9mb250LmFwcGVuZChmb250KTsKLSNpZiBVU0UoQ0FJUk8p Ci0gICAgICAgIGNhaXJvX2dseXBoX3QgY2Fpcm9HbHlwaDsKLSAgICAgICAgY2Fpcm9HbHlwaC5p bmRleCA9IGdseXBoOwotICAgICAgICBtX2dseXBocy5hcHBlbmQoY2Fpcm9HbHlwaCk7Ci0jZWxz ZQogICAgICAgICBtX2dseXBocy5hcHBlbmQoZ2x5cGgpOwotI2VuZGlmCiAKICAgICAgICAgbV9h ZHZhbmNlcy5hcHBlbmQoYWR2YW5jZSk7CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ZvbnRDYWlyby5jcHAKaW5kZXggYTcxMmQwMDEx OTUyMjlmOGIwZmUxNWIwOTU4MDQ2NmMzYThkMDliMC4uODdiOGZiODdiNzkzMGVjZmEzMWRhZGQ0 NWYwMmU5ODZjYzFhMjJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vRm9udENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9Gb250Q2Fpcm8uY3BwCkBAIC00Nyw3ICs0Nyw3IEBACiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAotc3RhdGljIHZvaWQgZHJhd0dseXBoc1RvQ29udGV4dChjYWlyb190KiBj b250ZXh0LCBjb25zdCBGb250JiBmb250LCBHbHlwaEJ1ZmZlckdseXBoKiBnbHlwaHMsIHVuc2ln bmVkIG51bUdseXBocykKK3N0YXRpYyB2b2lkIGRyYXdHbHlwaHNUb0NvbnRleHQoY2Fpcm9fdCog Y29udGV4dCwgY29uc3QgRm9udCYgZm9udCwgY29uc3QgY2Fpcm9fZ2x5cGhfdCogZ2x5cGhzLCB1 bnNpZ25lZCBudW1HbHlwaHMpCiB7CiAgICAgY2Fpcm9fbWF0cml4X3Qgb3JpZ2luYWxUcmFuc2Zv cm07CiAgICAgZmxvYXQgc3ludGhldGljQm9sZE9mZnNldCA9IGZvbnQuc3ludGhldGljQm9sZE9m ZnNldCgpOwpAQCAtNjYsNyArNjYsNyBAQCBzdGF0aWMgdm9pZCBkcmF3R2x5cGhzVG9Db250ZXh0 KGNhaXJvX3QqIGNvbnRleHQsIGNvbnN0IEZvbnQmIGZvbnQsIEdseXBoQnVmZmVyRwogICAgICAg ICBjYWlyb19zZXRfbWF0cml4KGNvbnRleHQsICZvcmlnaW5hbFRyYW5zZm9ybSk7CiB9CiAKLXN0 YXRpYyB2b2lkIGRyYXdHbHlwaHNTaGFkb3coR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRl eHQsIGNvbnN0IEZsb2F0UG9pbnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBHbHlwaEJ1ZmZl ckdseXBoKiBnbHlwaHMsIHVuc2lnbmVkIG51bUdseXBocykKK3N0YXRpYyB2b2lkIGRyYXdHbHlw aHNTaGFkb3coR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEZsb2F0UG9p bnQmIHBvaW50LCBjb25zdCBGb250JiBmb250LCBjb25zdCBjYWlyb19nbHlwaF90KiBnbHlwaHMs IHVuc2lnbmVkIG51bUdseXBocykKIHsKICAgICBTaGFkb3dCbHVyJiBzaGFkb3cgPSBncmFwaGlj c0NvbnRleHQucGxhdGZvcm1Db250ZXh0KCktPnNoYWRvd0JsdXIoKTsKIApAQCAtMTAzLDM3ICsx MDMsNDIgQEAgdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQmIGNv bnRleHQsIGNvbnN0IEZvbnQmIGZvbnQsIGNvbnN0IEcKICAgICBpZiAoIWZvbnQucGxhdGZvcm1E YXRhKCkuc2l6ZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBHbHlwaEJ1ZmZlckdseXBoKiBn bHlwaHMgPSBjb25zdF9jYXN0PEdseXBoQnVmZmVyR2x5cGgqPihnbHlwaEJ1ZmZlci5nbHlwaHMo ZnJvbSkpOwotCi0gICAgZmxvYXQgb2Zmc2V0ID0gcG9pbnQueCgpOwotICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCBudW1HbHlwaHM7IGkrKykgewotICAgICAgICBnbHlwaHNbaV0ueCA9IG9m ZnNldDsKLSAgICAgICAgZ2x5cGhzW2ldLnkgPSBwb2ludC55KCk7Ci0gICAgICAgIG9mZnNldCAr PSBnbHlwaEJ1ZmZlci5hZHZhbmNlQXQoZnJvbSArIGkpLndpZHRoKCk7CisgICAgYXV0byB4T2Zm c2V0ID0gcG9pbnQueCgpOworICAgIFZlY3RvcjxjYWlyb19nbHlwaF90PiBjYWlyb0dseXBocyhu dW1HbHlwaHMpOworICAgIHsKKyAgICAgICAgQVNTRVJUKGZyb20gKyBudW1HbHlwaHMgPD0gZ2x5 cGhCdWZmZXIuc2l6ZSgpKTsKKyAgICAgICAgYXV0byogZ2x5cGhzID0gZ2x5cGhCdWZmZXIuZ2x5 cGhzKGZyb20pOworICAgICAgICBhdXRvKiBhZHZhbmNlcyA9IGdseXBoQnVmZmVyLmFkdmFuY2Vz KGZyb20pOworCisgICAgICAgIGF1dG8geU9mZnNldCA9IHBvaW50LnkoKTsKKyAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBudW1HbHlwaHM7ICsraSkgeworICAgICAgICAgICAgY2Fpcm9H bHlwaHNbaV0gPSB7IGdseXBoc1tpXSwgeE9mZnNldCwgeU9mZnNldCB9OworICAgICAgICAgICAg eE9mZnNldCArPSBhZHZhbmNlc1tpXS53aWR0aCgpOworICAgICAgICB9CiAgICAgfQogCiAgICAg UGxhdGZvcm1Db250ZXh0Q2Fpcm8qIHBsYXRmb3JtQ29udGV4dCA9IGNvbnRleHQucGxhdGZvcm1D b250ZXh0KCk7Ci0gICAgZHJhd0dseXBoc1NoYWRvdyhjb250ZXh0LCBwb2ludCwgZm9udCwgZ2x5 cGhzLCBudW1HbHlwaHMpOworICAgIGRyYXdHbHlwaHNTaGFkb3coY29udGV4dCwgcG9pbnQsIGZv bnQsIGNhaXJvR2x5cGhzLmRhdGEoKSwgbnVtR2x5cGhzKTsKIAogICAgIGNhaXJvX3QqIGNyID0g cGxhdGZvcm1Db250ZXh0LT5jcigpOwogICAgIGNhaXJvX3NhdmUoY3IpOwogCiAgICAgaWYgKGNv bnRleHQudGV4dERyYXdpbmdNb2RlKCkgJiBUZXh0TW9kZUZpbGwpIHsKICAgICAgICAgcGxhdGZv cm1Db250ZXh0LT5wcmVwYXJlRm9yRmlsbGluZyhjb250ZXh0LnN0YXRlKCksIFBsYXRmb3JtQ29u dGV4dENhaXJvOjpBZGp1c3RQYXR0ZXJuRm9yR2xvYmFsQWxwaGEpOwotICAgICAgICBkcmF3R2x5 cGhzVG9Db250ZXh0KGNyLCBmb250LCBnbHlwaHMsIG51bUdseXBocyk7CisgICAgICAgIGRyYXdH bHlwaHNUb0NvbnRleHQoY3IsIGZvbnQsIGNhaXJvR2x5cGhzLmRhdGEoKSwgbnVtR2x5cGhzKTsK ICAgICB9CiAKICAgICAvLyBQcmV2ZW50IHJ1bm5pbmcgaW50byBhIGxvbmcgY29tcHV0YXRpb24g d2l0aGluIGNhaXJvLiBJZiB0aGUgc3Ryb2tlIHdpZHRoIGlzCiAgICAgLy8gdHdpY2UgdGhlIHNp emUgb2YgdGhlIHdpZHRoIG9mIHRoZSB0ZXh0IHdlIHdpbGwgbm90IGFzayBjYWlybyB0byBzdHJv a2UKICAgICAvLyB0aGUgdGV4dCBhcyBldmVuIG9uZSBzaW5nbGUgc3Ryb2tlIHdvdWxkIGNvdmVy IHRoZSBmdWxsIHdkdGggb2YgdGhlIHRleHQuCiAgICAgLy8gIFNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM3NTkuCi0gICAgaWYgKGNvbnRleHQudGV4dERyYXdp bmdNb2RlKCkgJiBUZXh0TW9kZVN0cm9rZSAmJiBjb250ZXh0LnN0cm9rZVRoaWNrbmVzcygpIDwg MiAqIG9mZnNldCkgeworICAgIGlmIChjb250ZXh0LnRleHREcmF3aW5nTW9kZSgpICYgVGV4dE1v ZGVTdHJva2UgJiYgY29udGV4dC5zdHJva2VUaGlja25lc3MoKSA8IDIgKiB4T2Zmc2V0KSB7CiAg ICAgICAgIHBsYXRmb3JtQ29udGV4dC0+cHJlcGFyZUZvclN0cm9raW5nKGNvbnRleHQuc3RhdGUo KSk7CiAgICAgICAgIGNhaXJvX3NldF9saW5lX3dpZHRoKGNyLCBjb250ZXh0LnN0cm9rZVRoaWNr bmVzcygpKTsKIAogICAgICAgICAvLyBUaGlzIG1heSBkaXN0dXJiIHRoZSBDVE0sIGJ1dCB3ZSBh cmUgZ29pbmcgdG8gY2FsbCBjYWlyb19yZXN0b3JlIHNvb24gYWZ0ZXIuCiAgICAgICAgIGNhaXJv X3NldF9zY2FsZWRfZm9udChjciwgZm9udC5wbGF0Zm9ybURhdGEoKS5zY2FsZWRGb250KCkpOwot ICAgICAgICBjYWlyb19nbHlwaF9wYXRoKGNyLCBnbHlwaHMsIG51bUdseXBocyk7CisgICAgICAg IGNhaXJvX2dseXBoX3BhdGgoY3IsIGNhaXJvR2x5cGhzLmRhdGEoKSwgbnVtR2x5cGhzKTsKICAg ICAgICAgY2Fpcm9fc3Ryb2tlKGNyKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEl0ZW1zLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlz dEl0ZW1zLmNwcAppbmRleCAwYTdjYWJhMzE1ZmIxMzQ1MTc5YTc3ODBkY2QzYmY4MTVjNTIwOTY0 Li5lODhjNDQ4MzYwNDlkNGEwNDNmYWZlYzljZTAxN2IwNDJiZTc5MjE5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJ dGVtcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxp c3RzL0Rpc3BsYXlMaXN0SXRlbXMuY3BwCkBAIC0zNjQsMTEgKzM2NCw3IEBAIGlubGluZSBHbHlw aEJ1ZmZlciBEcmF3R2x5cGhzOjpnZW5lcmF0ZUdseXBoQnVmZmVyKCkgY29uc3QKIHsKICAgICBH bHlwaEJ1ZmZlciByZXN1bHQ7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2dseXBocy5z aXplKCk7ICsraSkgewotI2lmIFVTRShDQUlSTykKLSAgICAgICAgcmVzdWx0LmFkZChtX2dseXBo c1tpXS5pbmRleCwgJm1fZm9udC5nZXQoKSwgbV9hZHZhbmNlc1tpXSk7Ci0jZWxzZQogICAgICAg ICByZXN1bHQuYWRkKG1fZ2x5cGhzW2ldLCAmbV9mb250LmdldCgpLCBtX2FkdmFuY2VzW2ldKTsK LSNlbmRpZgogICAgIH0KICAgICByZXR1cm4gcmVzdWx0OwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvQVBJL2MvY2Fpcm8vV0tJbWFnZUNhaXJvLmNwcCBiL1NvdXJjZS9XZWJL aXQvU2hhcmVkL0FQSS9jL2NhaXJvL1dLSW1hZ2VDYWlyby5jcHAKaW5kZXggYmIyNDg1ZjZhYzVi YmExZGZhMjkxNGQ5NjZhYWMxNjAyZGZlYTQ2MS4uMzBhZjRkZmE0MWY3MjBhMWE5NWI1NzI4ZDNm ODJmOGMwMzg3Njg3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvQVBJL2MvY2Fp cm8vV0tJbWFnZUNhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9BUEkvYy9jYWly by9XS0ltYWdlQ2Fpcm8uY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiV2ViSW1hZ2Uu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0dyYXBoaWNzQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNv cmUvUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaD4KKyNpbmNsdWRlIDxjYWlyby5oPgogCiB1c2luZyBu YW1lc3BhY2UgV2ViS2l0OwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvZ3RrL1dlYkRyYWdDbGllbnRH dGsuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2d0ay9XZWJE cmFnQ2xpZW50R3RrLmNwcAppbmRleCA0YzNkYjA4N2RiYTVhNjkzOWQwZTVhYzM4MGQyNmUyYzc5 NDRjNWNlLi4wMmU2Njg3YjRmNTlkOThjZjY2NDJjMDZlZDhhMDg1N2ExNDJmY2E5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvZ3RrL1dlYkRyYWdD bGllbnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9ndGsvV2ViRHJhZ0NsaWVudEd0ay5jcHAKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlIDxX ZWJDb3JlL0dyYXBoaWNzQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFzdGVib2FyZC5o PgogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1Db250ZXh0Q2Fpcm8uaD4KKyNpbmNsdWRlIDxj YWlyby5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAo=