114885 2013-04-19 11:27:56 -0700 [BlackBerry] Find-on-page should do the scoping again when highlight policy changed 2013-04-19 13:28:10 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 andchen webkit-unassigned commit-queue mifenton rwlbuis oldest_to_newest 878590 0 andchen 2013-04-19 11:27:56 -0700 We only started a new scoping when search text is changed. We should do the scoping again when the highlight policy changed but text not changed, otherwise, we could lose the yellow markers. For example, call findString with highlightAllMatches = false, then call it again with highlightAllMatches = true. 878605 1 198908 andchen 2013-04-19 12:11:48 -0700 Created attachment 198908 Patch 878621 2 198908 rwlbuis 2013-04-19 13:01:38 -0700 Comment on attachment 198908 Patch LGTM. 878629 3 198908 commit-queue 2013-04-19 13:28:08 -0700 Comment on attachment 198908 Patch Clearing flags on attachment: 198908 Committed r148762: <http://trac.webkit.org/changeset/148762> 878630 4 commit-queue 2013-04-19 13:28:10 -0700 All reviewed patches have been landed. Closing bug. 198908 2013-04-19 12:11:48 -0700 2013-04-19 13:28:08 -0700 Patch bug-114885-20130419151117.patch text/plain 3181 andchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4NzU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCA5NDM2MzZiYWZjOTE2MzE4YzFlN2M1Mjk3OTliY2U4M2YxZmY1MDIzLi5lODdmOGMwOTI2 ZDg1ODMyMTBhNDIwNzI3YzAxNjQ1ZDY2ZGIxYjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wNC0xOSAgQW5keSBDaGVuICA8YW5kY2hlbkBi bGFja2JlcnJ5LmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gRmluZC1vbi1wYWdlIHNob3Vs ZCBkbyB0aGUgc2NvcGluZyBhZ2FpbiB3aGVuIGhpZ2hsaWdodCBwb2xpY3kgY2hhbmdlZCAKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDg4NQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDE5NTc3Mwor ICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IE1pa2UgRmVudG9uLgorICAgICAgICBGb3Ig ZmluZCBvbiBwYWdlLCB3ZSBuZWVkIHRvIHRyZWF0IGl0IGFzIGEgbmV3IHNlYXJjaCBpZiBoaWdo bGlnaHRBbGxNYXRjaGVzCisgICAgICAgIGNoYW5nZXMgYnV0IHRoZSB0ZXh0IGlzIG5vdCBjaGFu Z2VkLgorCisgICAgICAgICogV2ViS2l0U3VwcG9ydC9JblBhZ2VTZWFyY2hNYW5hZ2VyLmNwcDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5QYWdlU2VhcmNoTWFuYWdlcjo6ZmluZE5l eHRTdHJpbmcpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblBhZ2VTZWFyY2hNYW5h Z2VyOjpmaW5kQW5kTWFya1RleHQpOgorCiAyMDEzLTA0LTE5ICBYdWVmZWkgUmVuICA8eHJlbkBi bGFja2JlcnJ5LmNvbT4KIAogICAgICAgICBmaXhlZCBkZWJ1ZyBicm9rZW4gZnJvbSBwcmV2aW91 cyBwYXRjaCAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0luUGFnZVNlYXJjaE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAKaW5kZXggMjcxYzMzNDEwZGU3YTRi ZDBlODdlMjkxYzI4MTEzNGE5MWUxY2UwZi4uYTMzODBiM2UzM2M4MGQ3NjZiMjE5NGM3NjMwMWJh Yzc5NjdmYjRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvSW5QYWdlU2VhcmNoTWFuYWdlci5jcHAKQEAgLTg2LDYgKzg2LDcg QEAgSW5QYWdlU2VhcmNoTWFuYWdlcjo6fkluUGFnZVNlYXJjaE1hbmFnZXIoKQogCiBib29sIElu UGFnZVNlYXJjaE1hbmFnZXI6OmZpbmROZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYgdGV4dCwgRmlu ZE9wdGlvbnMgZmluZE9wdGlvbnMsIGJvb2wgd3JhcCwgYm9vbCBoaWdobGlnaHRBbGxNYXRjaGVz KQogeworICAgIGJvb2wgaGlnaGxpZ2h0QWxsTWF0Y2hlc1N0YXRlQ2hhbmdlZCA9IG1faGlnaGxp Z2h0QWxsTWF0Y2hlcyAhPSBoaWdobGlnaHRBbGxNYXRjaGVzOwogICAgIG1faGlnaGxpZ2h0QWxs TWF0Y2hlcyA9IGhpZ2hsaWdodEFsbE1hdGNoZXM7CiAKICAgICBpZiAoIXRleHQubGVuZ3RoKCkp IHsKQEAgLTEwOCw3ICsxMDksNyBAQCBib29sIEluUGFnZVNlYXJjaE1hbmFnZXI6OmZpbmROZXh0 U3RyaW5nKGNvbnN0IFN0cmluZyYgdGV4dCwgRmluZE9wdGlvbnMgZmluZE9wdAogCiAgICAgRXhj ZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgUmVmUHRyPFJhbmdlPiBzZWFyY2hTdGFydGluZ1BvaW50 ID0gbV9hY3RpdmVNYXRjaCA/IG1fYWN0aXZlTWF0Y2gtPmNsb25lUmFuZ2UoZWMpIDogMDsKLSAg ICBib29sIG5ld1NlYXJjaCA9IG1fYWN0aXZlU2VhcmNoU3RyaW5nICE9IHRleHQ7CisgICAgYm9v bCBuZXdTZWFyY2ggPSBoaWdobGlnaHRBbGxNYXRjaGVzU3RhdGVDaGFuZ2VkIHx8IChtX2FjdGl2 ZVNlYXJjaFN0cmluZyAhPSB0ZXh0KTsKICAgICBib29sIGZvcndhcmQgPSAhKGZpbmRPcHRpb25z ICYgV2ViQ29yZTo6QmFja3dhcmRzKTsKICAgICBpZiAobmV3U2VhcmNoKSB7IC8vIFN0YXJ0IGEg bmV3IHNlYXJjaC4KICAgICAgICAgbV9hY3RpdmVTZWFyY2hTdHJpbmcgPSB0ZXh0OwpAQCAtMTg0 LDYgKzE4NSwxMyBAQCBib29sIEluUGFnZVNlYXJjaE1hbmFnZXI6OmZpbmRBbmRNYXJrVGV4dChj b25zdCBTdHJpbmcmIHRleHQsIFJhbmdlKiByYW5nZSwgRnJhbQogICAgICAgICBzZXRBY3RpdmVN YXRjaEFuZE1hcmtlcihtYXRjaCk7CiAgICAgICAgIGlmIChpc05ld1NlYXJjaCkgewogICAgICAg ICAgICAgc2NvcGVTdHJpbmdNYXRjaGVzKHRleHQsIHRydWUgLyogcmVzZXQgKi8sIGZhbHNlIC8q IGxvY2F0ZUFjdGl2ZU1hdGNoT25seSAqLyk7CisgICAgICAgICAgICBpZiAoIW1faGlnaGxpZ2h0 QWxsTWF0Y2hlcykgeworICAgICAgICAgICAgICAgIC8vIE5vdCBoaWdobGlnaHRpbmcgYWxsIG1h dGNoZXMsIHdlIG5lZWQgdG8gYWRkIHRoZSBtYXJrZXIgaGVyZSwKKyAgICAgICAgICAgICAgICAv LyBiZWNhdXNlIHNjb3BlU3RyaW5nTWF0Y2hlcyBkb2VzIG5vdCBhZGQgYW55IG1hcmtlcnMsIGl0 IG9ubHkgY291bnRzIHRoZSBudW1iZXIuCisgICAgICAgICAgICAgICAgLy8gTm8gbmVlZCB0byB1 bm1hcmtBbGxUZXh0TWF0Y2hlcywgaXQgaXMgYWxyZWFkeSBkb25lIGZyb20gdGhlIGNhbGxlciBi ZWNhdXNlIG9mIG5ld1NlYXJjaAorICAgICAgICAgICAgICAgIG1fYWN0aXZlTWF0Y2gtPm93bmVy RG9jdW1lbnQoKS0+bWFya2VycygpLT5hZGRUZXh0TWF0Y2hNYXJrZXIobV9hY3RpdmVNYXRjaC5n ZXQoKSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5zZXRNYXJrZWRU ZXh0TWF0Y2hlc0FyZUhpZ2hsaWdodGVkKHRydWUgLyogaGlnaGxpZ2h0ICovKTsKKyAgICAgICAg ICAgIH0KICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIGlmIChz dGFydEZyb21TZWxlY3Rpb24gfHwgbV9sb2NhdGluZ0FjdGl2ZU1hdGNoKSB7Cg==