54536 2011-02-16 01:16:59 -0800 Improve showTree of Range, Position, and VisiblePosition 2011-02-16 18:33:04 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 52099 1 rniwa webkit-unassigned ap darin eric justin.garcia mjs ojan sam tkent tonikitoo tony oldest_to_newest 351931 0 rniwa 2011-02-16 01:16:59 -0800 We should enhance showTree of Range, Position, and VisiblePosition so that it doesn't use deprecatedEditingOffset. We should also update showTree of Position and VisiblePosition to dump anchor type and other useful information. 351933 1 82603 rniwa 2011-02-16 01:22:34 -0800 Created attachment 82603 Patch 352494 2 82603 tkent 2011-02-16 17:37:05 -0800 Comment on attachment 82603 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82603&action=review > Source/WebCore/dom/Position.cpp:1240 > + fprintf(stderr, "legacy, "); nit: You can use fputs() for fixed strings. 352503 3 rniwa 2011-02-16 18:10:10 -0800 Thanks for the review, Kent! (In reply to comment #2) > (From update of attachment 82603 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=82603&action=review > > > Source/WebCore/dom/Position.cpp:1240 > > + fprintf(stderr, "legacy, "); > > nit: You can use fputs() for fixed strings. Fixed. 352518 4 rniwa 2011-02-16 18:33:04 -0800 Committed r78761: <http://trac.webkit.org/changeset/78761> 82603 2011-02-16 01:22:34 -0800 2011-02-16 17:37:05 -0800 Patch bug-54536-20110216182232.patch text/plain 9441 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4Njg3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDItMTYgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgSW1wcm92ZSBzaG93VHJlZSBvZiBSYW5nZSwgUG9zaXRpb24sIGFu ZCBWaXNpYmxlUG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU0NTM2CisKKyAgICAgICAgRW5oYW5jZWQgc2hvd1RyZWUgb2YgUmFuZ2UsIFBv c2l0aW9uLCBhbmQgVmlzaWJsZVBvc2l0aW9uLgorCisgICAgICAgICogZG9tL1Bvc2l0aW9uLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlBvc2l0aW9uOjpzaG93QW5jaG9yVHlwZUFuZE9mZnNldCk6 IEFkZGVkOyBkdW1wcyAibGVnYWN5IiBpZiB0aGUgcG9zaXRpb24KKyAgICAgICAgaXMgYSBsZWdh Y3kgcG9zaXRpb24gYW5kIGFsc28gZHVtcHMgYW5jaG9yIHR5cGUuCisgICAgICAgIChXZWJDb3Jl OjpQb3NpdGlvbjo6c2hvd1RyZWVGb3JUaGlzKTogQ2FsbHMgc2hvd0FuY2hvclR5cGVBbmRPZmZz ZXQuCisgICAgICAgICogZG9tL1Bvc2l0aW9uLmg6CisgICAgICAgICogZG9tL1JhbmdlLmNwcDoK KyAgICAgICAgKHNob3dUcmVlKTogTm8gbG9uZ2VyIGNhbGxzIGRlcHJlY2F0ZWRFZGl0aW5nT2Zm c2V0LgorICAgICAgICAqIGVkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlZpc2libGVQb3NpdGlvbjo6ZGVidWdQb3NpdGlvbik6IE5vIGxvbmdlciBpbmNsdWRl ZCBpbiByZWxlYXNlIGJ1aWxkLgorICAgICAgICBDYWxscyBQb3NpdGlvbjo6c2hvd0FuY2hvclR5 cGVBbmRPZmZzZXQgaW5zdGVhZCBvZiBtYW51YWxseSBjYWxsaW5nIGRlcHJlY2F0ZWRFZGl0aW5n T2Zmc2V0LgorICAgICAgICAqIGVkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmg6CisgICAgICAgICog ZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlZpc2libGVT ZWxlY3Rpb246OmRlYnVnUG9zaXRpb24pOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlZpc2li bGVTZWxlY3Rpb246OnNob3dUcmVlRm9yVGhpcyk6IERpdHRvLgorICAgICAgICAqIGVkaXRpbmcv VmlzaWJsZVNlbGVjdGlvbi5oOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKwog MjAxMS0wMi0xNSAgSm9obiBTdWxsaXZhbiAgPHN1bGxpdmFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Q b3NpdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uLmNw cAkocmV2aXNpb24gNzg2ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMjM0LDExICsxMjM0LDI5IEBAIHZvaWQgUG9zaXRpb246OmZvcm1h dEZvckRlYnVnZ2VyKGNoYXIqIGIKICAgICBzdHJuY3B5KGJ1ZmZlciwgcmVzdWx0LnV0ZjgoKS5k YXRhKCksIGxlbmd0aCAtIDEpOwogfQogCit2b2lkIFBvc2l0aW9uOjpzaG93QW5jaG9yVHlwZUFu ZE9mZnNldCgpIGNvbnN0Cit7CisgICAgaWYgKG1faXNMZWdhY3lFZGl0aW5nUG9zaXRpb24pCisg ICAgICAgIGZwcmludGYoc3RkZXJyLCAibGVnYWN5LCAiKTsKKyAgICBzd2l0Y2ggKGFuY2hvclR5 cGUoKSkgeworICAgIGNhc2UgUG9zaXRpb25Jc09mZnNldEluQW5jaG9yOgorICAgICAgICBmcHJp bnRmKHN0ZGVyciwgIm9mZnNldCIpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBvc2l0aW9u SXNBZnRlckFuY2hvcjoKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJhZnRlciIpOworICAgICAg ICBicmVhazsKKyAgICBjYXNlIFBvc2l0aW9uSXNCZWZvcmVBbmNob3I6CisgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAiYmVmb3JlIik7CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBmcHJpbnRm KHN0ZGVyciwgIiwgb2Zmc2V0OiVkXG4iLCBtX29mZnNldCk7Cit9CisKIHZvaWQgUG9zaXRpb246 OnNob3dUcmVlRm9yVGhpcygpIGNvbnN0CiB7CiAgICAgaWYgKG5vZGUoKSkgewogICAgICAgICBu b2RlKCktPnNob3dUcmVlRm9yVGhpcygpOwotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIm9mZnNl dDogJWRcbiIsIG1fb2Zmc2V0KTsKKyAgICAgICAgc2hvd0FuY2hvclR5cGVBbmRPZmZzZXQoKTsK ICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCShyZXZpc2lvbiA3ODY4MikKKysr IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNiAr MTY2LDcgQEAgcHVibGljOgogCiAjaWZuZGVmIE5ERUJVRwogICAgIHZvaWQgZm9ybWF0Rm9yRGVi dWdnZXIoY2hhciogYnVmZmVyLCB1bnNpZ25lZCBsZW5ndGgpIGNvbnN0OworICAgIHZvaWQgc2hv d0FuY2hvclR5cGVBbmRPZmZzZXQoKSBjb25zdDsKICAgICB2b2lkIHNob3dUcmVlRm9yVGhpcygp IGNvbnN0OwogI2VuZGlmCiAgICAgCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAJKHJldmlzaW9uIDc4 NjgyKQorKysgU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTk1NiwxMCArMTk1Niw4IEBAIHZvaWQgUmFuZ2U6OmdldEJvcmRlckFuZFRleHRRdWFkcyhWZWN0 b3IKIHZvaWQgc2hvd1RyZWUoY29uc3QgV2ViQ29yZTo6UmFuZ2UqIHJhbmdlKQogewogICAgIGlm IChyYW5nZSAmJiByYW5nZS0+Ym91bmRhcnlQb2ludHNWYWxpZCgpKSB7Ci0gICAgICAgIFdlYkNv cmU6OlBvc2l0aW9uIHN0YXJ0ID0gcmFuZ2UtPnN0YXJ0UG9zaXRpb24oKTsKLSAgICAgICAgV2Vi Q29yZTo6UG9zaXRpb24gZW5kID0gcmFuZ2UtPmVuZFBvc2l0aW9uKCk7Ci0gICAgICAgIHN0YXJ0 Lm5vZGUoKS0+c2hvd1RyZWVBbmRNYXJrKHN0YXJ0Lm5vZGUoKSwgIlMiLCBlbmQubm9kZSgpLCAi RSIpOwotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInN0YXJ0IG9mZnNldDogJWQsIGVuZCBvZmZz ZXQ6ICVkXG4iLCBzdGFydC5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpLCBlbmQuZGVwcmVjYXRl ZEVkaXRpbmdPZmZzZXQoKSk7CisgICAgICAgIHJhbmdlLT5zdGFydENvbnRhaW5lcigpLT5zaG93 VHJlZUFuZE1hcmsocmFuZ2UtPnN0YXJ0Q29udGFpbmVyKCksICJTIiwgcmFuZ2UtPmVuZENvbnRh aW5lcigpLCAiRSIpOworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInN0YXJ0IG9mZnNldDogJWQs IGVuZCBvZmZzZXQ6ICVkXG4iLCByYW5nZS0+c3RhcnRPZmZzZXQoKSwgcmFuZ2UtPmVuZE9mZnNl dCgpKTsKICAgICB9CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBv c2l0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQ b3NpdGlvbi5jcHAJKHJldmlzaW9uIDc4NjgyKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9W aXNpYmxlUG9zaXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzAsMTYgKzU3MCwxOCBAQCBp bnQgVmlzaWJsZVBvc2l0aW9uOjp4T2Zmc2V0Rm9yVmVydGljYWxOCiAgICAgcmV0dXJuIHJlbmRl cmVyLT5sb2NhbFRvQWJzb2x1dGUobG9jYWxSZWN0LmxvY2F0aW9uKCkpLngoKTsKIH0KIAorI2lm bmRlZiBOREVCVUcKKwogdm9pZCBWaXNpYmxlUG9zaXRpb246OmRlYnVnUG9zaXRpb24oY29uc3Qg Y2hhciogbXNnKSBjb25zdAogewogICAgIGlmIChpc051bGwoKSkKICAgICAgICAgZnByaW50Zihz dGRlcnIsICJQb3NpdGlvbiBbJXNdOiBudWxsXG4iLCBtc2cpOwotICAgIGVsc2UKLSAgICAgICAg ZnByaW50ZihzdGRlcnIsICJQb3NpdGlvbiBbJXNdOiAlcyBbJXBdIGF0ICVkXG4iLCBtc2csIG1f ZGVlcFBvc2l0aW9uLm5vZGUoKS0+bm9kZU5hbWUoKS51dGY4KCkuZGF0YSgpLCBtX2RlZXBQb3Np dGlvbi5ub2RlKCksIG1fZGVlcFBvc2l0aW9uLmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkpOwor ICAgIGVsc2UgeworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlBvc2l0aW9uIFslc106ICVzLCAi LCBtc2csIG1fZGVlcFBvc2l0aW9uLm5vZGUoKS0+bm9kZU5hbWUoKS51dGY4KCkuZGF0YSgpKTsK KyAgICAgICAgbV9kZWVwUG9zaXRpb24uc2hvd0FuY2hvclR5cGVBbmRPZmZzZXQoKTsKKyAgICB9 CiB9CiAKLSNpZm5kZWYgTkRFQlVHCi0KIHZvaWQgVmlzaWJsZVBvc2l0aW9uOjpmb3JtYXRGb3JE ZWJ1Z2dlcihjaGFyKiBidWZmZXIsIHVuc2lnbmVkIGxlbmd0aCkgY29uc3QKIHsKICAgICBtX2Rl ZXBQb3NpdGlvbi5mb3JtYXRGb3JEZWJ1Z2dlcihidWZmZXIsIGxlbmd0aCk7CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgJKHJldmlzaW9uIDc4NjgyKQorKysg U291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkod29ya2luZyBjb3B5KQpA QCAtODAsOSArODAsNyBAQCBwdWJsaWM6CiAKICAgICBVQ2hhcjMyIGNoYXJhY3RlckFmdGVyKCkg Y29uc3Q7CiAgICAgVUNoYXIzMiBjaGFyYWN0ZXJCZWZvcmUoKSBjb25zdCB7IHJldHVybiBwcmV2 aW91cygpLmNoYXJhY3RlckFmdGVyKCk7IH0KLSAgICAKLSAgICB2b2lkIGRlYnVnUG9zaXRpb24o Y29uc3QgY2hhciogbXNnID0gIiIpIGNvbnN0OwotICAgIAorCiAgICAgRWxlbWVudCogcm9vdEVk aXRhYmxlRWxlbWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fZGVlcFBvc2l0aW9uLmlzTm90TnVsbCgp ID8gbV9kZWVwUG9zaXRpb24ubm9kZSgpLT5yb290RWRpdGFibGVFbGVtZW50KCkgOiAwOyB9CiAg ICAgCiAgICAgdm9pZCBnZXRJbmxpbmVCb3hBbmRPZmZzZXQoSW5saW5lQm94KiYgaW5saW5lQm94 LCBpbnQmIGNhcmV0T2Zmc2V0KSBjb25zdApAQCAtMTA0LDYgKzEwMiw3IEBAIHB1YmxpYzoKICAg ICBpbnQgeE9mZnNldEZvclZlcnRpY2FsTmF2aWdhdGlvbigpIGNvbnN0OwogICAgIAogI2lmbmRl ZiBOREVCVUcKKyAgICB2b2lkIGRlYnVnUG9zaXRpb24oY29uc3QgY2hhciogbXNnID0gIiIpIGNv bnN0OwogICAgIHZvaWQgZm9ybWF0Rm9yRGVidWdnZXIoY2hhciogYnVmZmVyLCB1bnNpZ25lZCBs ZW5ndGgpIGNvbnN0OwogICAgIHZvaWQgc2hvd1RyZWVGb3JUaGlzKCkgY29uc3Q7CiAjZW5kaWYK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVNlbGVjdGlvbi5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlU2VsZWN0aW9uLmNwcAkocmV2 aXNpb24gNzg2ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxlY3Rpb24u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NzUsMzAgKzU3NSwyNyBAQCBOb2RlKiBWaXNpYmxlU2Vs ZWN0aW9uOjpzaGFkb3dUcmVlUm9vdE5vCiAgICAgcmV0dXJuIHN0YXJ0KCkubm9kZSgpID8gc3Rh cnQoKS5ub2RlKCktPnNoYWRvd1RyZWVSb290Tm9kZSgpIDogMDsKIH0KIAorI2lmbmRlZiBOREVC VUcKKwogdm9pZCBWaXNpYmxlU2VsZWN0aW9uOjpkZWJ1Z1Bvc2l0aW9uKCkgY29uc3QKIHsKLSAg ICBpZiAoIW1fc3RhcnQubm9kZSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBmcHJpbnRmKHN0 ZGVyciwgIlZpc2libGVTZWxlY3Rpb24gPT09PT09PT09PT09PT09PT1cbiIpOworICAgIGZwcmlu dGYoc3RkZXJyLCAiVmlzaWJsZVNlbGVjdGlvbiA9PT09PT09PT09PT09PT1cbiIpOwogCi0gICAg aWYgKG1fc3RhcnQgPT0gbV9lbmQpIHsKLSAgICAgICAgUG9zaXRpb24gcG9zID0gbV9zdGFydDsK LSAgICAgICAgZnByaW50ZihzdGRlcnIsICJwb3M6ICAgICAgICAlcyAlcDolZFxuIiwgcG9zLm5v ZGUoKS0+bm9kZU5hbWUoKS51dGY4KCkuZGF0YSgpLCBwb3Mubm9kZSgpLCBwb3MuZGVwcmVjYXRl ZEVkaXRpbmdPZmZzZXQoKSk7CisgICAgaWYgKCFtX3N0YXJ0LmFuY2hvck5vZGUoKSkKKyAgICAg ICAgZnByaW50ZihzdGRlcnIsICJwb3M6ICAgbnVsbCIpOworICAgIGVsc2UgaWYgKG1fc3RhcnQg PT0gbV9lbmQpIHsKKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJwb3M6ICAgJXMgIiwgbV9zdGFy dC5hbmNob3JOb2RlKCktPm5vZGVOYW1lKCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgIG1fc3Rh cnQuc2hvd0FuY2hvclR5cGVBbmRPZmZzZXQoKTsKICAgICB9IGVsc2UgewotICAgICAgICBQb3Np dGlvbiBwb3MgPSBtX3N0YXJ0OwotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInN0YXJ0OiAgICAg ICVzICVwOiVkXG4iLCBwb3Mubm9kZSgpLT5ub2RlTmFtZSgpLnV0ZjgoKS5kYXRhKCksIHBvcy5u b2RlKCksIHBvcy5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpKTsKLSAgICAgICAgZnByaW50Zihz dGRlcnIsICItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIik7Ci0gICAgICAg IHBvcyA9IG1fZW5kOwotICAgICAgICBmcHJpbnRmKHN0ZGVyciwgImVuZDogICAgICAgICVzICVw OiVkXG4iLCBwb3Mubm9kZSgpLT5ub2RlTmFtZSgpLnV0ZjgoKS5kYXRhKCksIHBvcy5ub2RlKCks IHBvcy5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpKTsKLSAgICAgICAgZnByaW50ZihzdGRlcnIs ICItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIik7CisgICAgICAgIGZwcmlu dGYoc3RkZXJyLCAic3RhcnQ6ICVzICIsIG1fc3RhcnQuYW5jaG9yTm9kZSgpLT5ub2RlTmFtZSgp LnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBtX3N0YXJ0LnNob3dBbmNob3JUeXBlQW5kT2Zmc2V0 KCk7CisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiZW5kOiAgICVzICIsIG1fZW5kLmFuY2hvck5v ZGUoKS0+bm9kZU5hbWUoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgbV9lbmQuc2hvd0FuY2hv clR5cGVBbmRPZmZzZXQoKTsKICAgICB9CiAKICAgICBmcHJpbnRmKHN0ZGVyciwgIj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09XG4iKTsKIH0KIAotI2lmbmRlZiBOREVCVUcKLQogdm9p ZCBWaXNpYmxlU2VsZWN0aW9uOjpmb3JtYXRGb3JEZWJ1Z2dlcihjaGFyKiBidWZmZXIsIHVuc2ln bmVkIGxlbmd0aCkgY29uc3QKIHsKICAgICBTdHJpbmcgcmVzdWx0OwpAQCAtNjIyLDkgKzYxOSwx MiBAQCB2b2lkIFZpc2libGVTZWxlY3Rpb246OmZvcm1hdEZvckRlYnVnZ2VyCiAKIHZvaWQgVmlz aWJsZVNlbGVjdGlvbjo6c2hvd1RyZWVGb3JUaGlzKCkgY29uc3QKIHsKLSAgICBpZiAoc3RhcnQo KS5ub2RlKCkpIHsKLSAgICAgICAgc3RhcnQoKS5ub2RlKCktPnNob3dUcmVlQW5kTWFyayhzdGFy dCgpLm5vZGUoKSwgIlMiLCBlbmQoKS5ub2RlKCksICJFIik7Ci0gICAgICAgIGZwcmludGYoc3Rk ZXJyLCAic3RhcnQgb2Zmc2V0OiAlZCwgZW5kIG9mZnNldDogJWRcbiIsIHN0YXJ0KCkuZGVwcmVj YXRlZEVkaXRpbmdPZmZzZXQoKSwgZW5kKCkuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSk7Cisg ICAgaWYgKHN0YXJ0KCkuYW5jaG9yTm9kZSgpKSB7CisgICAgICAgIHN0YXJ0KCkuYW5jaG9yTm9k ZSgpLT5zaG93VHJlZUFuZE1hcmsoc3RhcnQoKS5hbmNob3JOb2RlKCksICJTIiwgZW5kKCkuYW5j aG9yTm9kZSgpLCAiRSIpOworICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInN0YXJ0OiAiKTsKKyAg ICAgICAgc3RhcnQoKS5zaG93QW5jaG9yVHlwZUFuZE9mZnNldCgpOworICAgICAgICBmcHJpbnRm KHN0ZGVyciwgImVuZDogIik7CisgICAgICAgIGVuZCgpLnNob3dBbmNob3JUeXBlQW5kT2Zmc2V0 KCk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxl Y3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVTZWxl Y3Rpb24uaAkocmV2aXNpb24gNzg2ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2li bGVTZWxlY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtOTcsMTAgKzk3LDkgQEAgcHVibGljOgog ICAgIGJvb2wgaXNDb250ZW50RWRpdGFibGUoKSBjb25zdDsKICAgICBib29sIGlzQ29udGVudFJp Y2hseUVkaXRhYmxlKCkgY29uc3Q7CiAgICAgTm9kZSogc2hhZG93VHJlZVJvb3ROb2RlKCkgY29u c3Q7Ci0gICAgCi0gICAgdm9pZCBkZWJ1Z1Bvc2l0aW9uKCkgY29uc3Q7CiAKICNpZm5kZWYgTkRF QlVHCisgICAgdm9pZCBkZWJ1Z1Bvc2l0aW9uKCkgY29uc3Q7CiAgICAgdm9pZCBmb3JtYXRGb3JE ZWJ1Z2dlcihjaGFyKiBidWZmZXIsIHVuc2lnbmVkIGxlbmd0aCkgY29uc3Q7CiAgICAgdm9pZCBz aG93VHJlZUZvclRoaXMoKSBjb25zdDsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFn ZS9FdmVudEhhbmRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAkocmV2aXNpb24gNzg2ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDYgQEAKICNpbmNsdWRl ICJVc2VyR2VzdHVyZUluZGljYXRvci5oIgogI2luY2x1ZGUgIlVzZXJUeXBpbmdHZXN0dXJlSW5k aWNhdG9yLmgiCiAjaW5jbHVkZSAiV2hlZWxFdmVudC5oIgotI2luY2x1ZGUgImh0bWxlZGl0aW5n LmgiIC8vIGZvciBjb21wYXJlUG9zaXRpb25zKCkKICNpbmNsdWRlIDx3dGYvQ3VycmVudFRpbWUu aD4KICNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAK