122729 2013-10-13 07:41:57 -0700 Text::renderer() should return RenderText 2013-10-13 09:01:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned oldest_to_newest 939269 0 koivisto 2013-10-13 07:41:57 -0700 tighten 939277 1 214104 koivisto 2013-10-13 08:10:45 -0700 Created attachment 214104 patch 939284 2 koivisto 2013-10-13 09:01:14 -0700 https://trac.webkit.org/r157373 214104 2013-10-13 08:10:45 -0700 2013-10-13 08:29:05 -0700 patch text-renderer.patch text/plain 9544 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzM2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEwIEBACisyMDEzLTEwLTEzICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0OjpyZW5kZXJlcigpIHNo b3VsZCByZXR1cm4gUmVuZGVyVGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIyNzI5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKIDIwMTMtMTAtMTMgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIEFkZCB0cmF2ZXJzZU5leHRTa2lwcGluZ0NoaWxkcmVuIHRvIEVsZW1lbnRJdGVyYXRv cnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9UZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9kb20vVGV4dC5jcHAJKHJldmlzaW9uIDE1NzM2OCkKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9UZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODcsNyArODcsNyBAQCBQYXNzUmVm UHRyPFRleHQ+IFRleHQ6OnNwbGl0VGV4dCh1bnNpZ25lCiAgICAgICAgIGRvY3VtZW50KCkudGV4 dE5vZGVTcGxpdCh0aGlzKTsKIAogICAgIGlmIChyZW5kZXJlcigpKQotICAgICAgICB0b1JlbmRl clRleHQocmVuZGVyZXIoKSktPnNldFRleHRXaXRoT2Zmc2V0KGRhdGFJbXBsKCksIDAsIG9sZFN0 ci5sZW5ndGgoKSk7CisgICAgICAgIHJlbmRlcmVyKCktPnNldFRleHRXaXRoT2Zmc2V0KGRhdGFJ bXBsKCksIDAsIG9sZFN0ci5sZW5ndGgoKSk7CiAKICAgICByZXR1cm4gbmV3VGV4dC5yZWxlYXNl KCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vVGV4dC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2RvbS9UZXh0LmgJKHJldmlzaW9uIDE1NzM2OCkKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9UZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDggQEAgcHVibGljOgog ICAgIAogICAgIHZpcnR1YWwgYm9vbCBjYW5Db250YWluUmFuZ2VFbmRQb2ludCgpIGNvbnN0IE9W RVJSSURFIEZJTkFMIHsgcmV0dXJuIHRydWU7IH0KIAorICAgIFJlbmRlclRleHQqIHJlbmRlcmVy KCkgY29uc3Q7CisKIHByb3RlY3RlZDoKICAgICBUZXh0KERvY3VtZW50JiBkb2N1bWVudCwgY29u c3QgU3RyaW5nJiBkYXRhLCBDb25zdHJ1Y3Rpb25UeXBlIHR5cGUpCiAgICAgICAgIDogQ2hhcmFj dGVyRGF0YShkb2N1bWVudCwgZGF0YSwgdHlwZSkKQEAgLTcwLDEwICs3Miw5IEBAIHByaXZhdGU6 CiAjZW5kaWYKIH07CiAKLWlubGluZSBib29sIGlzVGV4dChjb25zdCBOb2RlJiBub2RlKQotewot ICAgIHJldHVybiBub2RlLmlzVGV4dE5vZGUoKTsKLX0KK3ZvaWQgaXNUZXh0KGNvbnN0IFRleHQm KTsgLy8gQ2F0Y2ggdW5uZWNlc3NhcnkgcnVudGltZSBjaGVjayBvZiB0eXBlIGtub3duIGF0IGNv bXBpbGUgdGltZS4KK3ZvaWQgaXNUZXh0KGNvbnN0IENvbnRhaW5lck5vZGUmKTsgLy8gQ2F0Y2gg dW5uZWNlc3NhcnkgcnVudGltZSBjaGVjayBvZiB0eXBlIGtub3duIGF0IGNvbXBpbGUgdGltZS4K K2lubGluZSBib29sIGlzVGV4dChjb25zdCBOb2RlJiBub2RlKSB7IHJldHVybiBub2RlLmlzVGV4 dE5vZGUoKTsgfQogCiBOT0RFX1RZUEVfQ0FTVFMoVGV4dCkKIApJbmRleDogU291cmNlL1dlYkNv cmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZWRpdGluZy9Db21wb3NpdGVFZGl0Q29tbWFuZC5jcHAJKHJldmlzaW9uIDE1NzM2 OCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQ29tcG9zaXRlRWRpdENvbW1hbmQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03MzQsNyArNzM0LDcgQEAgdm9pZCBDb21wb3NpdGVFZGl0Q29tbWFu ZDo6ZGVsZXRlSW5zaWduaQogCiAgICAgZG9jdW1lbnQoKS51cGRhdGVMYXlvdXQoKTsKIAotICAg IFJlbmRlclRleHQqIHRleHRSZW5kZXJlciA9IHRvUmVuZGVyVGV4dCh0ZXh0Tm9kZS0+cmVuZGVy ZXIoKSk7CisgICAgUmVuZGVyVGV4dCogdGV4dFJlbmRlcmVyID0gdGV4dE5vZGUtPnJlbmRlcmVy KCk7CiAgICAgaWYgKCF0ZXh0UmVuZGVyZXIpCiAgICAgICAgIHJldHVybjsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvZWRpdGluZy9EZWxldGVTZWxlY3Rpb25Db21tYW5kLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlvbkNvbW1hbmQuY3BwCShy ZXZpc2lvbiAxNTczNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0RlbGV0ZVNlbGVjdGlv bkNvbW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAi SFRNTFRhYmxlRWxlbWVudC5oIgogI2luY2x1ZGUgIk5vZGVUcmF2ZXJzYWwuaCIKICNpbmNsdWRl ICJSZW5kZXJUYWJsZUNlbGwuaCIKKyNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAjaW5jbHVkZSAi VGV4dC5oIgogI2luY2x1ZGUgIlZpc2libGVVbml0cy5oIgogCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0hUTUxJbnRlcmNoYW5nZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvZWRpdGluZy9IVE1MSW50ZXJjaGFuZ2UuY3BwCShyZXZpc2lvbiAxNTczNjgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL0hUTUxJbnRlcmNoYW5nZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI3LDYgKzI3LDcgQEAKICNpbmNsdWRlICJIVE1MSW50ZXJjaGFuZ2UuaCIKIAogI2luY2x1ZGUg IlJlbmRlckVsZW1lbnQuaCIKKyNpbmNsdWRlICJSZW5kZXJUZXh0LmgiCiAjaW5jbHVkZSAiVGV4 dC5oIgogI2luY2x1ZGUgIlRleHRJdGVyYXRvci5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmlu Z0J1aWxkZXIuaD4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0SW50b1RleHRO b2RlQ29tbWFuZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9JbnNl cnRJbnRvVGV4dE5vZGVDb21tYW5kLmNwcAkocmV2aXNpb24gMTU3MzY4KQorKysgU291cmNlL1dl YkNvcmUvZWRpdGluZy9JbnNlcnRJbnRvVGV4dE5vZGVDb21tYW5kLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTcsNyArNTcsNyBAQCB2b2lkIEluc2VydEludG9UZXh0Tm9kZUNvbW1hbmQ6OmRvQXBw bHkoCiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChwYXNzd29yZEVjaG9FbmFibGVkKSB7Ci0g ICAgICAgIFJlbmRlclRleHQqIHJlbmRlclRleHQgPSB0b1JlbmRlclRleHQobV9ub2RlLT5yZW5k ZXJlcigpKTsKKyAgICAgICAgUmVuZGVyVGV4dCogcmVuZGVyVGV4dCA9IG1fbm9kZS0+cmVuZGVy ZXIoKTsKICAgICAgICAgaWYgKHJlbmRlclRleHQgJiYgcmVuZGVyVGV4dC0+aXNTZWN1cmUoKSkK ICAgICAgICAgICAgIHJlbmRlclRleHQtPm1vbWVudGFyaWx5UmV2ZWFsTGFzdFR5cGVkQ2hhcmFj dGVyKG1fb2Zmc2V0ICsgbV90ZXh0Lmxlbmd0aCgpIC0gMSk7CiAgICAgfQpJbmRleDogU291cmNl L1dlYkNvcmUvZWRpdGluZy9JbnNlcnRMaW5lQnJlYWtDb21tYW5kLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2VydExpbmVCcmVha0NvbW1hbmQuY3BwCShyZXZp c2lvbiAxNTczNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2VydExpbmVCcmVha0Nv bW1hbmQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiSFRN TFRhYmxlRWxlbWVudC5oIgogI2luY2x1ZGUgIlJhbmdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyRWxl bWVudC5oIgorI2luY2x1ZGUgIlJlbmRlclRleHQuaCIKICNpbmNsdWRlICJUZXh0LmgiCiAjaW5j bHVkZSAiVmlzaWJsZVBvc2l0aW9uLmgiCiAjaW5jbHVkZSAiVmlzaWJsZVVuaXRzLmgiCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0luc2VydFBhcmFncmFwaFNlcGFyYXRvckNvbW1hbmQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBo U2VwYXJhdG9yQ29tbWFuZC5jcHAJKHJldmlzaW9uIDE1NzM2OCkKKysrIFNvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvSW5zZXJ0UGFyYWdyYXBoU2VwYXJhdG9yQ29tbWFuZC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTM0LDcgKzM0LDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJJ bnNlcnRMaW5lQnJlYWtDb21tYW5kLmgiCiAjaW5jbHVkZSAiTm9kZVRyYXZlcnNhbC5oIgotI2lu Y2x1ZGUgIlJlbmRlck9iamVjdC5oIgorI2luY2x1ZGUgIlJlbmRlclRleHQuaCIKICNpbmNsdWRl ICJUZXh0LmgiCiAjaW5jbHVkZSAiVmlzaWJsZVVuaXRzLmgiCiAjaW5jbHVkZSAiaHRtbGVkaXRp bmcuaCIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1h bmQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVj dGlvbkNvbW1hbmQuY3BwCShyZXZpc2lvbiAxNTczNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjY3LDkg KzY2Nyw5IEBAIHZvaWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6Om1vdmVOb2RlT3UKICAgICAg ICAgcmVtb3ZlTm9kZShhbmNlc3Rvci5yZWxlYXNlKCkpOwogfQogCi1zdGF0aWMgaW5saW5lIGJv b2wgbm9kZUhhc1Zpc2libGVSZW5kZXJUZXh0KFRleHQqIHRleHQpCitzdGF0aWMgaW5saW5lIGJv b2wgaGFzUmVuZGVyZWRUZXh0KGNvbnN0IFRleHQmIHRleHQpCiB7Ci0gICAgcmV0dXJuIHRleHQt PnJlbmRlcmVyKCkgJiYgdG9SZW5kZXJUZXh0KHRleHQtPnJlbmRlcmVyKCkpLT5oYXNSZW5kZXJl ZFRleHQoKTsKKyAgICByZXR1cm4gdGV4dC5yZW5kZXJlcigpICYmIHRleHQucmVuZGVyZXIoKS0+ aGFzUmVuZGVyZWRUZXh0KCk7CiB9CiAKIHZvaWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OnJl bW92ZVVucmVuZGVyZWRUZXh0Tm9kZXNBdEVuZHMoSW5zZXJ0ZWROb2RlcyYgaW5zZXJ0ZWROb2Rl cykKQEAgLTY3Nyw3ICs2NzcsNyBAQCB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21tYW5kOjpyZW1v dmVVbnJlCiAgICAgZG9jdW1lbnQoKS51cGRhdGVMYXlvdXRJZ25vcmVQZW5kaW5nU3R5bGVzaGVl dHMoKTsKIAogICAgIE5vZGUqIGxhc3RMZWFmSW5zZXJ0ZWQgPSBpbnNlcnRlZE5vZGVzLmxhc3RM ZWFmSW5zZXJ0ZWQoKTsKLSAgICBpZiAobGFzdExlYWZJbnNlcnRlZCAmJiBsYXN0TGVhZkluc2Vy dGVkLT5pc1RleHROb2RlKCkgJiYgIW5vZGVIYXNWaXNpYmxlUmVuZGVyVGV4dCh0b1RleHQobGFz dExlYWZJbnNlcnRlZCkpCisgICAgaWYgKGxhc3RMZWFmSW5zZXJ0ZWQgJiYgbGFzdExlYWZJbnNl cnRlZC0+aXNUZXh0Tm9kZSgpICYmICFoYXNSZW5kZXJlZFRleHQodG9UZXh0KCpsYXN0TGVhZklu c2VydGVkKSkKICAgICAgICAgJiYgIWVuY2xvc2luZ05vZGVXaXRoVGFnKGZpcnN0UG9zaXRpb25J bk9yQmVmb3JlTm9kZShsYXN0TGVhZkluc2VydGVkKSwgc2VsZWN0VGFnKQogICAgICAgICAmJiAh ZW5jbG9zaW5nTm9kZVdpdGhUYWcoZmlyc3RQb3NpdGlvbkluT3JCZWZvcmVOb2RlKGxhc3RMZWFm SW5zZXJ0ZWQpLCBzY3JpcHRUYWcpKSB7CiAgICAgICAgIGluc2VydGVkTm9kZXMud2lsbFJlbW92 ZU5vZGUobGFzdExlYWZJbnNlcnRlZCk7CkBAIC02ODcsNyArNjg3LDcgQEAgdm9pZCBSZXBsYWNl U2VsZWN0aW9uQ29tbWFuZDo6cmVtb3ZlVW5yZQogICAgIC8vIFdlIGRvbid0IGhhdmUgdG8gbWFr ZSBzdXJlIHRoYXQgZmlyc3ROb2RlSW5zZXJ0ZWQgaXNuJ3QgaW5zaWRlIGEgc2VsZWN0IG9yIHNj cmlwdCBlbGVtZW50CiAgICAgLy8gYmVjYXVzZSBpdCBpcyBhIHRvcCBsZXZlbCBub2RlIGluIHRo ZSBmcmFnbWVudCBhbmQgdGhlIHVzZXIgY2FuJ3QgaW5zZXJ0IGludG8gdGhvc2UgZWxlbWVudHMu CiAgICAgTm9kZSogZmlyc3ROb2RlSW5zZXJ0ZWQgPSBpbnNlcnRlZE5vZGVzLmZpcnN0Tm9kZUlu c2VydGVkKCk7Ci0gICAgaWYgKGZpcnN0Tm9kZUluc2VydGVkICYmIGZpcnN0Tm9kZUluc2VydGVk LT5pc1RleHROb2RlKCkgJiYgIW5vZGVIYXNWaXNpYmxlUmVuZGVyVGV4dCh0b1RleHQoZmlyc3RO b2RlSW5zZXJ0ZWQpKSkgeworICAgIGlmIChmaXJzdE5vZGVJbnNlcnRlZCAmJiBmaXJzdE5vZGVJ bnNlcnRlZC0+aXNUZXh0Tm9kZSgpICYmICFoYXNSZW5kZXJlZFRleHQodG9UZXh0KCpmaXJzdE5v ZGVJbnNlcnRlZCkpKSB7CiAgICAgICAgIGluc2VydGVkTm9kZXMud2lsbFJlbW92ZU5vZGUoZmly c3ROb2RlSW5zZXJ0ZWQpOwogICAgICAgICByZW1vdmVOb2RlKGZpcnN0Tm9kZUluc2VydGVkKTsK ICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gMTU3MzY4KQorKysgU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDcg QEAKICNpbmNsdWRlICJQYWdlR3JvdXAuaCIKICNpbmNsdWRlICJSZWd1bGFyRXhwcmVzc2lvbi5o IgogI2luY2x1ZGUgIlJlbmRlclRhYmxlQ2VsbC5oIgorI2luY2x1ZGUgIlJlbmRlclRleHQuaCIK ICNpbmNsdWRlICJSZW5kZXJUZXh0Q29udHJvbC5oIgogI2luY2x1ZGUgIlJlbmRlclRoZW1lLmgi CiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5oCShyZXZpc2lvbiAxNTczNjgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNSwxMiArMjUsMTIgQEAKIAogI2luY2x1 ZGUgIlJlbmRlckVsZW1lbnQuaCIKICNpbmNsdWRlICJSZW5kZXJUZXh0TGluZUJveGVzLmgiCisj aW5jbHVkZSAiVGV4dC5oIgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogY2xhc3MgSW5saW5lVGV4dEJveDsKLWNsYXNzIFRleHQ7CiAKIGNsYXNzIFJl bmRlclRleHQgOiBwdWJsaWMgUmVuZGVyT2JqZWN0IHsKIHB1YmxpYzoKQEAgLTEzNCw4ICsxMzQs NiBAQCBwdWJsaWM6CiAKICAgICBJbmxpbmVUZXh0Qm94KiBmaW5kTmV4dElubGluZVRleHRCb3go aW50IG9mZnNldCwgaW50JiBwb3MpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveGVzLmZpbmROZXh0 KG9mZnNldCwgcG9zKTsgfQogCi0gICAgdm9pZCBjaGVja0NvbnNpc3RlbmN5KCkgY29uc3Q7Ci0K ICAgICBib29sIGlzQWxsQ29sbGFwc2libGVXaGl0ZXNwYWNlKCkgY29uc3Q7CiAKICAgICBib29s IGNhblVzZVNpbXBsZUZvbnRDb2RlUGF0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FuVXNlU2ltcGxl Rm9udENvZGVQYXRoOyB9CkBAIC0yNTAsMTMgKzI0OCwxMiBAQCBpbmxpbmUgUmVuZGVyU3R5bGUq IFJlbmRlclRleHQ6OmZpcnN0TGluCiAgICAgcmV0dXJuIHBhcmVudCgpLT5maXJzdExpbmVTdHls ZSgpOwogfQogCi0jaWZkZWYgTkRFQlVHCi1pbmxpbmUgdm9pZCBSZW5kZXJUZXh0OjpjaGVja0Nv bnNpc3RlbmN5KCkgY29uc3QKK3ZvaWQgYXBwbHlUZXh0VHJhbnNmb3JtKGNvbnN0IFJlbmRlclN0 eWxlKiwgU3RyaW5nJiwgVUNoYXIpOworCitpbmxpbmUgUmVuZGVyVGV4dCogVGV4dDo6cmVuZGVy ZXIoKSBjb25zdAogeworICAgIHJldHVybiB0b1JlbmRlclRleHQoTm9kZTo6cmVuZGVyZXIoKSk7 CiB9Ci0jZW5kaWYKLQotdm9pZCBhcHBseVRleHRUcmFuc2Zvcm0oY29uc3QgUmVuZGVyU3R5bGUq LCBTdHJpbmcmLCBVQ2hhcik7CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApJbmRleDogU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5jcHAJKHJldmlzaW9uIDE1NzM2OCkK KysrIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlUmVzb2x2ZVRyZWUuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MDksNyArNDA5LDcgQEAgdm9pZCB1cGRhdGVUZXh0UmVuZGVyZXJBZnRlckNvbnRl bnRDaGFuZwogewogICAgIGlmICghdGV4dE5vZGUuYXR0YWNoZWQoKSkKICAgICAgICAgcmV0dXJu OwotICAgIFJlbmRlclRleHQqIHRleHRSZW5kZXJlciA9IHRvUmVuZGVyVGV4dCh0ZXh0Tm9kZS5y ZW5kZXJlcigpKTsKKyAgICBSZW5kZXJUZXh0KiB0ZXh0UmVuZGVyZXIgPSB0ZXh0Tm9kZS5yZW5k ZXJlcigpOwogICAgIGlmICghdGV4dFJlbmRlcmVyKSB7CiAgICAgICAgIGF0dGFjaFRleHRSZW5k ZXJlcih0ZXh0Tm9kZSk7CiAgICAgICAgIHJlYXR0YWNoVGV4dFJlbmRlcmVyc0ZvcldoaXRlc3Bh Y2VPbmx5U2libGluZ3NBZnRlckF0dGFjaElmTmVlZGVkKHRleHROb2RlKTsKQEAgLTYyOCw3ICs2 MjgsNyBAQCBzdGF0aWMgQ2hhbmdlIHJlc29sdmVMb2NhbChFbGVtZW50JiBjdXJyCiAKIHN0YXRp YyB2b2lkIHVwZGF0ZVRleHRTdHlsZShUZXh0JiB0ZXh0KQogewotICAgIFJlbmRlclRleHQqIHJl bmRlcmVyID0gdG9SZW5kZXJUZXh0KHRleHQucmVuZGVyZXIoKSk7CisgICAgUmVuZGVyVGV4dCog cmVuZGVyZXIgPSB0ZXh0LnJlbmRlcmVyKCk7CiAKICAgICBpZiAoIXRleHQubmVlZHNTdHlsZVJl Y2FsYygpKQogICAgICAgICByZXR1cm47Cg==