100902 2012-10-31 16:23:25 -0700 [BlackBerry] Fix editing/text-iterator/findString-expected.html fail 2012-11-01 07:42:24 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis gtk-ews gustavo mifenton tonikitoo webkit.review.bot xan.lopez oldest_to_newest 755712 0 rwlbuis 2012-10-31 16:23:25 -0700 We can fix this test by just using the regular Page::findString like other ports do. 755718 1 171740 rwlbuis 2012-10-31 16:32:32 -0700 Created attachment 171740 Patch 755723 2 171740 gtk-ews 2012-10-31 16:42:49 -0700 Comment on attachment 171740 Patch Attachment 171740 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/14670292 755747 3 171740 yong.li.webkit 2012-10-31 17:28:45 -0700 Comment on attachment 171740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171740&action=review > Tools/ChangeLog:10 > + Fix the test my using the Page::findString method instead of our own in-page searcher. my => by? 756239 4 rwlbuis 2012-11-01 07:42:24 -0700 Committed r133166: <http://trac.webkit.org/changeset/133166> 171740 2012-10-31 16:32:32 -0700 2012-10-31 17:28:45 -0700 Patch bug-100902-20121031193055.patch text/plain 11902 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyOTQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjYzY2Y1OGJhMjI0YmFiMzEzYWQ2NzM1MGI4ZTExMDky NDc4NmRlNS4uNTVjNzcyMTA5MmQ1OWRkY2Q0NGU4YjAwNGJlODc5NzZmMjY1YjlhZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDEyLTEwLTMxICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0Js YWNrQmVycnldIEZpeCBlZGl0aW5nL3RleHQtaXRlcmF0b3IvZmluZFN0cmluZy1leHBlY3RlZC5o dG1sIGZhaWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMDkwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFBSIDIxMDAzOQorCisgICAgICAgIEZpeCB0aGUgdGVzdCBteSB1c2luZyB0aGUgUGFnZTo6Zmlu ZFN0cmluZyBtZXRob2QgaW5zdGVhZCBvZiBvdXIgb3duIGluLXBhZ2Ugc2VhcmNoZXIuCisgICAg ICAgIFRoaXMgYWxzbyBzeW5jcyBzb21lIG9mIHRoZSBjaGFuZ2VzIHdlIGRpZCByZWdhcmRpbmcg U3RyaW5nIHVzYWdlLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1w UmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJU cmVlOjpkdW1wRnJhbWVzQXNUZXh0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6ZHVt cEhpc3RvcnlJdGVtKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6ZHVtcEJhY2tGb3J3 YXJkTGlzdEZvcldlYlZpZXcpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVu ZGVyVHJlZTo6ZHVtcCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJU cmVlOjpkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSk6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSk6CisgICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpydW5KYXZhU2NyaXB0QWxl cnQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVC bGFja0JlcnJ5Lmg6CisgICAgICAgIChEdW1wUmVuZGVyVHJlZSk6CisgICAgICAgICogRHVtcFJl bmRlclRyZWUvYmxhY2tiZXJyeS9UZXN0UnVubmVyQmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChU ZXN0UnVubmVyOjpzZXRNb2NrR2VvbG9jYXRpb25FcnJvcik6CisgICAgICAgIChUZXN0UnVubmVy OjpsYXllclRyZWVBc1RleHQpOgorICAgICAgICAoVGVzdFJ1bm5lcjo6ZmluZFN0cmluZyk6Cisg ICAgICAgIChUZXN0UnVubmVyOjpzZXRTdG9yYWdlRGF0YWJhc2VJZGxlSW50ZXJ2YWwpOgorCiAy MDEyLTEwLTMwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAg ICAgQW5vdGhlciBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9i bGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNr YmVycnkvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDQ2NzQzNDVjMjM5ZjM2NDQyZTBkZDI5YzYy MDE0MzQ5YThhODhlOTQuLmE2MjA4M2ZhOTJhNTcwOGRhZGU1OTEwMWI0NzcwN2U5NDY5NzE3MmYg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRy ZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRy ZWUuY3BwCkBAIC0zNzMsMTIgKzM3MywxMiBAQCBTdHJpbmcgRHVtcFJlbmRlclRyZWU6OmR1bXBG cmFtZXNBc1RleHQoV2ViQ29yZTo6RnJhbWUqIGZyYW1lKQogICAgIGlmIChmcmFtZS0+dHJlZSgp LT5wYXJlbnQoKSkKICAgICAgICAgcyA9IFN0cmluZzo6Zm9ybWF0KCJcbi0tLS0tLS0tXG5GcmFt ZTogJyVzJ1xuLS0tLS0tLS1cbiIsIGZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5zdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKIAotICAgIHMgKz0gZG9jdW1lbnRFbGVtZW50LT5pbm5lclRleHQo KSArICJcbiI7CisgICAgcyA9IHMgKyBkb2N1bWVudEVsZW1lbnQtPmlubmVyVGV4dCgpICsgIlxu IjsKIAogICAgIGlmIChnVGVzdFJ1bm5lci0+ZHVtcENoaWxkRnJhbWVzQXNUZXh0KCkpIHsKICAg ICAgICAgV2ViQ29yZTo6RnJhbWVUcmVlKiB0cmVlID0gZnJhbWUtPnRyZWUoKTsKICAgICAgICAg Zm9yIChXZWJDb3JlOjpGcmFtZSogY2hpbGQgPSB0cmVlLT5maXJzdENoaWxkKCk7IGNoaWxkOyBj aGlsZCA9IGNoaWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCi0gICAgICAgICAgICBzICs9IGR1 bXBGcmFtZXNBc1RleHQoY2hpbGQpOworICAgICAgICAgICAgcyA9IHMgKyBkdW1wRnJhbWVzQXNU ZXh0KGNoaWxkKTsKICAgICB9CiAgICAgcmV0dXJuIHM7CiB9CkBAIC00MjYsMTEgKzQyNiwxMSBA QCBzdGF0aWMgU3RyaW5nIGR1bXBIaXN0b3J5SXRlbShQYXNzUmVmUHRyPFdlYkNvcmU6Okhpc3Rv cnlJdGVtPiBpdGVtLCBpbnQgaW5kZW50LAogCiAgICAgaW50IHN0YXJ0ID0gMDsKICAgICBpZiAo Y3VycmVudCkgewotICAgICAgICByZXN1bHQgKz0gImN1cnItPiI7CisgICAgICAgIHJlc3VsdCA9 IHJlc3VsdCArICJjdXJyLT4iOwogICAgICAgICBzdGFydCA9IDY7CiAgICAgfQogICAgIGZvciAo aW50IGkgPSBzdGFydDsgaSA8IGluZGVudDsgaSsrKQotICAgICAgICByZXN1bHQgKz0gIiAiOwor ICAgICAgICByZXN1bHQgPSByZXN1bHQgKyAiICI7CiAKICAgICBTdHJpbmcgdXJsID0gaXRlbS0+ dXJsU3RyaW5nKCk7CiAgICAgaWYgKHVybC5jb250YWlucygiZmlsZTovLyIpKSB7CkBAIC00NDEs MjUgKzQ0MSwyNSBAQCBzdGF0aWMgU3RyaW5nIGR1bXBIaXN0b3J5SXRlbShQYXNzUmVmUHRyPFdl YkNvcmU6Okhpc3RvcnlJdGVtPiBpdGVtLCBpbnQgaW5kZW50LAogICAgICAgICBpZiAocmVzLmlz RW1wdHkoKSkKICAgICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAKLSAgICAgICAgcmVzdWx0ICs9 IGZpbGVUZXN0U3RyaW5nOwotICAgICAgICByZXN1bHQgKz0gcmVzOworICAgICAgICByZXN1bHQg PSByZXN1bHQgKyBmaWxlVGVzdFN0cmluZzsKKyAgICAgICAgcmVzdWx0ID0gcmVzdWx0ICsgcmVz OwogICAgIH0gZWxzZQotICAgICAgICByZXN1bHQgKz0gdXJsOworICAgICAgICByZXN1bHQgPSBy ZXN1bHQgKyB1cmw7CiAKICAgICBTdHJpbmcgdGFyZ2V0ID0gaXRlbS0+dGFyZ2V0KCk7CiAgICAg aWYgKCF0YXJnZXQuaXNFbXB0eSgpKQotICAgICAgICByZXN1bHQgKz0gIiAoaW4gZnJhbWUgXCIi ICsgdGFyZ2V0ICsgIlwiKSI7CisgICAgICAgIHJlc3VsdCA9IHJlc3VsdCArICIgKGluIGZyYW1l IFwiIiArIHRhcmdldCArICJcIikiOwogCiAgICAgaWYgKGl0ZW0tPmlzVGFyZ2V0SXRlbSgpKQot ICAgICAgICByZXN1bHQgKz0gIiAgKipuYXYgdGFyZ2V0KioiOwotICAgIHJlc3VsdCArPSAiXG4i OworICAgICAgICByZXN1bHQgPSByZXN1bHQgKyAiICAqKm5hdiB0YXJnZXQqKiI7CisgICAgcmVz dWx0ID0gcmVzdWx0ICsgIlxuIjsKIAogICAgIFdlYkNvcmU6Okhpc3RvcnlJdGVtVmVjdG9yIGNo aWxkcmVuID0gaXRlbS0+Y2hpbGRyZW4oKTsKICAgICAvLyBNdXN0IHNvcnQgdG8gZWxpbWluYXRl IGFyYml0cmFyeSByZXN1bHQgb3JkZXJpbmcgd2hpY2ggZGVmZWF0cyByZXByb2R1Y2libGUgdGVz dGluZy4KICAgICBub25Db3B5aW5nU29ydChjaGlsZHJlbi5iZWdpbigpLCBjaGlsZHJlbi5lbmQo KSwgaGlzdG9yeUl0ZW1Db21wYXJlKTsKICAgICB1bnNpZ25lZCByZXN1bHRTaXplID0gY2hpbGRy ZW4uc2l6ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCByZXN1bHRTaXplOyArK2kp Ci0gICAgICAgIHJlc3VsdCArPSBkdW1wSGlzdG9yeUl0ZW0oY2hpbGRyZW5baV0sIGluZGVudCAr IDQsIGZhbHNlKTsKKyAgICAgICAgcmVzdWx0ID0gcmVzdWx0ICsgZHVtcEhpc3RvcnlJdGVtKGNo aWxkcmVuW2ldLCBpbmRlbnQgKyA0LCBmYWxzZSk7CiAKICAgICByZXR1cm4gcmVzdWx0OwogfQpA QCAtNDc2LDE2ICs0NzYsMTYgQEAgc3RhdGljIFN0cmluZyBkdW1wQmFja0ZvcndhcmRMaXN0Rm9y V2ViVmlldygpCiAgICAgYmZMaXN0LT5iYWNrTGlzdFdpdGhMaW1pdChtYXhJdGVtcywgZW50cmll cyk7CiAgICAgdW5zaWduZWQgcmVzdWx0U2l6ZSA9IGVudHJpZXMuc2l6ZSgpOwogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCByZXN1bHRTaXplOyArK2kpCi0gICAgICAgIHJlc3VsdCArPSBk dW1wSGlzdG9yeUl0ZW0oZW50cmllc1tpXSwgOCwgZmFsc2UpOworICAgICAgICByZXN1bHQgPSBy ZXN1bHQgKyBkdW1wSGlzdG9yeUl0ZW0oZW50cmllc1tpXSwgOCwgZmFsc2UpOwogCi0gICAgcmVz dWx0ICs9IGR1bXBIaXN0b3J5SXRlbShiZkxpc3QtPmN1cnJlbnRJdGVtKCksIDgsIHRydWUpOwor ICAgIHJlc3VsdCA9IHJlc3VsdCArIGR1bXBIaXN0b3J5SXRlbShiZkxpc3QtPmN1cnJlbnRJdGVt KCksIDgsIHRydWUpOwogCiAgICAgYmZMaXN0LT5mb3J3YXJkTGlzdFdpdGhMaW1pdChtYXhJdGVt cywgZW50cmllcyk7CiAgICAgcmVzdWx0U2l6ZSA9IGVudHJpZXMuc2l6ZSgpOwogICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCByZXN1bHRTaXplOyArK2kpCi0gICAgICAgIHJlc3VsdCArPSBk dW1wSGlzdG9yeUl0ZW0oZW50cmllc1tpXSwgOCwgZmFsc2UpOworICAgICAgICByZXN1bHQgPSBy ZXN1bHQgKyBkdW1wSGlzdG9yeUl0ZW0oZW50cmllc1tpXSwgOCwgZmFsc2UpOwogCi0gICAgcmVz dWx0ICs9ICI9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PVxu IjsKKyAgICByZXN1bHQgPSByZXN1bHQgKyAgIj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09XG4iOwogCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KQEAgLTUwNiw3 ICs1MDYsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKICAgICBTdHJpbmcgZGF0YSA9 IGR1bXBBc1RleHQgPyBkdW1wRnJhbWVzQXNUZXh0KG1haW5GcmFtZSkgOiByZW5kZXJUcmVlRHVt cCgpOwogCiAgICAgaWYgKGdUZXN0UnVubmVyLT5kdW1wQmFja0ZvcndhcmRMaXN0KCkpCi0gICAg ICAgIGRhdGEgKz0gZHVtcEJhY2tGb3J3YXJkTGlzdEZvcldlYlZpZXcoKTsKKyAgICAgICAgZGF0 YSA9IGRhdGEgKyBkdW1wQmFja0ZvcndhcmRMaXN0Rm9yV2ViVmlldygpOwogCiAgICAgU3RyaW5n IHJlc3VsdCA9ICJDb250ZW50LVR5cGU6ICIgKyByZXN1bHRNaW1lVHlwZSArICJcbiIgKyBkYXRh OwogCkBAIC02MzEsNyArNjMxLDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZGlkRmluaXNoRG9j dW1lbnRMb2FkRm9yRnJhbWUoV2ViQ29yZTo6RnJhbWUqIGZyYW1lKQogICAgICAgICBpZiAoZ1Rl c3RSdW5uZXItPmR1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkKICAgICAgICAgICAgIHByaW50Zigi JXMgLSBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZVxuIiwgZHJ0RnJhbWVEZXNjcmlwdGlv bihmcmFtZSkudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgdW5z aWduZWQgcGVuZGluZ0ZyYW1lVW5sb2FkRXZlbnRzID0gZnJhbWUtPmRvbVdpbmRvdygpLT5wZW5k aW5nVW5sb2FkRXZlbnRMaXN0ZW5lcnMoKTsKKyAgICAgICAgICAgIHVuc2lnbmVkIHBlbmRpbmdG cmFtZVVubG9hZEV2ZW50cyA9IGZyYW1lLT5kb2N1bWVudCgpLT5kb21XaW5kb3coKS0+cGVuZGlu Z1VubG9hZEV2ZW50TGlzdGVuZXJzKCk7CiAgICAgICAgICAgICBpZiAocGVuZGluZ0ZyYW1lVW5s b2FkRXZlbnRzKQogICAgICAgICAgICAgICAgIHByaW50ZigiJXMgLSBoYXMgJXUgb251bmxvYWQg aGFuZGxlcihzKVxuIiwgZHJ0RnJhbWVEZXNjcmlwdGlvbihmcmFtZSkudXRmOCgpLmRhdGEoKSwg cGVuZGluZ0ZyYW1lVW5sb2FkRXZlbnRzKTsKICAgICAgICAgfQpAQCAtNjY0LDcgKzY2NCw3IEBA IHZvaWQgRHVtcFJlbmRlclRyZWU6OmRpZFJlY2VpdmVUaXRsZUZvckZyYW1lKGNvbnN0IFN0cmlu ZyYgdGl0bGUsIFdlYkNvcmU6OkZyYW1lCiAgICAgICAgIHByaW50ZigiJXMgLSBkaWRSZWNlaXZl VGl0bGU6ICVzXG4iLCBkcnRGcmFtZURlc2NyaXB0aW9uKGZyYW1lKS51dGY4KCkuZGF0YSgpLCB0 aXRsZS51dGY4KCkuZGF0YSgpKTsKIAogICAgIGlmIChnVGVzdFJ1bm5lci0+ZHVtcFRpdGxlQ2hh bmdlcygpKQotICAgICAgICBwcmludGYoIlRJVExFIENIQU5HRUQ6ICclcydcbiIsIHRpdGxlLnV0 ZjgoKS5kYXRhKCkpOworICAgICAgICBwcmludGYoIlRJVExFIENIQU5HRUQ6ICVzXG4iLCB0aXRs ZS51dGY4KCkuZGF0YSgpKTsKIH0KIAogLy8gQ2hyb21lQ2xpZW50IGRlbGVnYXRlcy4KQEAgLTY5 MSwxMCArNjkxLDggQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZShj b25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW0KIAogdm9pZCBEdW1wUmVuZGVy VHJlZTo6cnVuSmF2YVNjcmlwdEFsZXJ0KGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKLSAgICBp ZiAoIXRlc3REb25lKSB7CisgICAgaWYgKCF0ZXN0RG9uZSkKICAgICAgICAgcHJpbnRmKCJBTEVS VDogJXNcbiIsIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIGZmbHVzaChzdGRvdXQp OwotICAgIH0KIH0KIAogYm9vbCBEdW1wUmVuZGVyVHJlZTo6cnVuSmF2YVNjcmlwdENvbmZpcm0o Y29uc3QgU3RyaW5nJiBtZXNzYWdlKQpAQCAtNzY3LDEyICs3NjUsNiBAQCB2b2lkIER1bXBSZW5k ZXJUcmVlOjpkaWRDaGFuZ2VTZWxlY3Rpb24oKQogICAgICAgICBwcmludGYoIkVESVRJTkcgREVM RUdBVEU6IHdlYlZpZXdEaWRDaGFuZ2VTZWxlY3Rpb246JXNcbiIsICJXZWJWaWV3RGlkQ2hhbmdl U2VsZWN0aW9uTm90aWZpY2F0aW9uIik7CiB9CiAKLWJvb2wgRHVtcFJlbmRlclRyZWU6OmZpbmRT dHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMp Ci17Ci0gICAgV2ViQ29yZTo6UGFnZSogcGFnZSA9IG1haW5GcmFtZSA/IG1haW5GcmFtZS0+cGFn ZSgpIDogMDsKLSAgICByZXR1cm4gcGFnZSAmJiBwYWdlLT5maW5kU3RyaW5nKHN0cmluZywgb3B0 aW9ucyk7Ci19Ci0KIGJvb2wgRHVtcFJlbmRlclRyZWU6OnNob3VsZEJlZ2luRWRpdGluZ0luRE9N UmFuZ2UoV2ViQ29yZTo6UmFuZ2UqIHJhbmdlKQogewogICAgIGlmICghdGVzdERvbmUgJiYgZ1Rl c3RSdW5uZXItPmR1bXBFZGl0aW5nQ2FsbGJhY2tzKCkpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1w UmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlQmxhY2tCZXJyeS5oIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaAppbmRl eCBkZjdiMjMwZmRiNjFiMjBmZDlkYjA3OGZjNGEzZjhmNzJmODZjMjZmLi5kYWNhMTEyYzkzOWU2 ZTYzYzA1ZjA1MzNjODBmN2FkZmVhNjU4NzYxIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlQmxhY2tCZXJyeS5oCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5LmgKQEAgLTIz LDExICsyMywxMSBAQAogCiAKICNpbmNsdWRlICJEdW1wUmVuZGVyVHJlZUNsaWVudC5oIgotI2lu Y2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiVGltZXIuaCIKICNpbmNsdWRlIDxC bGFja0JlcnJ5UGxhdGZvcm1MYXlvdXRUZXN0Lmg+CiAjaW5jbHVkZSA8RmluZE9wdGlvbnMuaD4K ICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+ CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIENyZWRlbnRpYWw7CkBAIC05NCw3ICs5NCw2 IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEVuZEVkaXRpbmcoKTsKICAgICB2b2lkIGRpZENoYW5n ZSgpOwogICAgIHZvaWQgZGlkQ2hhbmdlU2VsZWN0aW9uKCk7Ci0gICAgYm9vbCBmaW5kU3RyaW5n KGNvbnN0IFN0cmluZyYsIFdlYkNvcmU6OkZpbmRPcHRpb25zKTsKICAgICBib29sIHNob3VsZEJl Z2luRWRpdGluZ0luRE9NUmFuZ2UoV2ViQ29yZTo6UmFuZ2UqKTsKICAgICBib29sIHNob3VsZEVu ZEVkaXRpbmdJbkRPTVJhbmdlKFdlYkNvcmU6OlJhbmdlKik7CiAgICAgYm9vbCBzaG91bGREZWxl dGVET01SYW5nZShXZWJDb3JlOjpSYW5nZSopOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvYmxhY2tiZXJyeS9UZXN0UnVubmVyQmxhY2tCZXJyeS5jcHAgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9ibGFja2JlcnJ5L1Rlc3RSdW5uZXJCbGFja0JlcnJ5LmNwcAppbmRleCBjOWQwMTM3 NzUwMWIwYjY0Njc5MDJmY2IwODZjMTg4YzRiNWIwMmU4Li5jODBhOTZkZGJhMTAzZjRmNDA2OTJm M2RiMTE0OTI3MDczOWExNmIzIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFj a2JlcnJ5L1Rlc3RSdW5uZXJCbGFja0JlcnJ5LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9ibGFja2JlcnJ5L1Rlc3RSdW5uZXJCbGFja0JlcnJ5LmNwcApAQCAtMSw2ICsxLDUgQEAKIC8q CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDksIDIwMTAsIDIwMTIgUmVzZWFyY2ggSW4gTW90aW9uIExp bWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTIgQXBwbGUg SW5jLiBBbGwgUmlnaHRzIFJlc2VydmVkLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNv ZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTIwLDcgKzE5 LDYgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJUZXN0UnVubmVyLmgiCiAKLSNp bmNsdWRlICJDU3RyaW5nLmgiCiAjaW5jbHVkZSAiRGF0YWJhc2VUcmFja2VyLmgiCiAjaW5jbHVk ZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgpAQCAtMzYsMTQgKzM0 LDEyIEBACiAjaW5jbHVkZSAiSlNFbGVtZW50LmgiCiAjaW5jbHVkZSAiS1VSTC5oIgogI2luY2x1 ZGUgIk5vdEltcGxlbWVudGVkLmgiCi0jaW5jbHVkZSAiT3duQXJyYXlQdHIuaCIKICNpbmNsdWRl ICJQYWdlLmgiCiAjaW5jbHVkZSAiUmVuZGVyVHJlZUFzVGV4dC5oIgogI2luY2x1ZGUgIlNjaGVt ZVJlZ2lzdHJ5LmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTZWN1 cml0eVBvbGljeS5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCi0jaW5jbHVkZSAiVW51c2VkUGFy YW0uaCIKICNpbmNsdWRlICJXb3JrUXVldWUuaCIKICNpbmNsdWRlICJXb3JrUXVldWVJdGVtLmgi CiAjaW5jbHVkZSAiV29ya2VyVGhyZWFkLmgiCkBAIC01Myw2ICs0OSwxMCBAQAogI2luY2x1ZGUg PFdlYlBhZ2UuaD4KICNpbmNsdWRlIDxXZWJTZXR0aW5ncy5oPgogCisjaW5jbHVkZSA8d3RmL093 bkFycmF5UHRyLmg+CisjaW5jbHVkZSA8d3RmL1VudXNlZFBhcmFtLmg+CisjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgorCiB1c2luZyBXZWJDb3JlOjp0b0VsZW1lbnQ7CiB1c2luZyBXZWJD b3JlOjp0b0pTOwogCkBAIC00NTIsMTAgKzQ1MiwxMCBAQCB2b2lkIFRlc3RSdW5uZXI6OnNldE1v Y2tHZW9sb2NhdGlvblBvc2l0aW9uKGRvdWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwg ZAogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydDo6c2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24o QmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6Y3VycmVudEluc3RhbmNlKCktPnBh Z2UoKSwgbGF0aXR1ZGUsIGxvbmdpdHVkZSwgYWNjdXJhY3kpOwogfQogCi12b2lkIFRlc3RSdW5u ZXI6OnNldE1vY2tHZW9sb2NhdGlvblBvc2l0aW9uVW5hdmFpbGFibGVFcnJvcihKU1N0cmluZ1Jl ZiBtZXNzYWdlKQordm9pZCBUZXN0UnVubmVyOjpzZXRNb2NrR2VvbG9jYXRpb25FcnJvcihpbnQg Y29kZSwgSlNTdHJpbmdSZWYgbWVzc2FnZSkKIHsKICAgICBTdHJpbmcgbWVzc2FnZVN0ciA9IGpz U3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKG1lc3NhZ2UpOwotICAgIER1bXBSZW5kZXJUcmVlU3Vw cG9ydDo6c2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb25VbmF2YWlsYWJsZUVycm9yKEJsYWNrQmVy cnk6OldlYktpdDo6RHVtcFJlbmRlclRyZWU6OmN1cnJlbnRJbnN0YW5jZSgpLT5wYWdlKCksIG1l c3NhZ2VTdHIpOworICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydDo6c2V0TW9ja0dlb2xvY2F0aW9u RXJyb3IoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6Y3VycmVudEluc3RhbmNl KCktPnBhZ2UoKSwgY29kZSwgbWVzc2FnZVN0cik7CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6c2hv d1dlYkluc3BlY3RvcigpCkBAIC01ODcsNiArNTg3LDEyIEBAIEpTVmFsdWVSZWYgVGVzdFJ1bm5l cjo6Y29tcHV0ZWRTdHlsZUluY2x1ZGluZ1Zpc2l0ZWRJbmZvKEpTQ29udGV4dFJlZiBjb250ZXh0 LCBKCiAgICAgcmV0dXJuIER1bXBSZW5kZXJUcmVlU3VwcG9ydDo6Y29tcHV0ZWRTdHlsZUluY2x1 ZGluZ1Zpc2l0ZWRJbmZvKGNvbnRleHQsIHZhbHVlKTsKIH0KIAorSlNSZXRhaW5QdHI8SlNTdHJp bmdSZWY+IFRlc3RSdW5uZXI6OmxheWVyVHJlZUFzVGV4dCgpIGNvbnN0Cit7CisgICAgbm90SW1w bGVtZW50ZWQoKTsKKyAgICByZXR1cm4gMDsKK30KKwogSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+ IFRlc3RSdW5uZXI6Om1hcmtlclRleHRGb3JMaXN0SXRlbShKU0NvbnRleHRSZWYgY29udGV4dCwg SlNWYWx1ZVJlZiBub2RlT2JqZWN0KSBjb25zdAogewogICAgIFdlYkNvcmU6OkVsZW1lbnQqIGVs ZW1lbnQgPSB0b0VsZW1lbnQodG9KUyh0b0pTKGNvbnRleHQpLCBub2RlT2JqZWN0KSk7CkBAIC03 NDYsOSArNzUyLDcgQEAgYm9vbCBUZXN0UnVubmVyOjpmaW5kU3RyaW5nKEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU1N0cmluZ1JlZiB0YXJnZXQsIEpTT2JqZWN0UmUKICAgICAgICAgICAgIG9wdGlv bnMgfD0gV2ViQ29yZTo6U3RhcnRJblNlbGVjdGlvbjsKICAgICB9CiAKLSAgICAvLyBPdXIgbGF5 b3V0IHRlc3RzIGFzc3VtZSBmaW5kIHdpbGwgd3JhcCBhbmQgaGlnaGxpZ2h0IGFsbCBtYXRjaGVz LgotICAgIHJldHVybiBCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpjdXJyZW50 SW5zdGFuY2UoKS0+cGFnZSgpLT5maW5kTmV4dFN0cmluZyhuYW1lU3RyLnV0ZjgoKS5kYXRhKCks Ci0gICAgICAgICEob3B0aW9ucyAmIFdlYkNvcmU6OkJhY2t3YXJkcyksICEob3B0aW9ucyAmIFdl YkNvcmU6OkNhc2VJbnNlbnNpdGl2ZSksIHRydWUgLyogd3JhcCAqLywgdHJ1ZSAvKiBoaWdobGln aHRBbGxNYXRjaGVzICovKTsKKyAgICByZXR1cm4gbWFpbkZyYW1lLT5wYWdlKCktPmZpbmRTdHJp bmcobmFtZVN0ciwgb3B0aW9ucyk7CiB9CiAKIHZvaWQgVGVzdFJ1bm5lcjo6ZGVsZXRlTG9jYWxT dG9yYWdlRm9yT3JpZ2luKEpTU3RyaW5nUmVmIFVSTCkKQEAgLTgzOSwzICs4NDMsOSBAQCB2b2lk IFRlc3RSdW5uZXI6OmRlbGl2ZXJXZWJJbnRlbnQoSlNTdHJpbmdSZWYsIEpTU3RyaW5nUmVmLCBK U1N0cmluZ1JlZikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQorCit2b2lkIFRlc3RSdW5u ZXI6OnNldFN0b3JhZ2VEYXRhYmFzZUlkbGVJbnRlcnZhbChkb3VibGUpCit7CisgICAgLy8gRklY TUU6IEltcGxlbWVudCB0aGlzLgorICAgIG5vdEltcGxlbWVudGVkKCk7Cit9Cg==