157861 2016-05-18 14:45:50 -0700 Clean up / Modernize TextAutoSizingValue::adjustNodeSizes() 2016-05-18 15:26:59 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez koivisto commit-queue esprehn+autocc glenn kangil.han koivisto kondapallykalyan simon.fraser zalan oldest_to_newest 1194421 0 cdumez 2016-05-18 14:45:50 -0700 Clean up / Modernize TextAutoSizingValue::adjustNodeSizes(). 1194423 1 279285 cdumez 2016-05-18 14:47:25 -0700 Created attachment 279285 Patch 1194458 2 279285 commit-queue 2016-05-18 15:26:48 -0700 Comment on attachment 279285 Patch Clearing flags on attachment: 279285 Committed r201104: <http://trac.webkit.org/changeset/201104> 1194460 3 commit-queue 2016-05-18 15:26:59 -0700 All reviewed patches have been landed. Closing bug. 279285 2016-05-18 14:47:25 -0700 2016-05-18 15:26:48 -0700 Patch bug-157861-20160518144824.patch text/plain 15167 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMDgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFiMDAxM2QwNmNhOGYy YTUwZTAyMDcxOWZjYWUyZDg3Nzg3Y2YyNS4uNWEzMDdjYjk3ZmQ2ZjFiZGYyYmExYTljYWM0YzU2 YTBjNjc0NDIzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTA1LTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgLyBNb2Rlcm5p emUgVGV4dEF1dG9TaXppbmdWYWx1ZTo6YWRqdXN0Tm9kZVNpemVzKCkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Nzg2MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFuIHVwIC8gTW9kZXJuaXplIFRl eHRBdXRvU2l6aW5nVmFsdWU6OmFkanVzdE5vZGVTaXplcygpLCBhbmQKKyAgICAgICAgdXNlIHRp Z2h0ZXIgdHlwaW5nIGZvciBhdXRvc2l6aW5nIG5vZGVzLgorCisgICAgICAgICogZG9tL0RvY3Vt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjphZGRBdXRvU2l6aW5nTm9kZSk6 CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmFkanVzdENv bXB1dGVkRm9udFNpemVzKToKKyAgICAgICAgKiByZW5kZXJpbmcvVGV4dEF1dG9TaXppbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VGV4dEF1dG9TaXppbmdWYWx1ZTo6YWRkTm9kZSk6CisgICAg ICAgIChXZWJDb3JlOjpUZXh0QXV0b1NpemluZ1ZhbHVlOjphZGp1c3ROb2RlU2l6ZXMpOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dEF1dG9TaXppbmdWYWx1ZTo6cmVzZXQpOgorICAgICAgICAqIHJl bmRlcmluZy9UZXh0QXV0b1NpemluZy5oOgorCiAyMDE2LTA1LTE4ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgU3luYyBET00gZXhjZXB0aW9u IHR5cGVzIHdpdGggV2ViSURMIGFuZCB1cGRhdGUgcHJvbWlzZSByZWplY3Rpb25zCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCAyMGMzMTA0MjdiMjFiMDllZjVmYWNlNzRiMzE0NTY2OWNkNmU1 YjgyLi4zYzY3OGVkMGE5NmRkOWJjZWJlMDA4NmU1MzQ4MjQxMmU4MGUwOTliIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTUyNzksMTEgKzUyNzksMTEgQEAgSFRNTENhbnZhc0VsZW1lbnQq IERvY3VtZW50OjpnZXRDU1NDYW52YXNFbGVtZW50KGNvbnN0IFN0cmluZyYgbmFtZSkKIAogI2lm IEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQogCi12b2lkIERvY3VtZW50OjphZGRBdXRvU2l6 aW5nTm9kZShOb2RlKiBub2RlLCBmbG9hdCBjYW5kaWRhdGVTaXplKQordm9pZCBEb2N1bWVudDo6 YWRkQXV0b1NpemluZ05vZGUoVGV4dCYgbm9kZSwgZmxvYXQgY2FuZGlkYXRlU2l6ZSkKIHsKLSAg ICBMT0coVGV4dEF1dG9zaXppbmcsICIgYWRkQXV0b1NpemluZ05vZGUgJXAgY2FuZGlkYXRlU2l6 ZT0lZiIsIG5vZGUsIGNhbmRpZGF0ZVNpemUpOworICAgIExPRyhUZXh0QXV0b3NpemluZywgIiBh ZGRBdXRvU2l6aW5nTm9kZSAlcCBjYW5kaWRhdGVTaXplPSVmIiwgJm5vZGUsIGNhbmRpZGF0ZVNp emUpOwogCi0gICAgVGV4dEF1dG9TaXppbmdLZXkga2V5KCZub2RlLT5yZW5kZXJlcigpLT5zdHls ZSgpKTsKKyAgICBUZXh0QXV0b1NpemluZ0tleSBrZXkoJm5vZGUucmVuZGVyZXIoKS0+c3R5bGUo KSk7CiAgICAgYXV0byBhZGRSZXN1bHQgPSBtX3RleHRBdXRvU2l6ZWROb2Rlcy5lbnN1cmUoV1RG TW92ZShrZXkpLCBbXSB7CiAgICAgICAgIHJldHVybiBUZXh0QXV0b1NpemluZ1ZhbHVlOjpjcmVh dGUoKTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggZWFiOWM4ZDg5Y2E3Mzk5NDM0 YWZlZmQ2ZjQ2ZTUzMGU3NTc3NmJkOS4uYmZkY2QwZmIwM2QzYzhjMmNhMDc2NDc3YjRmY2Q2NjFh ZDhlYThkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTE2OTIsNyArMTY5Miw3IEBAIHByaXZh dGU6CiAKICNpZiBFTkFCTEUoSU9TX1RFWFRfQVVUT1NJWklORykKIHB1YmxpYzoKLSAgICB2b2lk IGFkZEF1dG9TaXppbmdOb2RlKE5vZGUqLCBmbG9hdCBzaXplKTsKKyAgICB2b2lkIGFkZEF1dG9T aXppbmdOb2RlKFRleHQmLCBmbG9hdCBzaXplKTsKICAgICB2b2lkIHZhbGlkYXRlQXV0b1Npemlu Z05vZGVzKCk7CiAgICAgdm9pZCByZXNldEF1dG9TaXppbmdOb2RlcygpOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCmluZGV4IGUwMGM3NmU1OTQ4MTBh Y2Y0NzNiMzYzMDc5NDEyOTRiODc5NGFiMDcuLjNiZmRmM2Y4OTMxYjE3OTU3NWI4MjEwOGE5ZDAy YjBlNmY2M2Y5OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCkBAIC0zODA3LDcgKzM4MDcsNyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6YWRqdXN0 Q29tcHV0ZWRGb250U2l6ZXMoZmxvYXQgc2l6ZSwgZmxvYXQgdmlzaWJsZVdpZHRoKQogICAgICAg ICAgICAgICAgIGZsb2F0IGxpbmVUZXh0TXVsdGlwbGllciA9IGxpbmVDb3VudCA9PSBPTkVfTElO RSA/IG9uZUxpbmVUZXh0TXVsdGlwbGllcihzcGVjaWZpZWRTaXplKSA6IHRleHRNdWx0aXBsaWVy KHNwZWNpZmllZFNpemUpOwogICAgICAgICAgICAgICAgIGNhbmRpZGF0ZU5ld1NpemUgPSByb3Vu ZGYoc3RkOjptaW4obWluRm9udFNpemUsIHNwZWNpZmllZFNpemUgKiBsaW5lVGV4dE11bHRpcGxp ZXIpKTsKICAgICAgICAgICAgICAgICBpZiAoY2FuZGlkYXRlTmV3U2l6ZSA+IHNwZWNpZmllZFNp emUgJiYgY2FuZGlkYXRlTmV3U2l6ZSAhPSBmb250RGVzY3JpcHRpb24uY29tcHV0ZWRTaXplKCkg JiYgdGV4dC50ZXh0Tm9kZSgpICYmIG9sZFN0eWxlLnRleHRTaXplQWRqdXN0KCkuaXNBdXRvKCkp Ci0gICAgICAgICAgICAgICAgICAgIGRvY3VtZW50KCkuYWRkQXV0b1NpemluZ05vZGUodGV4dC50 ZXh0Tm9kZSgpLCBjYW5kaWRhdGVOZXdTaXplKTsKKyAgICAgICAgICAgICAgICAgICAgZG9jdW1l bnQoKS5hZGRBdXRvU2l6aW5nTm9kZSgqdGV4dC50ZXh0Tm9kZSgpLCBjYW5kaWRhdGVOZXdTaXpl KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b1NpemluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dEF1dG9TaXppbmcuY3BwCmluZGV4IGE4MWYzZjE4NjJkMjYzNWU0NzZkZGE4NGY1 MzlkZjAxYmIxOTFlYjUuLjNiZGQ3YWI4ZGI2NTQyZmRhY2M0OWM0MjYyYzA2OWViODRmZmI3NTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b1NpemluZy5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvU2l6aW5nLmNwcApAQCAtNjIs MjkgKzYyLDI3IEBAIGludCBUZXh0QXV0b1NpemluZ1ZhbHVlOjpudW1Ob2RlcygpIGNvbnN0CiAg ICAgcmV0dXJuIG1fYXV0b1NpemVkTm9kZXMuc2l6ZSgpOwogfQogCi12b2lkIFRleHRBdXRvU2l6 aW5nVmFsdWU6OmFkZE5vZGUoTm9kZSogbm9kZSwgZmxvYXQgc2l6ZSkKK3ZvaWQgVGV4dEF1dG9T aXppbmdWYWx1ZTo6YWRkTm9kZShUZXh0JiBub2RlLCBmbG9hdCBzaXplKQogewotICAgIEFTU0VS VChub2RlKTsKLSAgICBkb3duY2FzdDxSZW5kZXJUZXh0Pigqbm9kZS0+cmVuZGVyZXIoKSkuc2V0 Q2FuZGlkYXRlQ29tcHV0ZWRUZXh0U2l6ZShzaXplKTsKLSAgICBtX2F1dG9TaXplZE5vZGVzLmFk ZChub2RlKTsKKyAgICBub2RlLnJlbmRlcmVyKCktPnNldENhbmRpZGF0ZUNvbXB1dGVkVGV4dFNp emUoc2l6ZSk7CisgICAgbV9hdXRvU2l6ZWROb2Rlcy5hZGQoJm5vZGUpOwogfQogCiAjZGVmaW5l IE1BWF9TQ0FMRV9JTkNSRUFTRSAxLjdmCiAKIGJvb2wgVGV4dEF1dG9TaXppbmdWYWx1ZTo6YWRq dXN0Tm9kZVNpemVzKCkKIHsKLSAgICBib29sIG9iamVjdHNSZW1vdmVkID0gZmFsc2U7CisgICAg Ym9vbCBkaWRSZW1vdmVPYmplY3RzID0gZmFsc2U7CiAKICAgICAvLyBSZW1vdmUgc3RhbGUgbm9k ZXMuICBOb2RlcyBtYXkgaGF2ZSBoYWQgdGhlaXIgcmVuZGVyZXJzIGRldGFjaGVkLiAgV2UnbGwK ICAgICAvLyBhbHNvIG5lZWQgdG8gcmVtb3ZlIHRoZSBzdHlsZSBmcm9tIHRoZSBkb2N1bWVudHMg bV90ZXh0QXV0b1NpemVkTm9kZXMKICAgICAvLyBjb2xsZWN0aW9uLiAgUmV0dXJuIHRydWUgaW5k aWNhdGVzIHdlIG5lZWQgdG8gZG8gdGhhdCByZW1vdmFsLgotICAgIFZlY3RvcjxSZWZQdHI8Tm9k ZT4gPiBub2Rlc0ZvclJlbW92YWw7Ci0gICAgZm9yIChhdXRvJiBhdXRvU2l6aW5nTm9kZSA6IG1f YXV0b1NpemVkTm9kZXMpIHsKLSAgICAgICAgYXV0byogdGV4dCA9IGRvd25jYXN0PFJlbmRlclRl eHQ+KGF1dG9TaXppbmdOb2RlLT5yZW5kZXJlcigpKTsKKyAgICBWZWN0b3I8VGV4dCo+IG5vZGVz Rm9yUmVtb3ZhbDsKKyAgICBmb3IgKGF1dG8mIG5vZGUgOiBtX2F1dG9TaXplZE5vZGVzKSB7Cisg ICAgICAgIGF1dG8qIHRleHQgPSBub2RlLT5yZW5kZXJlcigpOwogICAgICAgICBpZiAoIXRleHQg fHwgIXRleHQtPnN0eWxlKCkudGV4dFNpemVBZGp1c3QoKS5pc0F1dG8oKSB8fCAhdGV4dC0+Y2Fu ZGlkYXRlQ29tcHV0ZWRUZXh0U2l6ZSgpKSB7Ci0gICAgICAgICAgICAvLyByZW1vdmUgbm9kZS4K LSAgICAgICAgICAgIG5vZGVzRm9yUmVtb3ZhbC5hcHBlbmQoYXV0b1NpemluZ05vZGUpOwotICAg ICAgICAgICAgb2JqZWN0c1JlbW92ZWQgPSB0cnVlOworICAgICAgICAgICAgbm9kZXNGb3JSZW1v dmFsLmFwcGVuZChub2RlLmdldCgpKTsKKyAgICAgICAgICAgIGRpZFJlbW92ZU9iamVjdHMgPSB0 cnVlOwogICAgICAgICB9CiAgICAgfQogCkBAIC05NCw4MyArOTIsODkgQEAgYm9vbCBUZXh0QXV0 b1NpemluZ1ZhbHVlOjphZGp1c3ROb2RlU2l6ZXMoKQogICAgIC8vIElmIHdlIG9ubHkgaGF2ZSBv bmUgcGllY2Ugb2YgdGV4dCB3aXRoIHRoZSBzdHlsZSBvbiB0aGUgcGFnZSBkb24ndAogICAgIC8v IGFkanVzdCBpdCdzIHNpemUuCiAgICAgaWYgKG1fYXV0b1NpemVkTm9kZXMuc2l6ZSgpIDw9IDEp Ci0gICAgICAgIHJldHVybiBvYmplY3RzUmVtb3ZlZDsKKyAgICAgICAgcmV0dXJuIGRpZFJlbW92 ZU9iamVjdHM7CiAKICAgICAvLyBDb21wdXRlIGF2ZXJhZ2Ugc2l6ZQogICAgIGZsb2F0IGN1bXVs YXRpdmVTaXplID0gMDsKLSAgICBmb3IgKGF1dG8mIGF1dG9TaXppbmdOb2RlIDogbV9hdXRvU2l6 ZWROb2RlcykgewotICAgICAgICBSZW5kZXJUZXh0JiByZW5kZXJUZXh0ID0gZG93bmNhc3Q8UmVu ZGVyVGV4dD4oKmF1dG9TaXppbmdOb2RlLT5yZW5kZXJlcigpKTsKLSAgICAgICAgY3VtdWxhdGl2 ZVNpemUgKz0gcmVuZGVyVGV4dC5jYW5kaWRhdGVDb21wdXRlZFRleHRTaXplKCk7Ci0gICAgfQor ICAgIGZvciAoYXV0byYgbm9kZSA6IG1fYXV0b1NpemVkTm9kZXMpCisgICAgICAgIGN1bXVsYXRp dmVTaXplICs9IG5vZGUtPnJlbmRlcmVyKCktPmNhbmRpZGF0ZUNvbXB1dGVkVGV4dFNpemUoKTsK IAogICAgIGZsb2F0IGF2ZXJhZ2VTaXplID0gcm91bmRmKGN1bXVsYXRpdmVTaXplIC8gbV9hdXRv U2l6ZWROb2Rlcy5zaXplKCkpOwogCiAgICAgLy8gQWRqdXN0IHNpemVzCiAgICAgYm9vbCBmaXJz dFBhc3MgPSB0cnVlOwotICAgIGZvciAoYXV0byYgYXV0b1NpemluZ05vZGUgOiBtX2F1dG9TaXpl ZE5vZGVzKSB7Ci0gICAgICAgIGF1dG8qIHRleHQgPSBkb3duY2FzdDxSZW5kZXJUZXh0PihhdXRv U2l6aW5nTm9kZS0+cmVuZGVyZXIoKSk7Ci0gICAgICAgIGlmICh0ZXh0ICYmIHRleHQtPnN0eWxl KCkuZm9udERlc2NyaXB0aW9uKCkuY29tcHV0ZWRTaXplKCkgIT0gYXZlcmFnZVNpemUpIHsKLSAg ICAgICAgICAgIGZsb2F0IHNwZWNpZmllZFNpemUgPSB0ZXh0LT5zdHlsZSgpLmZvbnREZXNjcmlw dGlvbigpLnNwZWNpZmllZFNpemUoKTsKLSAgICAgICAgICAgIGZsb2F0IHNjYWxlQ2hhbmdlID0g YXZlcmFnZVNpemUgLyBzcGVjaWZpZWRTaXplOwotICAgICAgICAgICAgaWYgKHNjYWxlQ2hhbmdl ID4gTUFYX1NDQUxFX0lOQ1JFQVNFICYmIGZpcnN0UGFzcykgewotICAgICAgICAgICAgICAgIGZp cnN0UGFzcyA9IGZhbHNlOwotICAgICAgICAgICAgICAgIGF2ZXJhZ2VTaXplID0gcm91bmRmKHNw ZWNpZmllZFNpemUgKiBNQVhfU0NBTEVfSU5DUkVBU0UpOwotICAgICAgICAgICAgICAgIHNjYWxl Q2hhbmdlID0gYXZlcmFnZVNpemUgLyBzcGVjaWZpZWRTaXplOwotICAgICAgICAgICAgfQotCi0g ICAgICAgICAgICBMT0coVGV4dEF1dG9zaXppbmcsICIgIGFkanVzdCBub2RlIHNpemUgJXAgZmly c3RQYXNzPSVkIGF2ZXJhZ2VTaXplPSVmIHNjYWxlQ2hhbmdlPSVmIiwgYXV0b1NpemluZ05vZGUu Z2V0KCksIGZpcnN0UGFzcywgYXZlcmFnZVNpemUsIHNjYWxlQ2hhbmdlKTsKKyAgICBmb3IgKGF1 dG8mIG5vZGUgOiBtX2F1dG9TaXplZE5vZGVzKSB7CisgICAgICAgIGF1dG8qIHRleHQgPSBub2Rl LT5yZW5kZXJlcigpOworICAgICAgICBpZiAoIXRleHQgfHwgdGV4dC0+c3R5bGUoKS5mb250RGVz Y3JpcHRpb24oKS5jb21wdXRlZFNpemUoKSA9PSBhdmVyYWdlU2l6ZSkKKyAgICAgICAgICAgIGNv bnRpbnVlOwogCi0gICAgICAgICAgICBhdXRvIHN0eWxlID0gY2xvbmVSZW5kZXJTdHlsZVdpdGhT dGF0ZSh0ZXh0LT5zdHlsZSgpKTsKLSAgICAgICAgICAgIGF1dG8gZm9udERlc2NyaXB0aW9uID0g c3R5bGUuZm9udERlc2NyaXB0aW9uKCk7Ci0gICAgICAgICAgICBmb250RGVzY3JpcHRpb24uc2V0 Q29tcHV0ZWRTaXplKGF2ZXJhZ2VTaXplKTsKKyAgICAgICAgZmxvYXQgc3BlY2lmaWVkU2l6ZSA9 IHRleHQtPnN0eWxlKCkuZm9udERlc2NyaXB0aW9uKCkuc3BlY2lmaWVkU2l6ZSgpOworICAgICAg ICBmbG9hdCBzY2FsZUNoYW5nZSA9IGF2ZXJhZ2VTaXplIC8gc3BlY2lmaWVkU2l6ZTsKKyAgICAg ICAgaWYgKHNjYWxlQ2hhbmdlID4gTUFYX1NDQUxFX0lOQ1JFQVNFICYmIGZpcnN0UGFzcykgewor ICAgICAgICAgICAgZmlyc3RQYXNzID0gZmFsc2U7CisgICAgICAgICAgICBhdmVyYWdlU2l6ZSA9 IHJvdW5kZihzcGVjaWZpZWRTaXplICogTUFYX1NDQUxFX0lOQ1JFQVNFKTsKKyAgICAgICAgICAg IHNjYWxlQ2hhbmdlID0gYXZlcmFnZVNpemUgLyBzcGVjaWZpZWRTaXplOworICAgICAgICB9CisK KyAgICAgICAgTE9HKFRleHRBdXRvc2l6aW5nLCAiICBhZGp1c3Qgbm9kZSBzaXplICVwIGZpcnN0 UGFzcz0lZCBhdmVyYWdlU2l6ZT0lZiBzY2FsZUNoYW5nZT0lZiIsIG5vZGUuZ2V0KCksIGZpcnN0 UGFzcywgYXZlcmFnZVNpemUsIHNjYWxlQ2hhbmdlKTsKKworICAgICAgICBhdXRvKiBwYXJlbnRS ZW5kZXJlciA9IHRleHQtPnBhcmVudCgpOworCisgICAgICAgIGF1dG8gc3R5bGUgPSBjbG9uZVJl bmRlclN0eWxlV2l0aFN0YXRlKHRleHQtPnN0eWxlKCkpOworICAgICAgICBhdXRvIGZvbnREZXNj cmlwdGlvbiA9IHN0eWxlLmZvbnREZXNjcmlwdGlvbigpOworICAgICAgICBmb250RGVzY3JpcHRp b24uc2V0Q29tcHV0ZWRTaXplKGF2ZXJhZ2VTaXplKTsKKyAgICAgICAgc3R5bGUuc2V0Rm9udERl c2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CisgICAgICAgIHN0eWxlLmZvbnRDYXNjYWRlKCku dXBkYXRlKCZub2RlLT5kb2N1bWVudCgpLmZvbnRTZWxlY3RvcigpKTsKKyAgICAgICAgcGFyZW50 UmVuZGVyZXItPnNldFN0eWxlKFdURk1vdmUoc3R5bGUpKTsKKworICAgICAgICBpZiAocGFyZW50 UmVuZGVyZXItPmlzQW5vbnltb3VzQmxvY2soKSkKKyAgICAgICAgICAgIHBhcmVudFJlbmRlcmVy ID0gcGFyZW50UmVuZGVyZXItPnBhcmVudCgpOworCisgICAgICAgIC8vIElmIHdlIGhhdmUgYSBs aXN0IHdlIHNob3VsZCByZXNpemUgTGlzdE1hcmtlcnMgc2VwYXJhdGVseS4KKyAgICAgICAgaWYg KGlzPFJlbmRlckxpc3RNYXJrZXI+KCpwYXJlbnRSZW5kZXJlci0+Zmlyc3RDaGlsZCgpKSkgewor ICAgICAgICAgICAgYXV0byYgbGlzdE1hcmtlclJlbmRlcmVyID0gZG93bmNhc3Q8UmVuZGVyTGlz dE1hcmtlcj4oKnBhcmVudFJlbmRlcmVyLT5maXJzdENoaWxkKCkpOworICAgICAgICAgICAgYXV0 byBzdHlsZSA9IGNsb25lUmVuZGVyU3R5bGVXaXRoU3RhdGUobGlzdE1hcmtlclJlbmRlcmVyLnN0 eWxlKCkpOwogICAgICAgICAgICAgc3R5bGUuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlw dGlvbik7Ci0gICAgICAgICAgICBzdHlsZS5mb250Q2FzY2FkZSgpLnVwZGF0ZSgmYXV0b1Npemlu Z05vZGUtPmRvY3VtZW50KCkuZm9udFNlbGVjdG9yKCkpOwotICAgICAgICAgICAgdGV4dC0+cGFy ZW50KCktPnNldFN0eWxlKFdURk1vdmUoc3R5bGUpKTsKLQotICAgICAgICAgICAgUmVuZGVyRWxl bWVudCogcGFyZW50UmVuZGVyZXIgPSB0ZXh0LT5wYXJlbnQoKTsKLSAgICAgICAgICAgIGlmIChw YXJlbnRSZW5kZXJlci0+aXNBbm9ueW1vdXNCbG9jaygpKQotICAgICAgICAgICAgICAgIHBhcmVu dFJlbmRlcmVyID0gcGFyZW50UmVuZGVyZXItPnBhcmVudCgpOwotCi0gICAgICAgICAgICAvLyBJ ZiB3ZSBoYXZlIGEgbGlzdCB3ZSBzaG91bGQgcmVzaXplIExpc3RNYXJrZXJzIHNlcGFyYXRlbHku Ci0gICAgICAgICAgICBSZW5kZXJPYmplY3QqIGxpc3RNYXJrZXJSZW5kZXJlciA9IHBhcmVudFJl bmRlcmVyLT5maXJzdENoaWxkKCk7Ci0gICAgICAgICAgICBpZiAobGlzdE1hcmtlclJlbmRlcmVy LT5pc0xpc3RNYXJrZXIoKSkgewotICAgICAgICAgICAgICAgIGF1dG8gc3R5bGUgPSBjbG9uZVJl bmRlclN0eWxlV2l0aFN0YXRlKGxpc3RNYXJrZXJSZW5kZXJlci0+c3R5bGUoKSk7Ci0gICAgICAg ICAgICAgICAgc3R5bGUuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7Ci0gICAg ICAgICAgICAgICAgc3R5bGUuZm9udENhc2NhZGUoKS51cGRhdGUoJmF1dG9TaXppbmdOb2RlLT5k b2N1bWVudCgpLmZvbnRTZWxlY3RvcigpKTsKLSAgICAgICAgICAgICAgICBkb3duY2FzdDxSZW5k ZXJMaXN0TWFya2VyPigqbGlzdE1hcmtlclJlbmRlcmVyKS5zZXRTdHlsZShXVEZNb3ZlKHN0eWxl KSk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIC8vIFJlc2l6ZSB0aGUgbGluZSBoZWln aHQgb2YgdGhlIHBhcmVudC4KLSAgICAgICAgICAgIGF1dG8mIHBhcmVudFN0eWxlID0gcGFyZW50 UmVuZGVyZXItPnN0eWxlKCk7Ci0gICAgICAgICAgICBMZW5ndGggbGluZUhlaWdodExlbmd0aCA9 IHBhcmVudFN0eWxlLnNwZWNpZmllZExpbmVIZWlnaHQoKTsKLQotICAgICAgICAgICAgaW50IHNw ZWNpZmllZExpbmVIZWlnaHQgPSAwOwotICAgICAgICAgICAgaWYgKGxpbmVIZWlnaHRMZW5ndGgu aXNQZXJjZW50KCkpCi0gICAgICAgICAgICAgICAgc3BlY2lmaWVkTGluZUhlaWdodCA9IG1pbmlt dW1WYWx1ZUZvckxlbmd0aChsaW5lSGVpZ2h0TGVuZ3RoLCBmb250RGVzY3JpcHRpb24uc3BlY2lm aWVkU2l6ZSgpKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBzcGVjaWZpZWRM aW5lSGVpZ2h0ID0gbGluZUhlaWdodExlbmd0aC52YWx1ZSgpOwotCi0gICAgICAgICAgICBpbnQg bGluZUhlaWdodCA9IHNwZWNpZmllZExpbmVIZWlnaHQgKiBzY2FsZUNoYW5nZTsKLSAgICAgICAg ICAgIGlmICghbGluZUhlaWdodExlbmd0aC5pc0ZpeGVkKCkgfHwgbGluZUhlaWdodExlbmd0aC52 YWx1ZSgpICE9IGxpbmVIZWlnaHQpIHsKLSAgICAgICAgICAgICAgICBhdXRvIG5ld1BhcmVudFN0 eWxlID0gY2xvbmVSZW5kZXJTdHlsZVdpdGhTdGF0ZShwYXJlbnRTdHlsZSk7Ci0gICAgICAgICAg ICAgICAgbmV3UGFyZW50U3R5bGUuc2V0TGluZUhlaWdodChMZW5ndGgobGluZUhlaWdodCwgRml4 ZWQpKTsKLSAgICAgICAgICAgICAgICBuZXdQYXJlbnRTdHlsZS5zZXRTcGVjaWZpZWRMaW5lSGVp Z2h0KGxpbmVIZWlnaHRMZW5ndGgpOwotICAgICAgICAgICAgICAgIG5ld1BhcmVudFN0eWxlLnNl dEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwotICAgICAgICAgICAgICAgIG5ld1Bh cmVudFN0eWxlLmZvbnRDYXNjYWRlKCkudXBkYXRlKCZhdXRvU2l6aW5nTm9kZS0+ZG9jdW1lbnQo KS5mb250U2VsZWN0b3IoKSk7Ci0gICAgICAgICAgICAgICAgcGFyZW50UmVuZGVyZXItPnNldFN0 eWxlKFdURk1vdmUobmV3UGFyZW50U3R5bGUpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHN0eWxlLmZvbnRDYXNjYWRlKCkudXBkYXRlKCZub2RlLT5kb2N1bWVudCgpLmZvbnRTZWxlY3Rv cigpKTsKKyAgICAgICAgICAgIGxpc3RNYXJrZXJSZW5kZXJlci5zZXRTdHlsZShXVEZNb3ZlKHN0 eWxlKSk7CiAgICAgICAgIH0KKworICAgICAgICAvLyBSZXNpemUgdGhlIGxpbmUgaGVpZ2h0IG9m IHRoZSBwYXJlbnQuCisgICAgICAgIGF1dG8mIHBhcmVudFN0eWxlID0gcGFyZW50UmVuZGVyZXIt PnN0eWxlKCk7CisgICAgICAgIExlbmd0aCBsaW5lSGVpZ2h0TGVuZ3RoID0gcGFyZW50U3R5bGUu c3BlY2lmaWVkTGluZUhlaWdodCgpOworCisgICAgICAgIGludCBzcGVjaWZpZWRMaW5lSGVpZ2h0 OworICAgICAgICBpZiAobGluZUhlaWdodExlbmd0aC5pc1BlcmNlbnQoKSkKKyAgICAgICAgICAg IHNwZWNpZmllZExpbmVIZWlnaHQgPSBtaW5pbXVtVmFsdWVGb3JMZW5ndGgobGluZUhlaWdodExl bmd0aCwgZm9udERlc2NyaXB0aW9uLnNwZWNpZmllZFNpemUoKSk7CisgICAgICAgIGVsc2UKKyAg ICAgICAgICAgIHNwZWNpZmllZExpbmVIZWlnaHQgPSBsaW5lSGVpZ2h0TGVuZ3RoLnZhbHVlKCk7 CisKKyAgICAgICAgaW50IGxpbmVIZWlnaHQgPSBzcGVjaWZpZWRMaW5lSGVpZ2h0ICogc2NhbGVD aGFuZ2U7CisgICAgICAgIGlmIChsaW5lSGVpZ2h0TGVuZ3RoLmlzRml4ZWQoKSAmJiBsaW5lSGVp Z2h0TGVuZ3RoLnZhbHVlKCkgPT0gbGluZUhlaWdodCkKKyAgICAgICAgICAgIGNvbnRpbnVlOwor CisgICAgICAgIGF1dG8gbmV3UGFyZW50U3R5bGUgPSBjbG9uZVJlbmRlclN0eWxlV2l0aFN0YXRl KHBhcmVudFN0eWxlKTsKKyAgICAgICAgbmV3UGFyZW50U3R5bGUuc2V0TGluZUhlaWdodChMZW5n dGgobGluZUhlaWdodCwgRml4ZWQpKTsKKyAgICAgICAgbmV3UGFyZW50U3R5bGUuc2V0U3BlY2lm aWVkTGluZUhlaWdodChsaW5lSGVpZ2h0TGVuZ3RoKTsKKyAgICAgICAgbmV3UGFyZW50U3R5bGUu c2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CisgICAgICAgIG5ld1BhcmVudFN0 eWxlLmZvbnRDYXNjYWRlKCkudXBkYXRlKCZub2RlLT5kb2N1bWVudCgpLmZvbnRTZWxlY3Rvcigp KTsKKyAgICAgICAgcGFyZW50UmVuZGVyZXItPnNldFN0eWxlKFdURk1vdmUobmV3UGFyZW50U3R5 bGUpKTsKICAgICB9CiAKLSAgICByZXR1cm4gb2JqZWN0c1JlbW92ZWQ7CisgICAgcmV0dXJuIGRp ZFJlbW92ZU9iamVjdHM7CiB9CiAKIHZvaWQgVGV4dEF1dG9TaXppbmdWYWx1ZTo6cmVzZXQoKQog ewotICAgIGZvciAoYXV0byYgYXV0b1NpemluZ05vZGUgOiBtX2F1dG9TaXplZE5vZGVzKSB7Ci0g ICAgICAgIGF1dG8qIHRleHQgPSBkb3duY2FzdDxSZW5kZXJUZXh0PihhdXRvU2l6aW5nTm9kZS0+ cmVuZGVyZXIoKSk7CisgICAgZm9yIChhdXRvJiBub2RlIDogbV9hdXRvU2l6ZWROb2Rlcykgewor ICAgICAgICBhdXRvKiB0ZXh0ID0gbm9kZS0+cmVuZGVyZXIoKTsKICAgICAgICAgaWYgKCF0ZXh0 KQogICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgYXV0byogcGFyZW50UmVuZGVyZXIg PSB0ZXh0LT5wYXJlbnQoKTsKKyAgICAgICAgaWYgKCFwYXJlbnRSZW5kZXJlcikKKyAgICAgICAg ICAgIGNvbnRpbnVlOworCiAgICAgICAgIC8vIFJlc2V0IHRoZSBmb250IHNpemUgYmFjayB0byB0 aGUgb3JpZ2luYWwgc3BlY2lmaWVkIHNpemUKICAgICAgICAgYXV0byBmb250RGVzY3JpcHRpb24g PSB0ZXh0LT5zdHlsZSgpLmZvbnREZXNjcmlwdGlvbigpOwogICAgICAgICBmbG9hdCBvcmlnaW5h bFNpemUgPSBmb250RGVzY3JpcHRpb24uc3BlY2lmaWVkU2l6ZSgpOwpAQCAtMTc4LDI2ICsxODIs MjQgQEAgdm9pZCBUZXh0QXV0b1NpemluZ1ZhbHVlOjpyZXNldCgpCiAgICAgICAgICAgICBmb250 RGVzY3JpcHRpb24uc2V0Q29tcHV0ZWRTaXplKG9yaWdpbmFsU2l6ZSk7CiAgICAgICAgICAgICBh dXRvIHN0eWxlID0gY2xvbmVSZW5kZXJTdHlsZVdpdGhTdGF0ZSh0ZXh0LT5zdHlsZSgpKTsKICAg ICAgICAgICAgIHN0eWxlLnNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwotICAg ICAgICAgICAgc3R5bGUuZm9udENhc2NhZGUoKS51cGRhdGUoJmF1dG9TaXppbmdOb2RlLT5kb2N1 bWVudCgpLmZvbnRTZWxlY3RvcigpKTsKLSAgICAgICAgICAgIHRleHQtPnBhcmVudCgpLT5zZXRT dHlsZShXVEZNb3ZlKHN0eWxlKSk7CisgICAgICAgICAgICBzdHlsZS5mb250Q2FzY2FkZSgpLnVw ZGF0ZSgmbm9kZS0+ZG9jdW1lbnQoKS5mb250U2VsZWN0b3IoKSk7CisgICAgICAgICAgICBwYXJl bnRSZW5kZXJlci0+c2V0U3R5bGUoV1RGTW92ZShzdHlsZSkpOwogICAgICAgICB9Ci0gICAgICAg IC8vIFJlc2V0IHRoZSBsaW5lIGhlaWdodCBvZiB0aGUgcGFyZW50LgotICAgICAgICBSZW5kZXJF bGVtZW50KiBwYXJlbnRSZW5kZXJlciA9IHRleHQtPnBhcmVudCgpOwotICAgICAgICBpZiAoIXBh cmVudFJlbmRlcmVyKQotICAgICAgICAgICAgY29udGludWU7CiAKKyAgICAgICAgLy8gUmVzZXQg dGhlIGxpbmUgaGVpZ2h0IG9mIHRoZSBwYXJlbnQuCiAgICAgICAgIGlmIChwYXJlbnRSZW5kZXJl ci0+aXNBbm9ueW1vdXNCbG9jaygpKQogICAgICAgICAgICAgcGFyZW50UmVuZGVyZXIgPSBwYXJl bnRSZW5kZXJlci0+cGFyZW50KCk7CiAKICAgICAgICAgYXV0byYgcGFyZW50U3R5bGUgPSBwYXJl bnRSZW5kZXJlci0+c3R5bGUoKTsKICAgICAgICAgTGVuZ3RoIG9yaWdpbmFsTGluZUhlaWdodCA9 IHBhcmVudFN0eWxlLnNwZWNpZmllZExpbmVIZWlnaHQoKTsKLSAgICAgICAgaWYgKG9yaWdpbmFs TGluZUhlaWdodCAhPSBwYXJlbnRTdHlsZS5saW5lSGVpZ2h0KCkpIHsKLSAgICAgICAgICAgIGF1 dG8gbmV3UGFyZW50U3R5bGUgPSBjbG9uZVJlbmRlclN0eWxlV2l0aFN0YXRlKHBhcmVudFN0eWxl KTsKLSAgICAgICAgICAgIG5ld1BhcmVudFN0eWxlLnNldExpbmVIZWlnaHQob3JpZ2luYWxMaW5l SGVpZ2h0KTsKLSAgICAgICAgICAgIG5ld1BhcmVudFN0eWxlLnNldEZvbnREZXNjcmlwdGlvbihm b250RGVzY3JpcHRpb24pOwotICAgICAgICAgICAgbmV3UGFyZW50U3R5bGUuZm9udENhc2NhZGUo KS51cGRhdGUoJmF1dG9TaXppbmdOb2RlLT5kb2N1bWVudCgpLmZvbnRTZWxlY3RvcigpKTsKLSAg ICAgICAgICAgIHBhcmVudFJlbmRlcmVyLT5zZXRTdHlsZShXVEZNb3ZlKG5ld1BhcmVudFN0eWxl KSk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKG9yaWdpbmFsTGluZUhlaWdodCA9PSBwYXJlbnRT dHlsZS5saW5lSGVpZ2h0KCkpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICBhdXRv IG5ld1BhcmVudFN0eWxlID0gY2xvbmVSZW5kZXJTdHlsZVdpdGhTdGF0ZShwYXJlbnRTdHlsZSk7 CisgICAgICAgIG5ld1BhcmVudFN0eWxlLnNldExpbmVIZWlnaHQob3JpZ2luYWxMaW5lSGVpZ2h0 KTsKKyAgICAgICAgbmV3UGFyZW50U3R5bGUuc2V0Rm9udERlc2NyaXB0aW9uKGZvbnREZXNjcmlw dGlvbik7CisgICAgICAgIG5ld1BhcmVudFN0eWxlLmZvbnRDYXNjYWRlKCkudXBkYXRlKCZub2Rl LT5kb2N1bWVudCgpLmZvbnRTZWxlY3RvcigpKTsKKyAgICAgICAgcGFyZW50UmVuZGVyZXItPnNl dFN0eWxlKFdURk1vdmUobmV3UGFyZW50U3R5bGUpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0QXV0b1NpemluZy5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHRBdXRvU2l6aW5nLmgKaW5kZXggNjkxZjA2MjRhMzE2ZjA2N2Q3NmQw OWQ4OTJmNjYwNjgyMWU3ZmQ5ZC4uNzdhZjFlYzZkZDVkZjg3NTMyMjFlZWJjYjFmMGZkYTdjZjYy NzU3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvU2l6aW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvU2l6aW5nLmgKQEAgLTM2 LDcgKzM2LDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRG9jdW1lbnQ7Ci1jbGFz cyBOb2RlOworY2xhc3MgVGV4dDsKIAogY2xhc3MgVGV4dEF1dG9TaXppbmdLZXkgewogcHVibGlj OgpAQCAtNzgsMTMgKzc4LDEzIEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgVGV4dEF1dG9TaXppbmdWYWx1ZSk7CiAgICAgfQogCi0gICAgdm9pZCBhZGROb2RlKE5vZGUq LCBmbG9hdCBzaXplKTsKKyAgICB2b2lkIGFkZE5vZGUoVGV4dCYsIGZsb2F0IHNpemUpOwogICAg IGJvb2wgYWRqdXN0Tm9kZVNpemVzKCk7CiAgICAgaW50IG51bU5vZGVzKCkgY29uc3Q7CiAgICAg dm9pZCByZXNldCgpOwogcHJpdmF0ZToKICAgICBUZXh0QXV0b1NpemluZ1ZhbHVlKCkgeyB9Ci0g ICAgSGFzaFNldDxSZWZQdHI8Tm9kZT4gPiBtX2F1dG9TaXplZE5vZGVzOworICAgIEhhc2hTZXQ8 UmVmUHRyPFRleHQ+PiBtX2F1dG9TaXplZE5vZGVzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQo=