122887 2013-10-16 03:06:05 -0700 Move test for contained caret offset to RenderTextLineBoxes 2022-10-10 14:07:07 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned ahmad.saleem792 commit-queue esprehn+autocc glenn kangil.han kondapallykalyan oldest_to_newest 940338 0 koivisto 2013-10-16 03:06:05 -0700 from Position 940345 1 214351 koivisto 2013-10-16 04:04:12 -0700 Created attachment 214351 potch 1904614 2 ahmad.saleem792 2022-10-10 14:07:07 -0700 Landed - https://github.com/WebKit/WebKit/commit/9d80c8da68372e0b4a214d4ab69f629031ee1425 and didn't backed out. Marking this as "RESOLVED FIXED". 214351 2013-10-16 04:04:12 -0700 2013-10-16 04:20:52 -0700 potch rendertextlineboxes-caret-offset.patch text/plain 13229 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzUxMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTEwLTE2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIHRlc3QgZm9yIGNvbnRh aW5lZCBjYXJldCBvZmZzZXQgdG8gUmVuZGVyVGV4dExpbmVCb3hlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyODg3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20vUG9zaXRpb24uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UG9zaXRpb246OnJlbmRlcmVkT2Zmc2V0KToKKyAgICAgICAgKFdlYkNv cmU6OlBvc2l0aW9uOjppc0NhbmRpZGF0ZSk6CisgICAgICAgIAorICAgICAgICAgICAgUmVtb3Zl IGlzUmVuZGVyZWRUZXh0LCBjYWxsIFJlbmRlclRleHQ6OmNvbnRhaW5zQ2FyZXRPZmZzZXQgaW5z dGVhZC4KKworICAgICAgICAoV2ViQ29yZTo6UG9zaXRpb246OmlzUmVuZGVyZWRDaGFyYWN0ZXIp OgorICAgICAgICAoV2ViQ29yZTo6UG9zaXRpb246OnJlbmRlcnNJbkRpZmZlcmVudFBvc2l0aW9u KToKKyAgICAgICAgKiBkb20vUG9zaXRpb24uaDoKKyAgICAgICAgKiBkb20vUG9zaXRpb25JdGVy YXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3NpdGlvbkl0ZXJhdG9yOjppc0NhbmRpZGF0 ZSk6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAqIHJl bmRlcmluZy9JbmxpbmVUZXh0Qm94Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6Y29udGFpbnNDaGFyYWN0ZXJPZmZz ZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6Y29udGFpbnNDYXJldE9mZnNldCk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRleHQuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGV4dExpbmVCb3hlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0TGlu ZUJveGVzOjpjb250YWluc09mZnNldCk6CisgICAgICAgIAorICAgICAgICAgICAgQ29tYmluZWQg aW1wbGVtZW50YXRpb25zIG9mIFBvc2l0aW9uOjppc1JlbmRlcmVkQ2hhcmFjdGVyIGFuZCBQb3Np dGlvbjo6aXNSZW5kZXJlZFRleHQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dExp bmVCb3hlcy5oOgorICAgICAgICAKKyAgICAgICAgICAgIFJlbW92ZSBjb250YWluc0NhcmV0T2Zm c2V0KCksIGZ1bmN0aW9uYWxpdHkgaXMgbm93IGluIFJlbmRlclRleHRMaW5lQm94ZXM6OmNvbnRh aW5zT2Zmc2V0LgorCiAyMDEzLTEwLTE2ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW5kZXJFbGVtZW50Ojppc0NoaWxkQWxsb3dlZCgpIHNob3VsZCB0YWtl IGNvbnN0IHJlZmVyZW5jZXMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHJldmlzaW9u IDE1NzM4NCkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQ4OCw3ICs0ODgsNyBAQCBpbnQgUG9zaXRpb246OnJlbmRlcmVkT2Zmc2V0KCkgY29u c3QKICAgICAgICAgcmV0dXJuIG1fb2Zmc2V0OwogICAgICAgICAgICAgICAgICAgICAKICAgICBp bnQgcmVzdWx0ID0gMDsKLSAgICBSZW5kZXJUZXh0KiB0ZXh0UmVuZGVyZXIgPSB0b1JlbmRlclRl eHQoZGVwcmVjYXRlZE5vZGUoKS0+cmVuZGVyZXIoKSk7CisgICAgUmVuZGVyVGV4dCogdGV4dFJl bmRlcmVyID0gdG9UZXh0KGRlcHJlY2F0ZWROb2RlKCkpLT5yZW5kZXJlcigpOwogICAgIGZvciAo SW5saW5lVGV4dEJveCAqYm94ID0gdGV4dFJlbmRlcmVyLT5maXJzdFRleHRCb3goKTsgYm94OyBi b3ggPSBib3gtPm5leHRUZXh0Qm94KCkpIHsKICAgICAgICAgaW50IHN0YXJ0ID0gYm94LT5zdGFy dCgpOwogICAgICAgICBpbnQgZW5kID0gYm94LT5zdGFydCgpICsgYm94LT5sZW4oKTsKQEAgLTk0 NSw3ICs5NDUsNyBAQCBib29sIFBvc2l0aW9uOjppc0NhbmRpZGF0ZSgpIGNvbnN0CiAgICAgICAg IHJldHVybiAhbV9vZmZzZXQgJiYgbV9hbmNob3JUeXBlICE9IFBvc2l0aW9uSXNBZnRlckFuY2hv ciAmJiAhbm9kZUlzVXNlclNlbGVjdE5vbmUoZGVwcmVjYXRlZE5vZGUoKS0+cGFyZW50Tm9kZSgp KTsKIAogICAgIGlmIChyZW5kZXJlci0+aXNUZXh0KCkpCi0gICAgICAgIHJldHVybiAhbm9kZUlz VXNlclNlbGVjdE5vbmUoZGVwcmVjYXRlZE5vZGUoKSkgJiYgaW5SZW5kZXJlZFRleHQoKTsKKyAg ICAgICAgcmV0dXJuICFub2RlSXNVc2VyU2VsZWN0Tm9uZShkZXByZWNhdGVkTm9kZSgpKSAmJiB0 b1JlbmRlclRleHQocmVuZGVyZXIpLT5jb250YWluc0NhcmV0T2Zmc2V0KG1fb2Zmc2V0KTsKIAog ICAgIGlmIChpc1RhYmxlRWxlbWVudChkZXByZWNhdGVkTm9kZSgpKSB8fCBlZGl0aW5nSWdub3Jl c0NvbnRlbnQoZGVwcmVjYXRlZE5vZGUoKSkpCiAgICAgICAgIHJldHVybiAoYXRGaXJzdEVkaXRp bmdQb3NpdGlvbkZvck5vZGUoKSB8fCBhdExhc3RFZGl0aW5nUG9zaXRpb25Gb3JOb2RlKCkpICYm ICFub2RlSXNVc2VyU2VsZWN0Tm9uZShkZXByZWNhdGVkTm9kZSgpLT5wYXJlbnROb2RlKCkpOwpA QCAtOTY2LDUzICs5NjYsMTYgQEAgYm9vbCBQb3NpdGlvbjo6aXNDYW5kaWRhdGUoKSBjb25zdAog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBQb3NpdGlvbjo6aW5SZW5kZXJlZFRleHQoKSBj b25zdAotewotICAgIGlmIChpc051bGwoKSB8fCAhZGVwcmVjYXRlZE5vZGUoKS0+aXNUZXh0Tm9k ZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIAotICAgIFJlbmRlck9iamVjdCog cmVuZGVyZXIgPSBkZXByZWNhdGVkTm9kZSgpLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVy ZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBSZW5kZXJUZXh0ICp0ZXh0UmVu ZGVyZXIgPSB0b1JlbmRlclRleHQocmVuZGVyZXIpOwotICAgIGZvciAoSW5saW5lVGV4dEJveCAq Ym94ID0gdGV4dFJlbmRlcmVyLT5maXJzdFRleHRCb3goKTsgYm94OyBib3ggPSBib3gtPm5leHRU ZXh0Qm94KCkpIHsKLSAgICAgICAgaWYgKG1fb2Zmc2V0IDwgc3RhdGljX2Nhc3Q8aW50Pihib3gt PnN0YXJ0KCkpICYmICF0ZXh0UmVuZGVyZXItPmNvbnRhaW5zUmV2ZXJzZWRUZXh0KCkpIHsKLSAg ICAgICAgICAgIC8vIFRoZSBvZmZzZXQgd2UncmUgbG9va2luZyBmb3IgaXMgYmVmb3JlIHRoaXMg bm9kZQotICAgICAgICAgICAgLy8gdGhpcyBtZWFucyB0aGUgb2Zmc2V0IG11c3QgYmUgaW4gY29u dGVudCB0aGF0IGlzCi0gICAgICAgICAgICAvLyBub3QgcmVuZGVyZWQuIFJldHVybiBmYWxzZS4K LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgICAgICBpZiAoYm94LT5j b250YWluc0NhcmV0T2Zmc2V0KG1fb2Zmc2V0KSkKLSAgICAgICAgICAgIC8vIFJldHVybiBmYWxz ZSBmb3Igb2Zmc2V0cyBpbnNpZGUgY29tcG9zZWQgY2hhcmFjdGVycy4KLSAgICAgICAgICAgIHJl dHVybiBtX29mZnNldCA9PSAwIHx8IG1fb2Zmc2V0ID09IHRleHRSZW5kZXJlci0+bmV4dE9mZnNl dCh0ZXh0UmVuZGVyZXItPnByZXZpb3VzT2Zmc2V0KG1fb2Zmc2V0KSk7Ci0gICAgfQotICAgIAot ICAgIHJldHVybiBmYWxzZTsKLX0KLQogYm9vbCBQb3NpdGlvbjo6aXNSZW5kZXJlZENoYXJhY3Rl cigpIGNvbnN0CiB7CiAgICAgaWYgKGlzTnVsbCgpIHx8ICFkZXByZWNhdGVkTm9kZSgpLT5pc1Rl eHROb2RlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgCi0gICAgUmVuZGVyT2Jq ZWN0KiByZW5kZXJlciA9IGRlcHJlY2F0ZWROb2RlKCktPnJlbmRlcmVyKCk7CisgICAgUmVuZGVy VGV4dCogcmVuZGVyZXIgPSB0b1RleHQoZGVwcmVjYXRlZE5vZGUoKSktPnJlbmRlcmVyKCk7CiAg ICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIFJlbmRl clRleHQqIHRleHRSZW5kZXJlciA9IHRvUmVuZGVyVGV4dChyZW5kZXJlcik7Ci0gICAgZm9yIChJ bmxpbmVUZXh0Qm94KiBib3ggPSB0ZXh0UmVuZGVyZXItPmZpcnN0VGV4dEJveCgpOyBib3g7IGJv eCA9IGJveC0+bmV4dFRleHRCb3goKSkgewotICAgICAgICBpZiAobV9vZmZzZXQgPCBzdGF0aWNf Y2FzdDxpbnQ+KGJveC0+c3RhcnQoKSkgJiYgIXRleHRSZW5kZXJlci0+Y29udGFpbnNSZXZlcnNl ZFRleHQoKSkgewotICAgICAgICAgICAgLy8gVGhlIG9mZnNldCB3ZSdyZSBsb29raW5nIGZvciBp cyBiZWZvcmUgdGhpcyBub2RlCi0gICAgICAgICAgICAvLyB0aGlzIG1lYW5zIHRoZSBvZmZzZXQg bXVzdCBiZSBpbiBjb250ZW50IHRoYXQgaXMKLSAgICAgICAgICAgIC8vIG5vdCByZW5kZXJlZC4g UmV0dXJuIGZhbHNlLgotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0gICAg ICAgIGlmIChtX29mZnNldCA+PSBzdGF0aWNfY2FzdDxpbnQ+KGJveC0+c3RhcnQoKSkgJiYgbV9v ZmZzZXQgPCBzdGF0aWNfY2FzdDxpbnQ+KGJveC0+c3RhcnQoKSArIGJveC0+bGVuKCkpKQotICAg ICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfQotICAgIAotICAgIHJldHVybiBmYWxzZTsKKyAg ICByZXR1cm4gcmVuZGVyZXItPmNvbnRhaW5zQ2hhcmFjdGVyT2Zmc2V0KG1fb2Zmc2V0KTsKIH0K IAogc3RhdGljIGJvb2wgaW5TYW1lRW5jbG9zaW5nQmxvY2tGbG93RWxlbWVudChOb2RlKiBhLCBO b2RlKiBiKQpAQCAtMTA1OSwxMCArMTAyMiwxMCBAQCBib29sIFBvc2l0aW9uOjpyZW5kZXJzSW5E aWZmZXJlbnRQb3NpdGlvCiAgICAgaWYgKCFpblNhbWVFbmNsb3NpbmdCbG9ja0Zsb3dFbGVtZW50 KGRlcHJlY2F0ZWROb2RlKCksIHBvcy5kZXByZWNhdGVkTm9kZSgpKSkKICAgICAgICAgcmV0dXJu IHRydWU7CiAKLSAgICBpZiAoZGVwcmVjYXRlZE5vZGUoKS0+aXNUZXh0Tm9kZSgpICYmICFpblJl bmRlcmVkVGV4dCgpKQorICAgIGlmIChyZW5kZXJlci0+aXNUZXh0KCkgJiYgIXRvUmVuZGVyVGV4 dChyZW5kZXJlciktPmNvbnRhaW5zQ2FyZXRPZmZzZXQobV9vZmZzZXQpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICBpZiAocG9zLmRlcHJlY2F0ZWROb2RlKCktPmlzVGV4dE5vZGUoKSAm JiAhcG9zLmluUmVuZGVyZWRUZXh0KCkpCisgICAgaWYgKHBvc1JlbmRlcmVyLT5pc1RleHQoKSAm JiAhdG9SZW5kZXJUZXh0KHBvc1JlbmRlcmVyKS0+Y29udGFpbnNDYXJldE9mZnNldChwb3MubV9v ZmZzZXQpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpbnQgdGhpc1JlbmRlcmVkT2Zm c2V0ID0gcmVuZGVyZWRPZmZzZXQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlv bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbi5oCShyZXZpc2lv biAxNTczODQpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAkod29ya2luZyBjb3B5 KQpAQCAtMTc4LDcgKzE3OCw2IEBAIHB1YmxpYzoKICAgICBQb3NpdGlvbiBkb3duc3RyZWFtKEVk aXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZSA9IENhbm5vdENyb3NzRWRpdGluZ0JvdW5kYXJ5KSBj b25zdDsKICAgICAKICAgICBib29sIGlzQ2FuZGlkYXRlKCkgY29uc3Q7Ci0gICAgYm9vbCBpblJl bmRlcmVkVGV4dCgpIGNvbnN0OwogICAgIGJvb2wgaXNSZW5kZXJlZENoYXJhY3RlcigpIGNvbnN0 OwogICAgIGJvb2wgcmVuZGVyc0luRGlmZmVyZW50UG9zaXRpb24oY29uc3QgUG9zaXRpb24mKSBj b25zdDsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uSXRlcmF0b3IuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Qb3NpdGlvbkl0ZXJhdG9yLmNwcAkocmV2 aXNpb24gMTU3Mzg0KQorKysgU291cmNlL1dlYkNvcmUvZG9tL1Bvc2l0aW9uSXRlcmF0b3IuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgi CiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlJlbmRlckJsb2NrLmgiCisjaW5jbHVkZSAi UmVuZGVyVGV4dC5oIgogI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKQEAgLTE1NCw3ICsxNTUsNyBAQCBib29sIFBvc2l0aW9uSXRlcmF0b3I6OmlzQ2FuZGlk YXRlKCkgY29uCiAgICAgICAgIHJldHVybiAhbV9vZmZzZXRJbkFuY2hvciAmJiAhUG9zaXRpb246 Om5vZGVJc1VzZXJTZWxlY3ROb25lKG1fYW5jaG9yTm9kZS0+cGFyZW50Tm9kZSgpKTsKIAogICAg IGlmIChyZW5kZXJlci0+aXNUZXh0KCkpCi0gICAgICAgIHJldHVybiAhUG9zaXRpb246Om5vZGVJ c1VzZXJTZWxlY3ROb25lKG1fYW5jaG9yTm9kZSkgJiYgUG9zaXRpb24oKnRoaXMpLmluUmVuZGVy ZWRUZXh0KCk7CisgICAgICAgIHJldHVybiAhUG9zaXRpb246Om5vZGVJc1VzZXJTZWxlY3ROb25l KG1fYW5jaG9yTm9kZSkgJiYgdG9SZW5kZXJUZXh0KHJlbmRlcmVyKS0+Y29udGFpbnNDYXJldE9m ZnNldChtX29mZnNldEluQW5jaG9yKTsKIAogICAgIGlmIChpc1RhYmxlRWxlbWVudChtX2FuY2hv ck5vZGUpIHx8IGVkaXRpbmdJZ25vcmVzQ29udGVudChtX2FuY2hvck5vZGUpKQogICAgICAgICBy ZXR1cm4gKGF0U3RhcnRPZk5vZGUoKSB8fCBhdEVuZE9mTm9kZSgpKSAmJiAhUG9zaXRpb246Om5v ZGVJc1VzZXJTZWxlY3ROb25lKG1fYW5jaG9yTm9kZS0+cGFyZW50Tm9kZSgpKTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHJldmlzaW9uIDE1NzM4 NCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTQ1OSwzMCArMTQ1OSw2IEBAIGZsb2F0IElubGluZVRleHRCb3g6OnBvc2l0 aW9uRm9yT2Zmc2V0KGkKICAgICByZXR1cm4gZm9udC5zZWxlY3Rpb25SZWN0Rm9yVGV4dChjb25z dHJ1Y3RUZXh0UnVuKGxpbmVTdHlsZSwgZm9udCksIEludFBvaW50KGxvZ2ljYWxMZWZ0KCksIDAp LCAwLCBmcm9tLCB0bykubWF4WCgpOwogfQogCi1ib29sIElubGluZVRleHRCb3g6OmNvbnRhaW5z Q2FyZXRPZmZzZXQoaW50IG9mZnNldCkgY29uc3QKLXsKLSAgICAvLyBPZmZzZXRzIGJlZm9yZSB0 aGUgYm94IGFyZSBuZXZlciAiaW4iLgotICAgIGlmIChvZmZzZXQgPCBtX3N0YXJ0KQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpbnQgcGFzdEVuZCA9IG1fc3RhcnQgKyBtX2xlbjsKLQot ICAgIC8vIE9mZnNldHMgaW5zaWRlIHRoZSBib3ggKG5vdCBhdCBlaXRoZXIgZWRnZSkgYXJlIGFs d2F5cyAiaW4iLgotICAgIGlmIChvZmZzZXQgPCBwYXN0RW5kKQotICAgICAgICByZXR1cm4gdHJ1 ZTsKLQotICAgIC8vIE9mZnNldHMgb3V0c2lkZSB0aGUgYm94IGFyZSBhbHdheXMgIm91dCIuCi0g ICAgaWYgKG9mZnNldCA+IHBhc3RFbmQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIC8v IE9mZnNldHMgYXQgdGhlIGVuZCBhcmUgIm91dCIgZm9yIGxpbmUgYnJlYWtzICh0aGV5IGFyZSBv biB0aGUgbmV4dCBsaW5lKS4KLSAgICBpZiAoaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgLy8gT2Zmc2V0cyBhdCB0aGUgZW5kIGFyZSAiaW4iIGZvciBub3JtYWwg Ym94ZXMgKGJ1dCB0aGUgY2FsbGVyIGhhcyB0byBjaGVjayBhZmZpbml0eSkuCi0gICAgcmV0dXJu IHRydWU7Ci19Ci0KIFRleHRSdW4gSW5saW5lVGV4dEJveDo6Y29uc3RydWN0VGV4dFJ1bihjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IEZvbnQmIGZvbnQsIEJ1ZmZlckZvckFwcGVuZGlu Z0h5cGhlbiogY2hhcmFjdGVyc1dpdGhIeXBoZW4pIGNvbnN0CiB7CiAgICAgQVNTRVJUKHJlbmRl cmVyKCkudGV4dCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0 Qm94LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRC b3guaAkocmV2aXNpb24gMTU3Mzg0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZVRleHRCb3guaAkod29ya2luZyBjb3B5KQpAQCAtMTU3LDggKzE1Nyw2IEBAIHB1YmxpYzoKICAg ICB2aXJ0dWFsIGludCBvZmZzZXRGb3JQb3NpdGlvbihmbG9hdCB4LCBib29sIGluY2x1ZGVQYXJ0 aWFsR2x5cGhzID0gdHJ1ZSkgY29uc3Q7CiAgICAgdmlydHVhbCBmbG9hdCBwb3NpdGlvbkZvck9m ZnNldChpbnQgb2Zmc2V0KSBjb25zdDsKIAotICAgIGJvb2wgY29udGFpbnNDYXJldE9mZnNldChp bnQgb2Zmc2V0KSBjb25zdDsgLy8gZmFsc2UgZm9yIG9mZnNldCBhZnRlciBsaW5lIGJyZWFrCi0K ICAgICAvLyBOZWVkcyB0byBiZSBwdWJsaWMsIHNvIHRoZSBzdGF0aWMgcGFpbnRUZXh0V2l0aFNo YWRvd3MoKSBmdW5jdGlvbiBjYW4gdXNlIGl0LgogICAgIHN0YXRpYyBGbG9hdFNpemUgYXBwbHlT aGFkb3dUb0dyYXBoaWNzQ29udGV4dChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBTaGFkb3dEYXRh KiwgY29uc3QgRmxvYXRSZWN0JiB0ZXh0UmVjdCwgYm9vbCBzdHJva2VkLCBib29sIG9wYXF1ZSwg Ym9vbCBob3Jpem9udGFsKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcAkocmV2aXNpb24gMTU3Mzg0KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTM2LDYgKzExMzYsMTYgQEAgaW50IFJl bmRlclRleHQ6OmNhcmV0TWF4T2Zmc2V0KCkgY29uc3QKICAgICByZXR1cm4gbV9saW5lQm94ZXMu Y2FyZXRNYXhPZmZzZXQoKnRoaXMpOwogfQogCitib29sIFJlbmRlclRleHQ6OmNvbnRhaW5zQ2hh cmFjdGVyT2Zmc2V0KHVuc2lnbmVkIG9mZnNldCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9saW5l Qm94ZXMuY29udGFpbnNPZmZzZXQoKnRoaXMsIG9mZnNldCwgUmVuZGVyVGV4dExpbmVCb3hlczo6 Q2hhcmFjdGVyT2Zmc2V0KTsKK30KKworYm9vbCBSZW5kZXJUZXh0Ojpjb250YWluc0NhcmV0T2Zm c2V0KHVuc2lnbmVkIG9mZnNldCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9saW5lQm94ZXMuY29u dGFpbnNPZmZzZXQoKnRoaXMsIG9mZnNldCwgUmVuZGVyVGV4dExpbmVCb3hlczo6Q2FyZXRPZmZz ZXQpOworfQorCiBib29sIFJlbmRlclRleHQ6Omhhc1JlbmRlcmVkVGV4dCgpIGNvbnN0CiB7CiAg ICAgcmV0dXJuIG1fbGluZUJveGVzLmhhc1JlbmRlcmVkVGV4dCgpOwpJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCShyZXZpc2lvbiAxNTczODQpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsNiArMTIx LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgY2FyZXRNaW5PZmZzZXQoKSBjb25zdCBP VkVSUklERTsKICAgICB2aXJ0dWFsIGludCBjYXJldE1heE9mZnNldCgpIGNvbnN0IE9WRVJSSURF OworICAgIGJvb2wgY29udGFpbnNDaGFyYWN0ZXJPZmZzZXQodW5zaWduZWQpIGNvbnN0OworICAg IGJvb2wgY29udGFpbnNDYXJldE9mZnNldCh1bnNpZ25lZCkgY29uc3Q7CiAgICAgYm9vbCBoYXNS ZW5kZXJlZFRleHQoKSBjb25zdDsKIAogICAgIHZpcnR1YWwgaW50IHByZXZpb3VzT2Zmc2V0KGlu dCBjdXJyZW50KSBjb25zdCBPVkVSUklERSBGSU5BTDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5jcHAJKHJldmlzaW9uIDE1NzM4NCkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjI1LDYgKzIyNSwyNyBAQCBpbnQgUmVuZGVyVGV4dExpbmVCb3hlczo6 Y2FyZXRNYXhPZmZzZXQoCiAgICAgcmV0dXJuIG1heE9mZnNldDsKIH0KIAorYm9vbCBSZW5kZXJU ZXh0TGluZUJveGVzOjpjb250YWluc09mZnNldChjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJlciwg dW5zaWduZWQgb2Zmc2V0LCBPZmZzZXRUeXBlIHR5cGUpIGNvbnN0Cit7CisgICAgZm9yIChhdXRv IGJveCA9IG1fZmlyc3Q7IGJveDsgYm94ID0gYm94LT5uZXh0VGV4dEJveCgpKSB7CisgICAgICAg IGlmIChvZmZzZXQgPCBib3gtPnN0YXJ0KCkgJiYgIXJlbmRlcmVyLmNvbnRhaW5zUmV2ZXJzZWRU ZXh0KCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHVuc2lnbmVkIGJveEVu ZCA9IGJveC0+c3RhcnQoKSArIGJveC0+bGVuKCk7CisgICAgICAgIGlmIChvZmZzZXQgPj0gYm94 LT5zdGFydCgpICYmIG9mZnNldCA8PSBib3hFbmQpIHsKKyAgICAgICAgICAgIGlmICh0eXBlID09 IENoYXJhY3Rlck9mZnNldCkgeworICAgICAgICAgICAgICAgIGlmIChvZmZzZXQgPT0gYm94RW5k KQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChvZmZzZXQgPT0gYm94RW5kICYm IGJveC0+aXNMaW5lQnJlYWsoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg ICAgIC8vIFJldHVybiBmYWxzZSBmb3Igb2Zmc2V0cyBpbnNpZGUgY29tcG9zZWQgY2hhcmFjdGVy cy4KKyAgICAgICAgICAgIHJldHVybiAhb2Zmc2V0IHx8IG9mZnNldCA9PSBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4ocmVuZGVyZXIubmV4dE9mZnNldChyZW5kZXJlci5wcmV2aW91c09mZnNldChvZmZz ZXQpKSk7CisgICAgICAgIH0KKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiBlbnVtIFNo b3VsZEFmZmluaXR5QmVEb3duc3RyZWFtIHsgQWx3YXlzRG93bnN0cmVhbSwgQWx3YXlzVXBzdHJl YW0sIFVwc3RyZWFtSWZQb3NpdGlvbklzTm90QXRTdGFydCB9OwogCiBzdGF0aWMgYm9vbCBsaW5l RGlyZWN0aW9uUG9pbnRGaXRzSW5Cb3goaW50IHBvaW50TGluZURpcmVjdGlvbiwgY29uc3QgSW5s aW5lVGV4dEJveCYgYm94LCBTaG91bGRBZmZpbml0eUJlRG93bnN0cmVhbSYgc2hvdWxkQWZmaW5p dHlCZURvd25zdHJlYW0pCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dExpbmVCb3hlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0TGluZUJveGVzLmgJKHJldmlzaW9uIDE1NzM4NCkKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTUyLDExICs1 MiwxNiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZW1vdmVBbGxGcm9tUGFyZW50KFJlbmRlclRleHQm KTsKICAgICB2b2lkIGRlbGV0ZUFsbChSZW5kZXJUZXh0Jik7CiAKKyAgICB2b2lkIGRpcnR5QWxs KCk7CisgICAgYm9vbCBkaXJ0eVJhbmdlKFJlbmRlclRleHQmLCB1bnNpZ25lZCBzdGFydCwgdW5z aWduZWQgZW5kLCBpbnQgbGVuZ3RoRGVsdGEpOworCiAgICAgSW5saW5lVGV4dEJveCogZmluZE5l eHQoaW50IG9mZnNldCwgaW50JiBwb3NpdGlvbikgY29uc3Q7CiAKICAgICBib29sIGhhc1JlbmRl cmVkVGV4dCgpIGNvbnN0OwogICAgIGludCBjYXJldE1pbk9mZnNldCgpIGNvbnN0OwogICAgIGlu dCBjYXJldE1heE9mZnNldChjb25zdCBSZW5kZXJUZXh0JikgY29uc3Q7CisgICAgZW51bSBPZmZz ZXRUeXBlIHsgQ2FyZXRPZmZzZXQsIENoYXJhY3Rlck9mZnNldCB9OworICAgIGJvb2wgY29udGFp bnNPZmZzZXQoY29uc3QgUmVuZGVyVGV4dCYsIHVuc2lnbmVkLCBPZmZzZXRUeXBlKSBjb25zdDsK IAogICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbkZvclBvaW50KGNvbnN0IFJlbmRlclRleHQm LCBjb25zdCBMYXlvdXRQb2ludCYpIGNvbnN0OwogCkBAIC03Miw5ICs3Nyw2IEBAIHB1YmxpYzoK ICAgICBWZWN0b3I8RmxvYXRRdWFkPiBhYnNvbHV0ZVF1YWRzKGNvbnN0IFJlbmRlclRleHQmLCBi b29sKiB3YXNGaXhlZCwgQ2xpcHBpbmdPcHRpb24pIGNvbnN0OwogICAgIFZlY3RvcjxGbG9hdFF1 YWQ+IGFic29sdXRlUXVhZHNGb3JSYW5nZShjb25zdCBSZW5kZXJUZXh0JiwgdW5zaWduZWQgc3Rh cnQsIHVuc2lnbmVkIGVuZCwgYm9vbCB1c2VTZWxlY3Rpb25IZWlnaHQsIGJvb2wqIHdhc0ZpeGVk KSBjb25zdDsKIAotICAgIHZvaWQgZGlydHlBbGwoKTsKLSAgICBib29sIGRpcnR5UmFuZ2UoUmVu ZGVyVGV4dCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQsIGludCBsZW5ndGhEZWx0YSk7 Ci0KICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgflJlbmRlclRleHRMaW5lQm94ZXMoKTsKICNl bmRpZgo=