121506 2013-09-17 10:55:55 -0700 Add isTextOrBR() and use it 2013-09-17 11:09:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned hyatt oldest_to_newest 930305 0 koivisto 2013-09-17 10:55:55 -0700 It is a popular test. 930308 1 211923 koivisto 2013-09-17 10:59:02 -0700 Created attachment 211923 patch 930312 2 211923 darin 2013-09-17 11:04:51 -0700 Comment on attachment 211923 patch View in context: https://bugs.webkit.org/attachment.cgi?id=211923&action=review > Source/WebCore/rendering/RenderCounter.cpp:111 > - if (object->isText() && !object->isBR()) > + if (object->isText()) Aha! ;-) > Source/WebCore/rendering/RenderTreeAsText.cpp:592 > - if (o.isText() && !o.isBR()) { > + if (o.isText()) { Glad this made you find these. 930314 3 koivisto 2013-09-17 11:09:15 -0700 https://trac.webkit.org/r155975 211923 2013-09-17 10:59:02 -0700 2013-09-17 11:04:51 -0700 patch text-or-br.patch text/plain 10042 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTk3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEzLTA5LTE3ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgaXNUZXh0T3JCUigpIGFu ZCB1c2UgaXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMTUwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEl0IGlzIGEgcG9wdWxhciB0ZXN0LgorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVIb3ZlckFjdGl2ZVN0YXRlKToKKyAgICAg ICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaW5kRmlyc3RNYXJr YWJsZSk6CisgICAgICAgICogZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6aWdub3Jlc0NvbnRhaW5lckNsaXApOgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVC b3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lQm94Ojpsb2dpY2FsSGVpZ2h0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvSW5saW5lSXRlcmF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6Omlz SXRlcmF0b3JUYXJnZXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVNaW5NYXhJdGVyYXRvcjo6bmV4dCk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9ja0Zsb3c6OmxheW91dElubGluZUNoaWxkcmVuKToKKyAgICAgICAgKiByZW5kZXJp bmcvUmVuZGVyQ291bnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwbGFuQ291bnRlcik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0Ojppc1RleHRPckJSKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVHJlZUFz VGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjp3cml0ZSk6CisgICAgICAgICogcmVuZGVyaW5n L1Jvb3RJbmxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6Um9vdElubGluZUJveDo6YXNj ZW50QW5kRGVzY2VudEZvckJveCk6CisgICAgICAgIChXZWJDb3JlOjpSb290SW5saW5lQm94Ojp2 ZXJ0aWNhbFBvc2l0aW9uRm9yQm94KToKKwogMjAxMy0wOS0xNyAgQW50dGkgS29pdmlzdG8gIDxh bnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVyQlIgc2hvdWxkIG5vdCBiZSBSZW5kZXJU ZXh0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDE1NTk1NykKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4MjQsNyAr NTgyNCw3IEBAIHZvaWQgRG9jdW1lbnQ6OnVwZGF0ZUhvdmVyQWN0aXZlU3RhdGUoY28KICAgICAg ICAgICAgIC8vIFdlIGFyZSBzZXR0aW5nIHRoZSA6YWN0aXZlIGNoYWluIGFuZCBmcmVlemluZyBp dC4gSWYgZnV0dXJlIG1vdmVzIGhhcHBlbiwgdGhleQogICAgICAgICAgICAgLy8gd2lsbCBuZWVk IHRvIHJlZmVyZW5jZSB0aGlzIGNoYWluLgogICAgICAgICAgICAgZm9yIChSZW5kZXJPYmplY3Qq IGN1cnIgPSBuZXdBY3RpdmVFbGVtZW50LT5yZW5kZXJlcigpOyBjdXJyOyBjdXJyID0gY3Vyci0+ cGFyZW50KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWN1cnItPm5vZGUoKSB8fCAhY3Vyci0+ bm9kZSgpLT5pc0VsZW1lbnROb2RlKCkgfHwgY3Vyci0+aXNUZXh0KCkgfHwgY3Vyci0+aXNCUigp KQorICAgICAgICAgICAgICAgIGlmICghY3Vyci0+bm9kZSgpIHx8ICFjdXJyLT5ub2RlKCktPmlz RWxlbWVudE5vZGUoKSB8fCBjdXJyLT5pc1RleHRPckJSKCkpCiAgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIG1fdXNlckFjdGlvbkVsZW1lbnRzLnNldEluQWN0 aXZlQ2hhaW4odG9FbGVtZW50KGN1cnItPm5vZGUoKSksIHRydWUpOwogICAgICAgICAgICAgfQpJ bmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkocmV2aXNpb24gMTU1OTU3KQorKysgU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDg1LDcg KzMwODUsNyBAQCBzdGF0aWMgTm9kZSogZmluZEZpcnN0TWFya2FibGUoTm9kZSogbm9kCiAgICAg d2hpbGUgKG5vZGUpIHsKICAgICAgICAgaWYgKCFub2RlLT5yZW5kZXJlcigpKQogICAgICAgICAg ICAgcmV0dXJuIDA7Ci0gICAgICAgIGlmIChub2RlLT5yZW5kZXJlcigpLT5pc1RleHQoKSB8fCBu b2RlLT5yZW5kZXJlcigpLT5pc0JSKCkpCisgICAgICAgIGlmIChub2RlLT5yZW5kZXJlcigpLT5p c1RleHRPckJSKCkpCiAgICAgICAgICAgICByZXR1cm4gbm9kZTsKICAgICAgICAgaWYgKGlzSFRN TFRleHRGb3JtQ29udHJvbEVsZW1lbnQobm9kZSkpCiAgICAgICAgICAgICBub2RlID0gdG9IVE1M VGV4dEZvcm1Db250cm9sRWxlbWVudChub2RlKS0+dmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoMSku ZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv ZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAkocmV2aXNpb24gMTU1OTU3KQorKysgU291cmNlL1dlYkNv cmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTUsNyArMjE1 LDcgQEAgc3RhdGljIGlubGluZSBib29sIGZ1bGx5Q2xpcHNDb250ZW50cyhObwogc3RhdGljIGlu bGluZSBib29sIGlnbm9yZXNDb250YWluZXJDbGlwKE5vZGUqIG5vZGUpCiB7CiAgICAgUmVuZGVy T2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgaWYgKCFyZW5kZXJlciB8 fCByZW5kZXJlci0+aXNUZXh0KCkgfHwgcmVuZGVyZXItPmlzQlIoKSkKKyAgICBpZiAoIXJlbmRl cmVyIHx8IHJlbmRlcmVyLT5pc1RleHRPckJSKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAg ICByZXR1cm4gcmVuZGVyZXItPnN0eWxlKCktPmhhc091dE9mRmxvd1Bvc2l0aW9uKCk7CiB9Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lQm94LmNwcAkocmV2aXNpb24gMTU1OTcy KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE0MSw3ICsxNDEsNyBAQCBmbG9hdCBJbmxpbmVCb3g6OmxvZ2ljYWxIZWlnaHQoKSBj b25zdAogICAgIGlmIChoYXNWaXJ0dWFsTG9naWNhbEhlaWdodCgpKQogICAgICAgICByZXR1cm4g dmlydHVhbExvZ2ljYWxIZWlnaHQoKTsKICAgICAKLSAgICBpZiAocmVuZGVyZXIoKS5pc1RleHQo KSB8fCByZW5kZXJlcigpLmlzQlIoKSkKKyAgICBpZiAocmVuZGVyZXIoKS5pc1RleHRPckJSKCkp CiAgICAgICAgIHJldHVybiBtX2JpdGZpZWxkcy5pc1RleHQoKSA/IHJlbmRlcmVyKCkuc3R5bGUo aXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3MoKS5oZWlnaHQoKSA6IDA7CiAgICAgaWYg KHJlbmRlcmVyKCkuaXNCb3goKSAmJiBwYXJlbnQoKSkKICAgICAgICAgcmV0dXJuIGlzSG9yaXpv bnRhbCgpID8gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSkuaGVpZ2h0KCkgOiB0b1JlbmRlckJveChy ZW5kZXJlcigpKS53aWR0aCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZUl0ZXJhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGlu ZUl0ZXJhdG9yLmgJKHJldmlzaW9uIDE1NTk1NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVJdGVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNyArMTY2LDcgQEAgc3Rh dGljIGlubGluZSB2b2lkIG5vdGlmeU9ic2VydmVyV2lsbEV4aQogc3RhdGljIGlubGluZSBib29s IGlzSXRlcmF0b3JUYXJnZXQoUmVuZGVyT2JqZWN0KiBvYmplY3QpCiB7CiAgICAgQVNTRVJUKG9i amVjdCk7IC8vIFRoZSBpdGVyYXRvciB3aWxsIG9mIGNvdXJzZSByZXR1cm4gMCwgYnV0IGl0cyBu b3QgYW4gZXhwZWN0ZWQgYXJndW1lbnQgdG8gdGhpcyBmdW5jdGlvbi4KLSAgICByZXR1cm4gb2Jq ZWN0LT5pc1RleHQoKSB8fCBvYmplY3QtPmlzQlIoKSB8fCBvYmplY3QtPmlzRmxvYXRpbmcoKSB8 fCBvYmplY3QtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IG9iamVjdC0+aXNSZXBsYWNlZCgp OworICAgIHJldHVybiBvYmplY3QtPmlzVGV4dE9yQlIoKSB8fCBvYmplY3QtPmlzRmxvYXRpbmco KSB8fCBvYmplY3QtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpIHx8IG9iamVjdC0+aXNSZXBsYWNl ZCgpOwogfQogCiAvLyBUaGlzIGVudW0gaXMgb25seSB1c2VkIGZvciBiaWRpTmV4dFNoYXJlZCgp CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9u IDE1NTk1NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUxMTEsNyArNTExMSw3IEBAIFJlbmRlck9iamVjdCogSW5saW5lTWlu TWF4SXRlcmF0b3I6Om5leHQKICAgICAgICAgaWYgKCFyZXN1bHQpCiAgICAgICAgICAgICBicmVh azsKIAotICAgICAgICBpZiAoIXJlc3VsdC0+aXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgKHJl c3VsdC0+aXNUZXh0KCkgfHwgcmVzdWx0LT5pc0JSKCkgfHwgcmVzdWx0LT5pc0Zsb2F0aW5nKCkg fHwgcmVzdWx0LT5pc1JlcGxhY2VkKCkgfHwgcmVzdWx0LT5pc1JlbmRlcklubGluZSgpKSkKKyAg ICAgICAgaWYgKCFyZXN1bHQtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmIChyZXN1bHQtPmlz VGV4dE9yQlIoKSB8fCByZXN1bHQtPmlzRmxvYXRpbmcoKSB8fCByZXN1bHQtPmlzUmVwbGFjZWQo KSB8fCByZXN1bHQtPmlzUmVuZGVySW5saW5lKCkpKQogICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAKICAgICAgICAgY3VycmVudCA9IHJlc3VsdDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCShyZXZpc2lvbiAxNTU5 NTcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTg0MCw3ICsxODQwLDcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zs b3c6OmxheW91dElubGluZUNoaWxkcgogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgICAgICAgICBvLT5sYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIH0gZWxzZSBpZiAoby0+aXNUZXh0KCkgfHwgby0+aXNCUigpIHx8IChvLT5p c1JlbmRlcklubGluZSgpICYmICF3YWxrZXIuYXRFbmRPZklubGluZSgpKSkgeworICAgICAgICAg ICAgfSBlbHNlIGlmIChvLT5pc1RleHRPckJSKCkgfHwgKG8tPmlzUmVuZGVySW5saW5lKCkgJiYg IXdhbGtlci5hdEVuZE9mSW5saW5lKCkpKSB7CiAgICAgICAgICAgICAgICAgaWYgKG8tPmlzUmVu ZGVySW5saW5lKCkpCiAgICAgICAgICAgICAgICAgICAgIHRvUmVuZGVySW5saW5lKG8pLT51cGRh dGVBbHdheXNDcmVhdGVMaW5lQm94ZXMobGF5b3V0U3RhdGUuaXNGdWxsTGF5b3V0KCkpOwogICAg ICAgICAgICAgICAgIGlmIChsYXlvdXRTdGF0ZS5pc0Z1bGxMYXlvdXQoKSB8fCBvLT5zZWxmTmVl ZHNMYXlvdXQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQ291bnRl ci5jcHAJKHJldmlzaW9uIDE1NTk1NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJDb3VudGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDcgKzEwOCw3IEBAIHN0YXRpYyBi b29sIHBsYW5Db3VudGVyKFJlbmRlck9iamVjdCogb2IKIAogICAgIC8vIFJlYWwgdGV4dCBub2Rl cyBkb24ndCBoYXZlIHRoZWlyIG93biBzdHlsZSBzbyB0aGV5IGNhbid0IGhhdmUgY291bnRlcnMu CiAgICAgLy8gV2UgY2FuJ3QgZXZlbiBsb29rIGF0IHRoZWlyIHN0eWxlcyBvciB3ZSdsbCBzZWUg ZXh0cmEgcmVzZXRzIGFuZCBpbmNyZW1lbnRzIQotICAgIGlmIChvYmplY3QtPmlzVGV4dCgpICYm ICFvYmplY3QtPmlzQlIoKSkKKyAgICBpZiAob2JqZWN0LT5pc1RleHQoKSkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIE5vZGUqIGdlbmVyYXRpbmdOb2RlID0gb2JqZWN0LT5nZW5lcmF0aW5n Tm9kZSgpOwogICAgIC8vIFdlIG11c3QgaGF2ZSBhIGdlbmVyYXRpbmcgbm9kZSBvciBlbHNlIHdl IGNhbm5vdCBoYXZlIGEgY291bnRlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmgJKHJldmlzaW9uIDE1NTk2MikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNTY4LDYgKzU2OCw3IEBAIHB1Ymxp YzoKIAogICAgIGJvb2wgaXNUZXh0KCkgY29uc3QgIHsgcmV0dXJuICFtX2JpdGZpZWxkcy5pc0Jv eCgpICYmIG1fYml0ZmllbGRzLmlzVGV4dE9yUmVuZGVyVmlldygpOyB9CiAgICAgYm9vbCBpc0JS KCkgY29uc3QgeyByZXR1cm4gbV9iaXRmaWVsZHMuaXNCUigpOyB9CisgICAgYm9vbCBpc1RleHRP ckJSKCkgY29uc3QgeyByZXR1cm4gaXNUZXh0KCkgfHwgaXNCUigpOyB9CiAgICAgYm9vbCBpc0Jv eCgpIGNvbnN0IHsgcmV0dXJuIG1fYml0ZmllbGRzLmlzQm94KCk7IH0KICAgICBib29sIGlzUmVu ZGVyVmlldygpIGNvbnN0ICB7IHJldHVybiBtX2JpdGZpZWxkcy5pc0JveCgpICYmIG1fYml0Zmll bGRzLmlzVGV4dE9yUmVuZGVyVmlldygpOyB9CiAgICAgYm9vbCBpc0lubGluZSgpIGNvbnN0IHsg cmV0dXJuIG1fYml0ZmllbGRzLmlzSW5saW5lKCk7IH0gLy8gaW5saW5lIG9iamVjdApJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNwcAkocmV2aXNp b24gMTU1OTU3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC01ODksNyArNTg5LDcgQEAgdm9pZCB3cml0ZShUZXh0U3Ry ZWFtJiB0cywgY29uc3QgUmVuZGVyTwogICAgIFJlbmRlclRyZWVBc1RleHQ6OndyaXRlUmVuZGVy T2JqZWN0KHRzLCBvLCBiZWhhdmlvcik7CiAgICAgdHMgPDwgIlxuIjsKIAotICAgIGlmIChvLmlz VGV4dCgpICYmICFvLmlzQlIoKSkgeworICAgIGlmIChvLmlzVGV4dCgpKSB7CiAgICAgICAgIGNv bnN0IFJlbmRlclRleHQmIHRleHQgPSB0b1JlbmRlclRleHQobyk7CiAgICAgICAgIGZvciAoSW5s aW5lVGV4dEJveCogYm94ID0gdGV4dC5maXJzdFRleHRCb3goKTsgYm94OyBib3ggPSBib3gtPm5l eHRUZXh0Qm94KCkpIHsKICAgICAgICAgICAgIHdyaXRlSW5kZW50KHRzLCBpbmRlbnQgKyAxKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUm9vdElubGluZUJveC5jcHAJKHJldmlz aW9uIDE1NTk1NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9Sb290SW5saW5lQm94LmNw cAkod29ya2luZyBjb3B5KQpAQCAtOTE1LDcgKzkxNSw3IEBAIHZvaWQgUm9vdElubGluZUJveDo6 YXNjZW50QW5kRGVzY2VudEZvckIKICAgICBpZiAoaW5jbHVkZU1hcmdpbkZvckJveChib3gpKSB7 CiAgICAgICAgIExheW91dFVuaXQgYXNjZW50V2l0aE1hcmdpbiA9IGJveC0+cmVuZGVyZXIoKS5z dHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpLT5mb250TWV0cmljcygpLmFzY2VudChiYXNlbGluZVR5 cGUoKSk7CiAgICAgICAgIExheW91dFVuaXQgZGVzY2VudFdpdGhNYXJnaW4gPSBib3gtPnJlbmRl cmVyKCkuc3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKS0+Zm9udE1ldHJpY3MoKS5kZXNjZW50KGJh c2VsaW5lVHlwZSgpKTsKLSAgICAgICAgaWYgKGJveC0+cGFyZW50KCkgJiYgIWJveC0+cmVuZGVy ZXIoKS5pc1RleHQoKSAmJiAhYm94LT5yZW5kZXJlcigpLmlzQlIoKSkgeworICAgICAgICBpZiAo Ym94LT5wYXJlbnQoKSAmJiAhYm94LT5yZW5kZXJlcigpLmlzVGV4dE9yQlIoKSkgewogICAgICAg ICAgICAgYXNjZW50V2l0aE1hcmdpbiArPSBib3gtPmJveE1vZGVsT2JqZWN0KCktPmJvcmRlckFu ZFBhZGRpbmdCZWZvcmUoKSArIGJveC0+Ym94TW9kZWxPYmplY3QoKS0+bWFyZ2luQmVmb3JlKCk7 CiAgICAgICAgICAgICBkZXNjZW50V2l0aE1hcmdpbiArPSBib3gtPmJveE1vZGVsT2JqZWN0KCkt PmJvcmRlckFuZFBhZGRpbmdBZnRlcigpICsgYm94LT5ib3hNb2RlbE9iamVjdCgpLT5tYXJnaW5B ZnRlcigpOwogICAgICAgICB9CkBAIC05MjksNyArOTI5LDcgQEAgdm9pZCBSb290SW5saW5lQm94 Ojphc2NlbnRBbmREZXNjZW50Rm9yQgogCiBMYXlvdXRVbml0IFJvb3RJbmxpbmVCb3g6OnZlcnRp Y2FsUG9zaXRpb25Gb3JCb3goSW5saW5lQm94KiBib3gsIFZlcnRpY2FsUG9zaXRpb25DYWNoZSYg dmVydGljYWxQb3NpdGlvbkNhY2hlKQogewotICAgIGlmIChib3gtPnJlbmRlcmVyKCkuaXNUZXh0 KCkgfHwgYm94LT5yZW5kZXJlcigpLmlzQlIoKSkKKyAgICBpZiAoYm94LT5yZW5kZXJlcigpLmlz VGV4dE9yQlIoKSkKICAgICAgICAgcmV0dXJuIGJveC0+cGFyZW50KCktPmxvZ2ljYWxUb3AoKTsK ICAgICAKICAgICBSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVuZGVyZXIgPSBib3gtPmJveE1vZGVs T2JqZWN0KCk7Cg==