166299 2016-12-20 20:21:39 -0800 Modernize findPlainText 2016-12-21 14:12:25 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 158503 1 rniwa rniwa commit-queue darin koivisto wenson_hsieh oldest_to_newest 1261880 0 rniwa 2016-12-20 20:21:39 -0800 Modernize findPlainText in TextIterator.cpp. 1261884 1 297577 rniwa 2016-12-20 20:47:39 -0800 Created attachment 297577 Cleanup 1262146 2 297577 rniwa 2016-12-21 13:48:13 -0800 Comment on attachment 297577 Cleanup Thanks for the review! 1262159 3 297577 commit-queue 2016-12-21 14:12:22 -0800 Comment on attachment 297577 Cleanup Clearing flags on attachment: 297577 Committed r210078: <http://trac.webkit.org/changeset/210078> 1262160 4 commit-queue 2016-12-21 14:12:25 -0800 All reviewed patches have been landed. Closing bug. 297577 2016-12-20 20:47:39 -0800 2016-12-21 14:12:22 -0800 Cleanup bug-166299-20161220204638.patch text/plain 5555 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMDA1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTEyLTIwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vZGVybml6ZSBmaW5kUGxhaW5U ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjYy OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2Rl cm5pemVkIGZpbmRQbGFpblRleHQgYnkgbWVyZ2luZyB0aGUgc3RhdGljIHZlcnNpb24gb2YgaXQg aW50byBpdAorICAgICAgICBhbmQgZXh0cmFjdGluZyB0aGUgbWFpbiBuZXN0ZWQgbG9vcCBvdXQg YXMgZmluZFBsYWluVGV4dE9mZnNldC4KKworICAgICAgICBObyBuZXcgdGVzdHMgc2luY2UgdGhl cmUgc2hvdWxkIGJlIG5vIGJlaGF2aW9yYWwgY2hhbmdlLgorCisgICAgICAgICogZWRpdGluZy9U ZXh0SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmluZFBsYWluVGV4dE9mZnNldCk6 CisgICAgICAgIChXZWJDb3JlOjpmaW5kUGxhaW5UZXh0KToKKwogMjAxNi0xMi0yMCAgTXlsZXMg Qy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFNraWEgbGlnaHRl ciB3Z2h0IHZhcmlhdGlvbiBsb29rcyBib2xkZXIgdGhhbiByZWd1bGFyCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCShyZXZpc2lvbiAyMTAwNDgpCisrKyBTb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2 MDgsNjQgKzI2MDgsNjEgQEAgc3RhdGljIFJlZjxSYW5nZT4gY29sbGFwc2VkVG9Cb3VuZGFyeShj bwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBzaXplX3QgZmluZFBsYWluVGV4dChj b25zdCBSYW5nZSYgcmFuZ2UsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBGaW5kT3B0aW9ucyBvcHRp b25zLCBzaXplX3QmIG1hdGNoU3RhcnQpCitzdGF0aWMgc3RkOjpvcHRpb25hbDxzdGQ6OnBhaXI8 c2l6ZV90LCBzaXplX3Q+PiBmaW5kUGxhaW5UZXh0T2Zmc2V0KFNlYXJjaEJ1ZmZlciYgYnVmZmVy LCBDaGFyYWN0ZXJJdGVyYXRvciYgZmluZEl0ZXJhdG9yLCBib29sIHNlYXJjaEZvcndhcmQpCiB7 Ci0gICAgbWF0Y2hTdGFydCA9IDA7CisgICAgc2l6ZV90IG1hdGNoU3RhcnQgPSAwOwogICAgIHNp emVfdCBtYXRjaExlbmd0aCA9IDA7Ci0KLSAgICBTZWFyY2hCdWZmZXIgYnVmZmVyKHRhcmdldCwg b3B0aW9ucyk7Ci0KLSAgICBpZiAoYnVmZmVyLm5lZWRzTW9yZUNvbnRleHQoKSkgewotICAgICAg ICBSZWY8UmFuZ2U+IGJlZm9yZVN0YXJ0UmFuZ2UgPSByYW5nZS5vd25lckRvY3VtZW50KCkuY3Jl YXRlUmFuZ2UoKTsKLSAgICAgICAgYmVmb3JlU3RhcnRSYW5nZS0+c2V0RW5kKHJhbmdlLnN0YXJ0 Q29udGFpbmVyKCksIHJhbmdlLnN0YXJ0T2Zmc2V0KCkpOwotICAgICAgICBmb3IgKFNpbXBsaWZp ZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3IgYmFja3dhcmRzSXRlcmF0b3IoYmVmb3JlU3RhcnRSYW5n ZS5nZXQoKSk7ICFiYWNrd2FyZHNJdGVyYXRvci5hdEVuZCgpOyBiYWNrd2FyZHNJdGVyYXRvci5h ZHZhbmNlKCkpIHsKLSAgICAgICAgICAgIGJ1ZmZlci5wcmVwZW5kQ29udGV4dChiYWNrd2FyZHNJ dGVyYXRvci50ZXh0KCkpOwotICAgICAgICAgICAgaWYgKCFidWZmZXIubmVlZHNNb3JlQ29udGV4 dCgpKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgQ2hh cmFjdGVySXRlcmF0b3IgZmluZEl0ZXJhdG9yKHJhbmdlLCBUZXh0SXRlcmF0b3JFbnRlcnNUZXh0 Q29udHJvbHMgfCBUZXh0SXRlcmF0b3JDbGlwc1RvRnJhbWVBbmNlc3RvcnMpOwotCiAgICAgd2hp bGUgKCFmaW5kSXRlcmF0b3IuYXRFbmQoKSkgewogICAgICAgICBmaW5kSXRlcmF0b3IuYWR2YW5j ZShidWZmZXIuYXBwZW5kKGZpbmRJdGVyYXRvci50ZXh0KCkpKTsKLXRyeUFnYWluOgotICAgICAg ICBzaXplX3QgbWF0Y2hTdGFydE9mZnNldDsKLSAgICAgICAgaWYgKHNpemVfdCBuZXdNYXRjaExl bmd0aCA9IGJ1ZmZlci5zZWFyY2gobWF0Y2hTdGFydE9mZnNldCkpIHsKLSAgICAgICAgICAgIC8v IE5vdGUgdGhhdCB3ZSBmb3VuZCBhIG1hdGNoLCBhbmQgd2hlcmUgd2UgZm91bmQgaXQuCisgICAg ICAgIHdoaWxlICgxKSB7CisgICAgICAgICAgICBzaXplX3QgbWF0Y2hTdGFydE9mZnNldDsKKyAg ICAgICAgICAgIHNpemVfdCBuZXdNYXRjaExlbmd0aCA9IGJ1ZmZlci5zZWFyY2gobWF0Y2hTdGFy dE9mZnNldCk7CisgICAgICAgICAgICBpZiAoIW5ld01hdGNoTGVuZ3RoKSB7CisgICAgICAgICAg ICAgICAgaWYgKGZpbmRJdGVyYXRvci5hdEJyZWFrKCkgJiYgIWJ1ZmZlci5hdEJyZWFrKCkpIHsK KyAgICAgICAgICAgICAgICAgICAgYnVmZmVyLnJlYWNoZWRCcmVhaygpOworICAgICAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBzaXplX3QgbGFzdENoYXJhY3RlckluQnVm ZmVyT2Zmc2V0ID0gZmluZEl0ZXJhdG9yLmNoYXJhY3Rlck9mZnNldCgpOwogICAgICAgICAgICAg QVNTRVJUKGxhc3RDaGFyYWN0ZXJJbkJ1ZmZlck9mZnNldCA+PSBtYXRjaFN0YXJ0T2Zmc2V0KTsK ICAgICAgICAgICAgIG1hdGNoU3RhcnQgPSBsYXN0Q2hhcmFjdGVySW5CdWZmZXJPZmZzZXQgLSBt YXRjaFN0YXJ0T2Zmc2V0OwogICAgICAgICAgICAgbWF0Y2hMZW5ndGggPSBuZXdNYXRjaExlbmd0 aDsKLSAgICAgICAgICAgIC8vIElmIHNlYXJjaGluZyBmb3J3YXJkLCBzdG9wIG9uIHRoZSBmaXJz dCBtYXRjaC4KLSAgICAgICAgICAgIC8vIElmIHNlYXJjaGluZyBiYWNrd2FyZCwgZG9uJ3Qgc3Rv cCwgc28gd2UgZW5kIHVwIHdpdGggdGhlIGxhc3QgbWF0Y2guCi0gICAgICAgICAgICBpZiAoIShv cHRpb25zICYgQmFja3dhcmRzKSkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg IGdvdG8gdHJ5QWdhaW47Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKGZpbmRJdGVyYXRvci5hdEJy ZWFrKCkgJiYgIWJ1ZmZlci5hdEJyZWFrKCkpIHsKLSAgICAgICAgICAgIGJ1ZmZlci5yZWFjaGVk QnJlYWsoKTsKLSAgICAgICAgICAgIGdvdG8gdHJ5QWdhaW47CisgICAgICAgICAgICBpZiAoc2Vh cmNoRm9yd2FyZCkgLy8gTG9vayBmb3IgdGhlIGxhc3QgbWF0Y2ggd2hlbiBzZWFyY2hpbmcgYmFj a3dhcmRzIGluc3RlYWQuCisgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6cGFpcjxzaXplX3Qs IHNpemVfdD4geyBtYXRjaFN0YXJ0LCBtYXRjaExlbmd0aCB9OwogICAgICAgICB9CiAgICAgfQog Ci0gICAgcmV0dXJuIG1hdGNoTGVuZ3RoOworICAgIGlmICghbWF0Y2hMZW5ndGgpCisgICAgICAg IHJldHVybiBzdGQ6Om51bGxvcHQ7CisKKyAgICByZXR1cm4gc3RkOjpwYWlyPHNpemVfdCwgc2l6 ZV90PiB7IG1hdGNoU3RhcnQsIG1hdGNoTGVuZ3RoIH07CiB9CiAKIFJlZjxSYW5nZT4gZmluZFBs YWluVGV4dChjb25zdCBSYW5nZSYgcmFuZ2UsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBGaW5kT3B0 aW9ucyBvcHRpb25zKQogewotICAgIC8vIEZpcnN0LCBmaW5kIHRoZSB0ZXh0LgotICAgIHNpemVf dCBtYXRjaFN0YXJ0OwotICAgIHNpemVfdCBtYXRjaExlbmd0aDsKLSAgICB7Ci0gICAgICAgIG1h dGNoTGVuZ3RoID0gZmluZFBsYWluVGV4dChyYW5nZSwgdGFyZ2V0LCBvcHRpb25zLCBtYXRjaFN0 YXJ0KTsKLSAgICAgICAgaWYgKCFtYXRjaExlbmd0aCkKLSAgICAgICAgICAgIHJldHVybiBjb2xs YXBzZWRUb0JvdW5kYXJ5KHJhbmdlLCAhKG9wdGlvbnMgJiBCYWNrd2FyZHMpKTsKKyAgICBTZWFy Y2hCdWZmZXIgYnVmZmVyKHRhcmdldCwgb3B0aW9ucyk7CisKKyAgICBpZiAoYnVmZmVyLm5lZWRz TW9yZUNvbnRleHQoKSkgeworICAgICAgICBSZWY8UmFuZ2U+IGJlZm9yZVN0YXJ0UmFuZ2UgPSBy YW5nZS5vd25lckRvY3VtZW50KCkuY3JlYXRlUmFuZ2UoKTsKKyAgICAgICAgYmVmb3JlU3RhcnRS YW5nZS0+c2V0RW5kKHJhbmdlLnN0YXJ0Q29udGFpbmVyKCksIHJhbmdlLnN0YXJ0T2Zmc2V0KCkp OworICAgICAgICBmb3IgKFNpbXBsaWZpZWRCYWNrd2FyZHNUZXh0SXRlcmF0b3IgYmFja3dhcmRz SXRlcmF0b3IoYmVmb3JlU3RhcnRSYW5nZS5nZXQoKSk7ICFiYWNrd2FyZHNJdGVyYXRvci5hdEVu ZCgpOyBiYWNrd2FyZHNJdGVyYXRvci5hZHZhbmNlKCkpIHsKKyAgICAgICAgICAgIGJ1ZmZlci5w cmVwZW5kQ29udGV4dChiYWNrd2FyZHNJdGVyYXRvci50ZXh0KCkpOworICAgICAgICAgICAgaWYg KCFidWZmZXIubmVlZHNNb3JlQ29udGV4dCgpKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICB9CiAgICAgfQogCi0gICAgLy8gVGhlbiwgZmluZCB0aGUgZG9jdW1lbnQgcG9zaXRpb24g b2YgdGhlIHN0YXJ0IGFuZCB0aGUgZW5kIG9mIHRoZSB0ZXh0LgotICAgIENoYXJhY3Rlckl0ZXJh dG9yIGNvbXB1dGVSYW5nZUl0ZXJhdG9yKHJhbmdlLCBUZXh0SXRlcmF0b3JFbnRlcnNUZXh0Q29u dHJvbHMgfCBUZXh0SXRlcmF0b3JDbGlwc1RvRnJhbWVBbmNlc3RvcnMpOwotICAgIHJldHVybiBj aGFyYWN0ZXJTdWJyYW5nZShyYW5nZS5vd25lckRvY3VtZW50KCksIGNvbXB1dGVSYW5nZUl0ZXJh dG9yLCBtYXRjaFN0YXJ0LCBtYXRjaExlbmd0aCk7CisgICAgYm9vbCBzZWFyY2hGb3J3YXJkID0g IShvcHRpb25zICYgQmFja3dhcmRzKTsKKyAgICBUZXh0SXRlcmF0b3JCZWhhdmlvciBpdGVyYXRv ck9wdGlvbnMgPSBUZXh0SXRlcmF0b3JFbnRlcnNUZXh0Q29udHJvbHMgfCBUZXh0SXRlcmF0b3JD bGlwc1RvRnJhbWVBbmNlc3RvcnM7CisKKyAgICBDaGFyYWN0ZXJJdGVyYXRvciBmaW5kSXRlcmF0 b3IocmFuZ2UsIGl0ZXJhdG9yT3B0aW9ucyk7CisgICAgYXV0byByZXN1bHQgPSBmaW5kUGxhaW5U ZXh0T2Zmc2V0KGJ1ZmZlciwgZmluZEl0ZXJhdG9yLCBzZWFyY2hGb3J3YXJkKTsKKyAgICBpZiAo IXJlc3VsdCkKKyAgICAgICAgcmV0dXJuIGNvbGxhcHNlZFRvQm91bmRhcnkocmFuZ2UsIHNlYXJj aEZvcndhcmQpOworCisgICAgQ2hhcmFjdGVySXRlcmF0b3IgcmFuZ2VDb21wdXRlSXRlcmF0b3Io cmFuZ2UsIGl0ZXJhdG9yT3B0aW9ucyk7CisgICAgcmV0dXJuIGNoYXJhY3RlclN1YnJhbmdlKHJh bmdlLm93bmVyRG9jdW1lbnQoKSwgcmFuZ2VDb21wdXRlSXRlcmF0b3IsIHJlc3VsdC0+Zmlyc3Qs IHJlc3VsdC0+c2Vjb25kKTsKIH0KIAogfQo=