76522 2012-01-18 01:31:46 -0800 DidFindString should be emitted even if FindOptionsShowOverlay is not enabled 2012-02-29 10:15:44 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 svillar svillar andersca cgarcia darin svillar oldest_to_newest 537709 0 svillar 2012-01-18 01:31:46 -0800 After talking to andersca on IRC it seems it was done like that due to how OS X works. It seems that Safari works anyway if we send the message in the absence of that flag, and it seems more correct. This way, non Mac ports do not need to enable the show overlay options to get signaled about occurrences of the searched string in the web view. 537742 1 122896 svillar 2012-01-18 02:55:19 -0800 Created attachment 122896 Patch 542062 2 123895 svillar 2012-01-25 01:01:52 -0800 Created attachment 123895 Patch 542063 3 svillar 2012-01-25 01:02:51 -0800 Updating the patch after http://trac.webkit.org/changeset/105855 543265 4 123895 darin 2012-01-26 10:46:31 -0800 Comment on attachment 123895 Patch The question for me is not “Is Safari broken?” but rather “Are there callers who want to do a find but not makeAllMatchesForText”. The patch talks about emitting DidFindString, but the key difference here is that the old code could be used to search for the string once, but the new code searches the full page for all instances of the string. 543317 5 svillar 2012-01-26 11:24:04 -0800 (In reply to comment #4) > (From update of attachment 123895 [details]) > The question for me is not “Is Safari broken?” but rather “Are there callers who want to do a find but not makeAllMatchesForText”. The patch talks about emitting DidFindString, but the key difference here is that the old code could be used to search for the string once, but the new code searches the full page for all instances of the string. You made a good point, IMO we have 2 different issues here: 1) DidFindString should always be emitted (if the text is found obviously), whether or not you have the ShowOverlay option. I guess that's something that should not be under discussion. 2) It's true that the patch I uploaded changes the behaviour in the sense you mention. What we could do is the following. If the showOverlay and/or showHighlight options are specified we could assume that the caller wants markAllMatches to be called, otherwise the findString call will just look for the next occurrence of the search string in the test. What do you think? 543897 6 svillar 2012-01-27 01:38:35 -0800 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 123895 [details] [details]) > > The question for me is not “Is Safari broken?” but rather “Are there callers who want to do a find but not makeAllMatchesForText”. The patch talks about emitting DidFindString, but the key difference here is that the old code could be used to search for the string once, but the new code searches the full page for all instances of the string. > > You made a good point, IMO we have 2 different issues here: > > 1) DidFindString should always be emitted (if the text is found obviously), whether or not you have the ShowOverlay option. I guess that's something that should not be under discussion. Well perhaps it's indeed under discussion. I was not taking into account that the signal carries the total number of matches. So I have know a different proposal. 1) Remove the matchCount argument from the DidFindString message. It'll be issued whenever findString finds the string. 2) Perform the markAllTextMatches() only when (shouldShowOverlay || shouldShowHighlight) <- I am not very happy with this because something from the view is driving a different behaviour, but we can live with it in order not to add too many find options 3) Issue DidCountStringMatches() in FindController::findString method if markAllTextMatches() was called to inform about the total number of matches (since DidFindString does not longer carry that information) 547207 7 svillar 2012-02-01 10:54:51 -0800 There is also another interesting thing to consider. Mac port does not care much about unmarking text matches because highlight is not shown and the find UI (the overlay) is automatically hidden after a mouse click. The obvious choice seems to be calling unmarkAllTextMatches in FindController::hideFindUI. What do you think? 547239 8 svillar 2012-02-01 11:36:18 -0800 (In reply to comment #6) > Well perhaps it's indeed under discussion. I was not taking into account that the signal carries the total number of matches. So I have know a different proposal. > > 1) Remove the matchCount argument from the DidFindString message. It'll be issued whenever findString finds the string. > 2) Perform the markAllTextMatches() only when (shouldShowOverlay || shouldShowHighlight) <- I am not very happy with this because something from the view is driving a different behaviour, but we can live with it in order not to add too many find options > 3) Issue DidCountStringMatches() in FindController::findString method if markAllTextMatches() was called to inform about the total number of matches (since DidFindString does not longer carry that information) Actually changing the signal signature is not required. The API contract would just specify that the number of matches will be at most 1 if neither showOverlay nor showHighlight are specified because in those cases find will just look for the next appearance. 548785 9 125350 svillar 2012-02-03 09:27:24 -0800 Created attachment 125350 Patch 548846 10 125350 darin 2012-02-03 10:44:46 -0800 Comment on attachment 125350 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125350&action=review > Source/WebKit2/ChangeLog:16 > + No new tests required, as there is no change in functionality, > + which is already covered by editing/text-iterator/findString.html. This is a bogus comment! The patch adds a new, untested feature, and so there should be a test for that feature. Saying that existing test results aren’t affected is good, but has no bearing on whether a new test should be added. We do require tests for code changes. The test might need to be only on the GTK platform or have some other restriction. 549826 11 svillar 2012-02-06 01:23:09 -0800 (In reply to comment #10) > (From update of attachment 125350 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=125350&action=review > > > Source/WebKit2/ChangeLog:16 > > + No new tests required, as there is no change in functionality, > > + which is already covered by editing/text-iterator/findString.html. > > This is a bogus comment! The patch adds a new, untested feature, and so there should be a test for that feature. Saying that existing test results aren’t affected is good, but has no bearing on whether a new test should be added. We do require tests for code changes. The test might need to be only on the GTK platform or have some other restriction. Fair enough. I have another patch http://webkit.org/b/76070 that adds a bunch of API tests for the webkitgtk's WK2 Find API. Some of them will fail without this patch. So we'd likely land those API tests first with some of them commented, and then this patch will make them work. Does it make sense? 550084 12 darin 2012-02-06 10:22:46 -0800 (In reply to comment #11) > I have another patch http://webkit.org/b/76070 that adds a bunch of API tests for the webkitgtk's WK2 Find API. Some of them will fail without this patch. So we'd likely land those API tests first with some of them commented, and then this patch will make them work. Does it make sense? Sure. The way we’d normally do that is have this patch include the “uncommenting out tests” aspect as well, but of course that involves getting that other patch landed before this patch is reviewed. 550091 13 svillar 2012-02-06 10:32:44 -0800 (In reply to comment #12) > (In reply to comment #11) > > I have another patch http://webkit.org/b/76070 that adds a bunch of API tests for the webkitgtk's WK2 Find API. Some of them will fail without this patch. So we'd likely land those API tests first with some of them commented, and then this patch will make them work. Does it make sense? > > Sure. The way we’d normally do that is have this patch include the “uncommenting out tests” aspect as well, but of course that involves getting that other patch landed before this patch is reviewed. Great. So once the other patch with the new API lands, I will update and land this one mentioning that it fixes some of the tests previously committed to the repos. 567700 14 svillar 2012-02-29 10:15:44 -0800 Committed r109228: <http://trac.webkit.org/changeset/109228> 122896 2012-01-18 02:55:19 -0800 2012-01-25 01:01:45 -0800 Patch bug-76522-20120118115517.patch text/plain 3040 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWU3YmNmNjZiY2ZhZmVl YjFkMmVmYWVjYWQyZTI0NzVkMDc5MmFiNC4uYzhiOTZiMjNiNjJmMjAwYjM2NzI1OTIzYmZlNDIy N2YzMGFkZTMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAxLTE4ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIERpZEZpbmRT dHJpbmcgc2hvdWxkIG1lIGVtaXR0ZWQgZXZlbiBpZiBGaW5kT3B0aW9uc1Nob3dPdmVybGF5IGlz IG5vdCBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NjUyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIERpZEZpbmRTdHJpbmcgbWVzc2FnZSBzaG91bGQgYmUgaXNzdWVkIGV2ZW4gaWYKKyAgICAg ICAgRmluZE9wdGlvbnNTaG93T3ZlcmxheSBpcyBub3QgcHJvdmlkZWQuIFRoZSBvbGQgYmVoYXZp b3VyIHdhcworICAgICAgICBpbnNwaXJlZCBieSBob3cgT1MgWCB3b3JrcywgYnV0IHRoaXMgY2hh bmdlIGRvZXMgbm90IGJyZWFrIFNhZmFyaS4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWly ZWQsIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LAorICAgICAgICB3aGlj aCBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgZWRpdGluZy90ZXh0LWl0ZXJhdG9yL2ZpbmRTdHJpbmcu aHRtbC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKToKKwogMjAxMi0w MS0xOCAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgogCiAgICAgICAgIE1v dmUgU2hhZG93Q29udGVudEVsZW1lbnQgZnJvbSBkb20vIHRvIGh0bWwvIGFuZCBtYWtlIFNoYWRv d0NvbnRlbnRFbGVtZW50IHN1YmNsYXNzIG9mIEhUTUxFbGVtZW50LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKaW5kZXggOWJk ZDgwYmI5OGNhYWE3NTA4YjQ5NjQzY2NkOTM5ZmE1NmJiMTlkMS4uMDBkOTk4MTc1ZDE0MzRjN2Ex YWUzOGE0ZWJhOGYwODJiMTJmYmIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCkBAIC0xMTAsMjEgKzExMCwxOSBAQCB2 b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBGaW5k T3B0aW9ucyBvcHRpb25zLCB1bnNpZwogICAgIH0gZWxzZSB7CiAgICAgICAgIHNob3VsZFNob3dP dmVybGF5ID0gb3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd092ZXJsYXk7CiAKLSAgICAgICAgaWYg KHNob3VsZFNob3dPdmVybGF5KSB7Ci0gICAgICAgICAgICBpZiAobWF4TWF0Y2hDb3VudCA9PSBu dW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQotICAgICAgICAgICAgICAgIC0tbWF4TWF0 Y2hDb3VudDsKLSAgICAgICAgICAgIAotICAgICAgICAgICAgdW5zaWduZWQgbWF0Y2hDb3VudCA9 IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFya0FsbE1hdGNoZXNGb3JUZXh0KHN0cmluZywgY29y ZShvcHRpb25zKSwgZmFsc2UsIG1heE1hdGNoQ291bnQgKyAxKTsKLQotICAgICAgICAgICAgLy8g Q2hlY2sgaWYgd2UgaGF2ZSBtb3JlIG1hdGNoZXMgdGhhbiBhbGxvd2VkLgotICAgICAgICAgICAg aWYgKG1hdGNoQ291bnQgPiBtYXhNYXRjaENvdW50KSB7Ci0gICAgICAgICAgICAgICAgc2hvdWxk U2hvd092ZXJsYXkgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICBtYXRjaENvdW50ID0gc3RhdGlj X2Nhc3Q8dW5zaWduZWQ+KGtXS01vcmVUaGFuTWF4aW11bU1hdGNoQ291bnQpOwotICAgICAgICAg ICAgfQotCi0gICAgICAgICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6RGlkRmluZFN0cmluZyhzdHJpbmcsIG1hdGNoQ291bnQpKTsKKyAgICAgICAgaWYgKG1heE1h dGNoQ291bnQgPT0gbnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSkKKyAgICAgICAgICAg IC0tbWF4TWF0Y2hDb3VudDsKKworICAgICAgICB1bnNpZ25lZCBtYXRjaENvdW50ID0gbV93ZWJQ YWdlLT5jb3JlUGFnZSgpLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQoc3RyaW5nLCBjb3JlKG9wdGlv bnMpLCBmYWxzZSwgbWF4TWF0Y2hDb3VudCArIDEpOworCisgICAgICAgIC8vIENoZWNrIGlmIHdl IGhhdmUgbW9yZSBtYXRjaGVzIHRoYW4gYWxsb3dlZC4KKyAgICAgICAgaWYgKG1hdGNoQ291bnQg PiBtYXhNYXRjaENvdW50KSB7CisgICAgICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IGZhbHNl OworICAgICAgICAgICAgbWF0Y2hDb3VudCA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihrV0tNb3Jl VGhhbk1heGltdW1NYXRjaENvdW50KTsKICAgICAgICAgfQogCisgICAgICAgIG1fd2ViUGFnZS0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGaW5kU3RyaW5nKHN0cmluZywgbWF0Y2hD b3VudCkpOworCiAgICAgICAgIGlmICghKG9wdGlvbnMgJiBGaW5kT3B0aW9uc1Nob3dGaW5kSW5k aWNhdG9yKSB8fCAhdXBkYXRlRmluZEluZGljYXRvcihzZWxlY3RlZEZyYW1lLCBzaG91bGRTaG93 T3ZlcmxheSkpIHsKICAgICAgICAgICAgIC8vIEVpdGhlciB3ZSBzaG91bGRuJ3Qgc2hvdyB0aGUg ZmluZCBpbmRpY2F0b3IsIG9yIHdlIGNvdWxkbid0IHVwZGF0ZSBpdC4KICAgICAgICAgICAgIGhp ZGVGaW5kSW5kaWNhdG9yKCk7Cg== 123895 2012-01-25 01:01:52 -0800 2012-02-03 09:27:17 -0800 Patch bug-76522-20120125100150.patch text/plain 3287 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjcwODRhYzcyNDNkMzNj ZGNlZTA0MzEwZDUxZTk5MGY1MzI2ODViNi4uZTI1ZjFlZmI2YWMzNjRiMTlhZDAzNTY4YzQ4ZjQ2 YTljMGU4ZjBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAxLTE4ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIERpZEZpbmRT dHJpbmcgc2hvdWxkIGJlIGVtaXR0ZWQgZXZlbiBpZiBGaW5kT3B0aW9uc1Nob3dPdmVybGF5IGlz IG5vdCBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NjUyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIERpZEZpbmRTdHJpbmcgbWVzc2FnZSBzaG91bGQgYmUgaXNzdWVkIGV2ZW4gaWYKKyAgICAg ICAgRmluZE9wdGlvbnNTaG93T3ZlcmxheSBpcyBub3QgcHJvdmlkZWQuIFRoZSBvbGQgYmVoYXZp b3VyIHdhcworICAgICAgICBpbnNwaXJlZCBieSBob3cgT1MgWCB3b3JrcywgYnV0IHRoaXMgY2hh bmdlIGRvZXMgbm90IGJyZWFrIFNhZmFyaS4KKworICAgICAgICBObyBuZXcgdGVzdHMgcmVxdWly ZWQsIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LAorICAgICAgICB3aGlj aCBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgZWRpdGluZy90ZXh0LWl0ZXJhdG9yL2ZpbmRTdHJpbmcu aHRtbC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKToKKwogMjAxMi0w MS0yNCAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbV0syXSBGaW5kQ29udHJvbGxlciBzaG91bGQgbm90IGFzc3VtZSB0aGF0IHBvcnRzIGRvIG5v dCB3YW50IHRvIGhpZ2hsaWdodCB0ZXh0IG1hdGNoZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCmluZGV4IDEwY2ZkZmM4M2Jl NzEyNjMwYTgyNTg2YzVlMGIwNjIwODQ4YjhmOTUuLmIwMzA4ZGNkMWVlZjZjNDA2YTEzYzFkOGU0 ZmZiNWNlODUyZDRmYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9GaW5kQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcApAQCAtMTA4LDI1ICsxMDgsMjIgQEAgdm9pZCBGaW5k Q29udHJvbGxlcjo6ZmluZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgRmluZE9wdGlvbnMg b3B0aW9ucywgdW5zaWcKIAogICAgICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6RGlkRmFpbFRvRmluZFN0cmluZyhzdHJpbmcpKTsKICAgICB9IGVsc2UgeworICAg ICAgICBib29sIHNob3VsZFNob3dIaWdobGlnaHQgPSBvcHRpb25zICYgRmluZE9wdGlvbnNTaG93 SGlnaGxpZ2h0OwogICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IG9wdGlvbnMgJiBGaW5kT3B0 aW9uc1Nob3dPdmVybGF5OwogCi0gICAgICAgIGlmIChzaG91bGRTaG93T3ZlcmxheSkgewotICAg ICAgICAgICAgYm9vbCBzaG91bGRTaG93SGlnaGxpZ2h0ID0gb3B0aW9ucyAmIEZpbmRPcHRpb25z U2hvd0hpZ2hsaWdodDsKKyAgICAgICAgaWYgKG1heE1hdGNoQ291bnQgPT0gbnVtZXJpY19saW1p dHM8dW5zaWduZWQ+OjptYXgoKSkKKyAgICAgICAgICAgIC0tbWF4TWF0Y2hDb3VudDsKIAotICAg ICAgICAgICAgaWYgKG1heE1hdGNoQ291bnQgPT0gbnVtZXJpY19saW1pdHM8dW5zaWduZWQ+Ojpt YXgoKSkKLSAgICAgICAgICAgICAgICAtLW1heE1hdGNoQ291bnQ7Ci0gICAgICAgICAgICAKLSAg ICAgICAgICAgIHVuc2lnbmVkIG1hdGNoQ291bnQgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1h cmtBbGxNYXRjaGVzRm9yVGV4dChzdHJpbmcsIGNvcmUob3B0aW9ucyksIHNob3VsZFNob3dIaWdo bGlnaHQsIG1heE1hdGNoQ291bnQgKyAxKTsKKyAgICAgICAgdW5zaWduZWQgbWF0Y2hDb3VudCA9 IG1fd2ViUGFnZS0+Y29yZVBhZ2UoKS0+bWFya0FsbE1hdGNoZXNGb3JUZXh0KHN0cmluZywgY29y ZShvcHRpb25zKSwgc2hvdWxkU2hvd0hpZ2hsaWdodCwgbWF4TWF0Y2hDb3VudCArIDEpOwogCi0g ICAgICAgICAgICAvLyBDaGVjayBpZiB3ZSBoYXZlIG1vcmUgbWF0Y2hlcyB0aGFuIGFsbG93ZWQu Ci0gICAgICAgICAgICBpZiAobWF0Y2hDb3VudCA+IG1heE1hdGNoQ291bnQpIHsKLSAgICAgICAg ICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IGZhbHNlOwotICAgICAgICAgICAgICAgIG1hdGNo Q291bnQgPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oa1dLTW9yZVRoYW5NYXhpbXVtTWF0Y2hDb3Vu dCk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdl czo6V2ViUGFnZVByb3h5OjpEaWRGaW5kU3RyaW5nKHN0cmluZywgbWF0Y2hDb3VudCkpOworICAg ICAgICAvLyBDaGVjayBpZiB3ZSBoYXZlIG1vcmUgbWF0Y2hlcyB0aGFuIGFsbG93ZWQuCisgICAg ICAgIGlmIChtYXRjaENvdW50ID4gbWF4TWF0Y2hDb3VudCkgeworICAgICAgICAgICAgc2hvdWxk U2hvd092ZXJsYXkgPSBmYWxzZTsKKyAgICAgICAgICAgIG1hdGNoQ291bnQgPSBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4oa1dLTW9yZVRoYW5NYXhpbXVtTWF0Y2hDb3VudCk7CiAgICAgICAgIH0KIAor ICAgICAgICBtX3dlYlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkRmluZFN0 cmluZyhzdHJpbmcsIG1hdGNoQ291bnQpKTsKKwogICAgICAgICBpZiAoIShvcHRpb25zICYgRmlu ZE9wdGlvbnNTaG93RmluZEluZGljYXRvcikgfHwgIXVwZGF0ZUZpbmRJbmRpY2F0b3Ioc2VsZWN0 ZWRGcmFtZSwgc2hvdWxkU2hvd092ZXJsYXkpKSB7CiAgICAgICAgICAgICAvLyBFaXRoZXIgd2Ug c2hvdWxkbid0IHNob3cgdGhlIGZpbmQgaW5kaWNhdG9yLCBvciB3ZSBjb3VsZG4ndCB1cGRhdGUg aXQuCiAgICAgICAgICAgICBoaWRlRmluZEluZGljYXRvcigpOwo= 125350 2012-02-03 09:27:24 -0800 2012-02-03 10:44:46 -0800 Patch bug-76522-20120203182722.patch text/plain 3219 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2NDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzY5YzIwZGI5MzgxZWYy MzNmMDVhMmQ5ZDIzZjU3NDYyM2JhNzU4MC4uZjQwZGVmMjBhZDYxOGVkNzU2OTQ3ZWI4YWYzMTE0 Yjg3OWU2Y2FlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTAyLTAzICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIERpZEZpbmRT dHJpbmcgc2hvdWxkIGJlIGVtaXR0ZWQgZXZlbiBpZiBGaW5kT3B0aW9uc1Nob3dPdmVybGF5IGlz IG5vdCBlbmFibGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03NjUyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIERpZEZpbmRTdHJpbmcgbWVzc2FnZSBzaG91bGQgYmUgaXNzdWVkIGFsd2F5cyBldmVuIGlm IG5laXRoZXIKKyAgICAgICAgRmluZE9wdGlvbnNTaG93T3ZlcmxheSBvciBGaW5kT3B0aW9uc1No b3dIaWdobGlnaHQgYXJlCisgICAgICAgIHByb3ZpZGVkLiBUaGUgZGlmZmVyZW5jZSBpcyB0aGF0 IGlmIGFueSBvZiB0aG9zZSBmbGFncyBhcmUgcHJlc2VudAorICAgICAgICB0aGUgZmluZCBvcGVy YXRpb24gd2lsbCBsb29rIGZvciBhbGwgdGhlIGFwcGVhcmFuY2VzIG9mIHRoZSB0ZXh0CisgICAg ICAgIGluIHRoZSB3ZWIgdmlldywgb3RoZXJ3aXNlIGl0IHdpbGwganVzdCBsb29rIGFuZCByZXBv cnQgdGhlIG5leHQKKyAgICAgICAgb2NjdXJyZW5jZS4KKworICAgICAgICBObyBuZXcgdGVzdHMg cmVxdWlyZWQsIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LAorICAgICAg ICB3aGljaCBpcyBhbHJlYWR5IGNvdmVyZWQgYnkgZWRpdGluZy90ZXh0LWl0ZXJhdG9yL2ZpbmRT dHJpbmcuaHRtbC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKToKKwog MjAxMi0wMS0zMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBSRUdSRVNTSU9OIChXZWJLaXQyKTogZXZlbnQua2V5Q29kZSBpcyBhbHdheXMgemVybyB3aGVu IHR5cGluZyBpbiBSdXNzaWFuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCAxMGNmZGZjODNiZTcxMjYzMGE4MjU4NmM1 ZTBiMDYyMDg0OGI4Zjk1Li42YjYxNTY5MzRjY2IzZjFiMWNjNjFjYzlkOGNlYzY5NWMwNmQ5MDBl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRy b2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29u dHJvbGxlci5jcHAKQEAgLTEwOSwyNCArMTA5LDI1IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZp bmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmRPcHRpb25zIG9wdGlvbnMsIHVuc2ln CiAgICAgICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRGYWls VG9GaW5kU3RyaW5nKHN0cmluZykpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHNob3VsZFNob3dP dmVybGF5ID0gb3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd092ZXJsYXk7CisgICAgICAgIGJvb2wg c2hvdWxkU2hvd0hpZ2hsaWdodCA9IG9wdGlvbnMgJiBGaW5kT3B0aW9uc1Nob3dIaWdobGlnaHQ7 CisgICAgICAgIHVuc2lnbmVkIG1hdGNoQ291bnQgPSAxOwogCi0gICAgICAgIGlmIChzaG91bGRT aG93T3ZlcmxheSkgewotICAgICAgICAgICAgYm9vbCBzaG91bGRTaG93SGlnaGxpZ2h0ID0gb3B0 aW9ucyAmIEZpbmRPcHRpb25zU2hvd0hpZ2hsaWdodDsKKyAgICAgICAgaWYgKHNob3VsZFNob3dP dmVybGF5IHx8IHNob3VsZFNob3dIaWdobGlnaHQpIHsKIAogICAgICAgICAgICAgaWYgKG1heE1h dGNoQ291bnQgPT0gbnVtZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSkKICAgICAgICAgICAg ICAgICAtLW1heE1hdGNoQ291bnQ7Ci0gICAgICAgICAgICAKLSAgICAgICAgICAgIHVuc2lnbmVk IG1hdGNoQ291bnQgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1hcmtBbGxNYXRjaGVzRm9yVGV4 dChzdHJpbmcsIGNvcmUob3B0aW9ucyksIHNob3VsZFNob3dIaWdobGlnaHQsIG1heE1hdGNoQ291 bnQgKyAxKTsKKworICAgICAgICAgICAgbWF0Y2hDb3VudCA9IG1fd2ViUGFnZS0+Y29yZVBhZ2Uo KS0+bWFya0FsbE1hdGNoZXNGb3JUZXh0KHN0cmluZywgY29yZShvcHRpb25zKSwgc2hvdWxkU2hv d0hpZ2hsaWdodCwgbWF4TWF0Y2hDb3VudCArIDEpOwogCiAgICAgICAgICAgICAvLyBDaGVjayBp ZiB3ZSBoYXZlIG1vcmUgbWF0Y2hlcyB0aGFuIGFsbG93ZWQuCiAgICAgICAgICAgICBpZiAobWF0 Y2hDb3VudCA+IG1heE1hdGNoQ291bnQpIHsKICAgICAgICAgICAgICAgICBzaG91bGRTaG93T3Zl cmxheSA9IGZhbHNlOwogICAgICAgICAgICAgICAgIG1hdGNoQ291bnQgPSBzdGF0aWNfY2FzdDx1 bnNpZ25lZD4oa1dLTW9yZVRoYW5NYXhpbXVtTWF0Y2hDb3VudCk7CiAgICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIG1fd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRG aW5kU3RyaW5nKHN0cmluZywgbWF0Y2hDb3VudCkpOwogICAgICAgICB9CiAKKyAgICAgICAgbV93 ZWJQYWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZEZpbmRTdHJpbmcoc3RyaW5n LCBtYXRjaENvdW50KSk7CisKICAgICAgICAgaWYgKCEob3B0aW9ucyAmIEZpbmRPcHRpb25zU2hv d0ZpbmRJbmRpY2F0b3IpIHx8ICF1cGRhdGVGaW5kSW5kaWNhdG9yKHNlbGVjdGVkRnJhbWUsIHNo b3VsZFNob3dPdmVybGF5KSkgewogICAgICAgICAgICAgLy8gRWl0aGVyIHdlIHNob3VsZG4ndCBz aG93IHRoZSBmaW5kIGluZGljYXRvciwgb3Igd2UgY291bGRuJ3QgdXBkYXRlIGl0LgogICAgICAg ICAgICAgaGlkZUZpbmRJbmRpY2F0b3IoKTsK