62165 2011-06-06 16:42:02 -0700 WebKit2 find-on-page callback doesn’t handle kWKMoreThanMaximumMatchCount on PDF pages 2011-06-07 06:04:20 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 sullivan sullivan darin oldest_to_newest 416116 0 sullivan 2011-06-06 16:42:02 -0700 On HTML pages, the PageFindClient API returns a special value, kWKMoreThanMaximumMatchCount, when more matches were found than a specified maximum. But when searching PDF pages, this value is never returned. In Radar as 9555835 416127 1 96154 sullivan 2011-06-06 16:57:58 -0700 Created attachment 96154 Patch to make PDFViewController return kWKMoreThanMaximumMatchCount when appropriate. 416135 2 96154 mitz 2011-06-06 17:05:44 -0700 Comment on attachment 96154 Patch to make PDFViewController return kWKMoreThanMaximumMatchCount when appropriate. View in context: https://bugs.webkit.org/attachment.cgi?id=96154&action=review > Source/WebKit2/ChangeLog:5 > + Need a short description and bug URL (OOPS!) OOPS! 416138 3 sullivan 2011-06-06 17:08:03 -0700 Fixed in http://trac.webkit.org/changeset/88204 416291 4 96154 darin 2011-06-06 21:31:05 -0700 Comment on attachment 96154 Patch to make PDFViewController return kWKMoreThanMaximumMatchCount when appropriate. View in context: https://bugs.webkit.org/attachment.cgi?id=96154&action=review > Source/WebKit2/UIProcess/API/mac/PDFViewController.mm:620 > + matchCount = static_cast<unsigned>(kWKMoreThanMaximumMatchCount); What is the purpose of casting to unsigned when assigning to an NSUInteger? 416452 5 sullivan 2011-06-07 06:04:20 -0700 I copied/pasted the line that does the casting from FindController::countStringMatches(). I didn’t notice that in FindController::countStringMatches(), matchCount was declared as an unsigned and here it is declared as an NSUInteger. 96154 2011-06-06 16:57:58 -0700 2011-06-06 21:31:05 -0700 Patch to make PDFViewController return kWKMoreThanMaximumMatchCount when appropriate. 62165_patch.txt text/plain 2458 sullivan SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MjAyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMDYgIEpvaG4gU3Vs bGl2YW4gIDxzdWxsaXZhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTmVlZCBhIHNob3J0IGRlc2NyaXB0aW9uIGFuZCBidWcgVVJM IChPT1BTISkKKyAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD02MjE2NT4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzk1NTU4MzU+CisgICAgICAgIFdlYktp dDIgZmluZC1vbi1wYWdlIGNhbGxiYWNrIGRvZXNu4oCZdCBoYW5kbGUga1dLTW9yZVRoYW5NYXhp bXVtTWF0Y2hDb3VudCBvbiBQREYgcGFnZXMKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFj L1BERlZpZXdDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViS2l0OjpQREZWaWV3Q29udHJvbGxl cjo6ZmluZFN0cmluZyk6CisgICAgICAgIFJldHVybiBrV0tNb3JlVGhhbk1heGltdW1NYXRjaENv dW50IHdoZW4gYXBwcm9wcmlhdGUsIGEgbGEgRmluZENvbnRyb2xsZXI6OmNvdW50U3RyaW5nTWF0 Y2hlcygpLgorICAgICAgICBBbHNvLCBza2lwIGNvdW50aW5nIGFsbCB0aGUgbWF0Y2hlcyBpZiBt YXhNYXRjaENvdW50IGlzIDAsIHRvIGF2b2lkIChwZXJoYXBzIHNsb3dseSkgY29tcHV0aW5nIGEK KyAgICAgICAgbnVtYmVyIHRoYXQgd291bGQgYmUgaWdub3JlZC4KKwogMjAxMS0wNi0wNiAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0JKHJldmlzaW9uIDg3NzY4KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUERGVmlld0NvbnRyb2xsZXIubW0J KHdvcmtpbmcgY29weSkKQEAgLTYwOSwxNSArNjA5LDIxIEBAIHZvaWQgUERGVmlld0NvbnRyb2xs ZXI6OmZpbmRTdHJpbmcoY29uc3QKICAgICBCT09MIHdyYXBGbGFnID0gb3B0aW9ucyAmIEZpbmRP cHRpb25zV3JhcEFyb3VuZDsKIAogICAgIFBERlNlbGVjdGlvbiAqc2VsZWN0aW9uID0gW21fd2tQ REZWaWV3LmdldCgpIF9uZXh0TWF0Y2hGb3I6c3RyaW5nIGRpcmVjdGlvbjpmb3J3YXJkIGNhc2VT ZW5zaXRpdmU6Y2FzZUZsYWcgd3JhcDp3cmFwRmxhZyBmcm9tU2VsZWN0aW9uOlttX3BkZlZpZXcg Y3VycmVudFNlbGVjdGlvbl0gc3RhcnRJblNlbGVjdGlvbjpOT107Ci0gICAgTlNVSW50ZWdlciBt YXRjaENvdW50ID0gW21fd2tQREZWaWV3LmdldCgpIF9jb3VudE1hdGNoZXM6c3RyaW5nIGNhc2VT ZW5zaXRpdmU6Y2FzZUZsYWddOwotICAgIGlmIChtYXRjaENvdW50ID4gbWF4TWF0Y2hDb3VudCkK LSAgICAgICAgbWF0Y2hDb3VudCA9IG1heE1hdGNoQ291bnQ7Ci0KICAgICBpZiAoIXNlbGVjdGlv bikgewogICAgICAgICBwYWdlKCktPmRpZEZhaWxUb0ZpbmRTdHJpbmcoc3RyaW5nKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAorICAgIE5TVUludGVnZXIgbWF0Y2hDb3VudDsKKyAgICBpZiAo IW1heE1hdGNoQ291bnQpIHsKKyAgICAgICAgLy8gSWYgdGhlIG1heCB3YXMgemVybywgYW55IHJl c3VsdCBtZWFucyB3ZSBleGNlZWRlZCB0aGUgbWF4LiBXZSBjYW4gc2tpcCBjb21wdXRpbmcgdGhl IGFjdHVhbCBjb3VudC4KKyAgICAgICAgbWF0Y2hDb3VudCA9IHN0YXRpY19jYXN0PHVuc2lnbmVk PihrV0tNb3JlVGhhbk1heGltdW1NYXRjaENvdW50KTsKKyAgICB9IGVsc2UgeworICAgICAgICBt YXRjaENvdW50ID0gW21fd2tQREZWaWV3LmdldCgpIF9jb3VudE1hdGNoZXM6c3RyaW5nIGNhc2VT ZW5zaXRpdmU6Y2FzZUZsYWddOworICAgICAgICBpZiAobWF0Y2hDb3VudCA+IG1heE1hdGNoQ291 bnQpCisgICAgICAgICAgICBtYXRjaENvdW50ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGtXS01v cmVUaGFuTWF4aW11bU1hdGNoQ291bnQpOworICAgIH0KKwogICAgIFttX3BkZlZpZXcgc2V0Q3Vy cmVudFNlbGVjdGlvbjpzZWxlY3Rpb25dOwogICAgIFttX3BkZlZpZXcgc2Nyb2xsU2VsZWN0aW9u VG9WaXNpYmxlOm5pbF07CiAgICAgcGFnZSgpLT5kaWRGaW5kU3RyaW5nKHN0cmluZywgbWF0Y2hD b3VudCk7Cg==