89331 2012-06-17 23:53:35 -0700 [chromium] Spellchecker should show suggestions only when right-clicking a misspelled word. 2012-08-15 17:30:40 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89444 1 hbono webkit-unassigned morrita progame+wk webkit.review.bot oldest_to_newest 651203 0 hbono 2012-06-17 23:53:35 -0700 Greetings, Step to reproduce: 1. Type "This is a lasy doga." in a text area. 2. Type ctrl+A to select all text in the text area. 3. Right-click a mouse. Expected Behavior: * Chromium should not show suggestions. Actual Behavior: * Chromium shows two suggestions: "last" and "dog". Unfortunately, my r118740 <http://trac.webkit.org/changeset/118740> has a bug that Chrome may show suggestion for all misspelled words in the selection if it is not collapsed. Also, my r120274 <http://trac.webkit.org/changeset/120274> has a bonehead mistake that used a wrong range to replace text. Regards, Hironori Bono 651211 1 148065 hbono 2012-06-18 00:02:44 -0700 Created attachment 148065 Patch v1 Greetings Morita-san, Would it be possible to review this quick fix? Regards, Hironori Bono 651233 2 148065 morrita 2012-06-18 00:45:17 -0700 Comment on attachment 148065 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=148065&action=review The code looks good. > Source/WebKit/chromium/ChangeLog:4 > + https://bugs.webkit.org/show_bug.cgi?id=89331 Could you give a bit more detailed explanation? Seeing only this change doesn't give any rationale behind the change. 651237 3 148070 hbono 2012-06-18 01:21:27 -0700 Created attachment 148070 Patch v1 (updated ChangeLog) Greetings Morita-san, Many thanks for your quick review. I have updated ChangeLog to describe the background. Regards, Hironori Bono 651260 4 148070 webkit.review.bot 2012-06-18 02:32:31 -0700 Comment on attachment 148070 Patch v1 (updated ChangeLog) Rejecting attachment 148070 from review queue. hbono@chromium.org does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 651304 5 148070 webkit.review.bot 2012-06-18 04:09:51 -0700 Comment on attachment 148070 Patch v1 (updated ChangeLog) Clearing flags on attachment: 148070 Committed r120586: <http://trac.webkit.org/changeset/120586> 651305 6 webkit.review.bot 2012-06-18 04:09:56 -0700 All reviewed patches have been landed. Closing bug. 652044 7 hbono 2012-06-18 22:40:39 -0700 Greetings, Sorry, I noticed this was not a good fix. (It is better for us to emulate Firefox.) Would it be possible to roll out my r120586? Regards, Hironori Bono 652185 8 webkit.review.bot 2012-06-19 01:07:41 -0700 Re-opened since this is blocked by 89444 652300 9 148305 hbono 2012-06-19 03:37:55 -0700 Created attachment 148305 Patch v2 (fixed a regression on Mac) Greetings Morita-san, Thanks for your help and apologies for my previous change. I have re-implemented my change to emulate the behavior of Mac Chrome so we do not need workarounds for Mac. Would it be possible to review this change? Regards, Hironori Bono 653253 10 148305 webkit.review.bot 2012-06-20 00:00:55 -0700 Comment on attachment 148305 Patch v2 (fixed a regression on Mac) Clearing flags on attachment: 148305 Committed r120810: <http://trac.webkit.org/changeset/120810> 653254 11 webkit.review.bot 2012-06-20 00:01:03 -0700 All reviewed patches have been landed. Closing bug. 696536 12 progame+wk 2012-08-15 17:22:03 -0700 This fix is the cause of a very weird regression in Windows (only tested windows): let's say i'm posting a comment IGNORETHISWORD in WebKit Bugzilla, just like i am right now . All my words are spelled correctly except for one, that capital letters gibberish in the second line. Now i would like to copy my comment before submitting, so i: 1. Press Ctrl+A 2. right click the selection (anywhere) The selection will now change: The part of the text before the gibberish word will be deselected and if the last text block is longer than the horizontal position of the gibberish word, then any text in that block after that position will also be deselected. 696538 13 progame+wk 2012-08-15 17:22:30 -0700 screenshot of comment #12 http://i47.tinypic.com/2myrzpf.jpg 696544 14 progame+wk 2012-08-15 17:24:38 -0700 Was this change suppose to actually change the selection? i don't think it should... 696552 15 progame+wk 2012-08-15 17:30:40 -0700 For one lined text field, with one misspelled word, it deselects the whole selection except for the misspelled word, although i didn't right click the misspelled word and all i wanted to do is Copy the text using the context menu option... I hope that's not intentional, the spell checker shouldn't interfere with basic text handling capabilities. 148065 2012-06-18 00:02:44 -0700 2012-06-18 01:21:27 -0700 Patch v1 issue89331-patch0.txt text/plain 3354 hbono SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA1NzMpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTA2LTE3ICBIaXJvbm9yaSBCb25vICA8aGJvbm9AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFtjaHJvbWl1bV0gU3BlbGxjaGVja2VyIHNob3VsZCBzaG93IHN1Z2dlc3Rpb25zIG9u bHkgd2hlbiByaWdodC1jbGlja2luZyBhIG1pc3NwZWxsZWQgd29yZC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MzMxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJ bXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29udGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0 b21NZW51RnJvbURlZmF1bHRJdGVtcyk6IEFkZGVkIGEgY2hlY2sgdGhhdCB0aGUgc2VsZWN0aW9u IGlzIGNvbGxhcHNlZC4KKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViRnJhbWVJbXBsOjpyZXBsYWNlTWlzc3BlbGxlZFJhbmdlKTogQWRkZWQgYSBj aGVjayB0aGF0IHRoZSBzZWxlY3Rpb24gaXMgY29sbGFwc2VkLiBBbHNvLCB1c2UgUmFuZ2U6OnNl dFN0YXJ0KCkgYW5kIFJhbmdlOjpzZXRFbmQoKSB0byBnZXQgdGhlIG1hcmtlciByYW5nZSB0byBl bXVsYXRlIHRoZSBiZWhhdmlvciBvZiBEb2N1bWVudE1hcmtlcjo6bWFya2Vyc0luUmFuZ2UoKS4K KwogMjAxMi0wNi0xNyAgTU9SSVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0NvbnRleHRNZW51Q2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gMTIwNTYx KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjc5LDcgKzI3OSw3IEBAIFBsYXRmb3JtTWVudURlc2NyaXB0 aW9uIENvbnRleHRNZW51Q2xpZW4KICAgICAgICAgLy8gYSBtb3VzZSBvbiBhIHdvcmQsIENocm9t ZSBqdXN0IG5lZWRzIHRvIGZpbmQgYSBzcGVsbGluZyBtYXJrZXIgb24gdGhlIHdvcmQgaW5zdHJl YWQgb2Ygc3BlbGxjaGVja2luZyBpdC4KICAgICAgICAgaWYgKHNlbGVjdGVkRnJhbWUtPnNldHRp bmdzKCkgJiYgc2VsZWN0ZWRGcmFtZS0+c2V0dGluZ3MoKS0+YXN5bmNocm9ub3VzU3BlbGxDaGVj a2luZ0VuYWJsZWQoKSkgewogICAgICAgICAgICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IHNlbGVj dGVkRnJhbWUtPnNlbGVjdGlvbigpLT50b05vcm1hbGl6ZWRSYW5nZSgpOwotICAgICAgICAgICAg aWYgKHJhbmdlLmdldCgpKSB7CisgICAgICAgICAgICBpZiAocmFuZ2UuZ2V0KCkgJiYgcmFuZ2Ut PmNvbGxhcHNlZCgpKSB7CiAgICAgICAgICAgICAgICAgVmVjdG9yPERvY3VtZW50TWFya2VyKj4g bWFya2VycyA9IHNlbGVjdGVkRnJhbWUtPmRvY3VtZW50KCktPm1hcmtlcnMoKS0+bWFya2Vyc0lu UmFuZ2UocmFuZ2UuZ2V0KCksIERvY3VtZW50TWFya2VyOjpTcGVsbGluZyB8IERvY3VtZW50TWFy a2VyOjpHcmFtbWFyKTsKICAgICAgICAgICAgICAgICBpZiAoIW1hcmtlcnMuaXNFbXB0eSgpKSB7 CiAgICAgICAgICAgICAgICAgICAgIFZlY3RvcjxTdHJpbmc+IHN1Z2dlc3Rpb25zOwpJbmRleDog U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCShyZXZpc2lvbiAx MjA1NjEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzU1LDEwICsxMzU1LDExIEBAIHZvaWQgV2ViRnJhbWVJbXBsOjpy ZXBsYWNlTWlzc3BlbGxlZFJhbmcKICAgICBWZWN0b3I8RG9jdW1lbnRNYXJrZXIqPiBtYXJrZXJz ID0gZnJhbWUoKS0+ZG9jdW1lbnQoKS0+bWFya2VycygpLT5tYXJrZXJzSW5SYW5nZShjYXJldFJh bmdlLmdldCgpLCBEb2N1bWVudE1hcmtlcjo6U3BlbGxpbmcgfCBEb2N1bWVudE1hcmtlcjo6R3Jh bW1hcik7CiAgICAgaWYgKG1hcmtlcnMuc2l6ZSgpIDwgMSB8fCBtYXJrZXJzWzBdLT5zdGFydE9m ZnNldCgpID49IG1hcmtlcnNbMF0tPmVuZE9mZnNldCgpKQogICAgICAgICByZXR1cm47Ci0gICAg UmVmUHRyPFJhbmdlPiBtYXJrZXJSYW5nZSA9IFRleHRJdGVyYXRvcjo6cmFuZ2VGcm9tTG9jYXRp b25BbmRMZW5ndGgoZnJhbWUoKS0+c2VsZWN0aW9uKCktPnJvb3RFZGl0YWJsZUVsZW1lbnRPckRv Y3VtZW50RWxlbWVudCgpLCBtYXJrZXJzWzBdLT5zdGFydE9mZnNldCgpLCBtYXJrZXJzWzBdLT5l bmRPZmZzZXQoKSAtIG1hcmtlcnNbMF0tPnN0YXJ0T2Zmc2V0KCkpOwotICAgIGlmICghbWFya2Vy UmFuZ2UuZ2V0KCkgfHwgIWZyYW1lKCktPnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rp b24obWFya2VyUmFuZ2UuZ2V0KCkpKQorICAgIGNhcmV0UmFuZ2UtPnNldFN0YXJ0KGNhcmV0UmFu Z2UtPmZpcnN0Tm9kZSgpLCBtYXJrZXJzWzBdLT5zdGFydE9mZnNldCgpKTsKKyAgICBjYXJldFJh bmdlLT5zZXRFbmQoY2FyZXRSYW5nZS0+Zmlyc3ROb2RlKCksIG1hcmtlcnNbMF0tPmVuZE9mZnNl dCgpKTsKKyAgICBpZiAoIWZyYW1lKCktPnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rp b24oY2FyZXRSYW5nZS5nZXQoKSkpCiAgICAgICAgIHJldHVybjsKLSAgICBmcmFtZSgpLT5zZWxl Y3Rpb24oKS0+c2V0U2VsZWN0aW9uKG1hcmtlclJhbmdlLmdldCgpLCBDaGFyYWN0ZXJHcmFudWxh cml0eSk7CisgICAgZnJhbWUoKS0+c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbihjYXJldFJhbmdl LmdldCgpLCBDaGFyYWN0ZXJHcmFudWxhcml0eSk7CiAgICAgZnJhbWUoKS0+ZWRpdG9yKCktPnJl cGxhY2VTZWxlY3Rpb25XaXRoVGV4dCh0ZXh0LCBmYWxzZSwgdHJ1ZSk7CiB9CiAK 148070 2012-06-18 01:21:27 -0700 2012-06-19 03:37:55 -0700 Patch v1 (updated ChangeLog) issue89331-patch1.txt text/plain 3716 hbono SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA1NzMpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA2LTE3ICBIaXJvbm9yaSBCb25vICA8aGJvbm9AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFtjaHJvbWl1bV0gU3BlbGxjaGVja2VyIHNob3VsZCBzaG93IHN1Z2dlc3Rpb25zIG9u bHkgd2hlbiByaWdodC1jbGlja2luZyBhIG1pc3NwZWxsZWQgd29yZC4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MzMxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgSGFqaW1lIE1vcml0YS4KKworICAgICAgICBXaGVuIGEgc2VsZWN0aW9uIGluY2x1ZGVz IHR3byBvciBtb3JlIG1pc3NwZWxsZWQgd29yZHMsIGl0IGlzIG5vdCBzbyBlYXN5IHRvCisgICAg ICAgIHNlbGVjdCBvbmUgd29yZCBmcm9tIHRoZW0gYW5kIHRvIHNob3cgaXRzIHN1Z2dlc3Rpb25z LiBUbyBhdm9pZCB0aGlzIHByb2JsZW0sCisgICAgICAgIHRoaXMgY2hhbmdlIHNob3dzIHN1Z2dl c3Rpb25zIG9ubHkgd2hlbiB0aGUgc2VsZWN0aW9uIGlzIGNvbGxhcHNlZC4gRm9yIHRoaXMKKyAg ICAgICAgY2FzZSwgd2UgY2FuIHVzZSBSYW5nZTo6c2V0U3RhcnQgYW5kIHNldEVuZCB0byBjb252 ZXJ0IGEgRG9jdW1lbnRNYXJrZXIgdG8gYQorICAgICAgICBSYW5nZS4KKworICAgICAgICAqIHNy Yy9Db250ZXh0TWVudUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpDb250ZXh0TWVu dUNsaWVudEltcGw6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVsdEl0ZW1zKTogQWRkZWQgYSBjaGVj ayB0aGF0IHRoZSBzZWxlY3Rpb24gaXMgY29sbGFwc2VkLgorICAgICAgICAqIHNyYy9XZWJGcmFt ZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OnJlcGxhY2VNaXNzcGVs bGVkUmFuZ2UpOiBBZGRlZCBhIGNoZWNrIHRoYXQgdGhlIHNlbGVjdGlvbiBpcyBjb2xsYXBzZWQu IEFsc28sIHVzZSBSYW5nZTo6c2V0U3RhcnQoKSBhbmQgUmFuZ2U6OnNldEVuZCgpIHRvIGdldCB0 aGUgbWFya2VyIHJhbmdlIHRvIGVtdWxhdGUgdGhlIGJlaGF2aW9yIG9mIERvY3VtZW50TWFya2Vy OjptYXJrZXJzSW5SYW5nZSgpLgorCiAyMDEyLTA2LTE3ICBNT1JJVEEgSGFqaW1lICA8bW9ycml0 YUBnb29nbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpJbmRleDogU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250ZXh0TWVudUNsaWVudEltcGwu Y3BwCShyZXZpc2lvbiAxMjA1NjEpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Db250 ZXh0TWVudUNsaWVudEltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAg UGxhdGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICAvLyBhIG1v dXNlIG9uIGEgd29yZCwgQ2hyb21lIGp1c3QgbmVlZHMgdG8gZmluZCBhIHNwZWxsaW5nIG1hcmtl ciBvbiB0aGUgd29yZCBpbnN0cmVhZCBvZiBzcGVsbGNoZWNraW5nIGl0LgogICAgICAgICBpZiAo c2VsZWN0ZWRGcmFtZS0+c2V0dGluZ3MoKSAmJiBzZWxlY3RlZEZyYW1lLT5zZXR0aW5ncygpLT5h c3luY2hyb25vdXNTcGVsbENoZWNraW5nRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBSZWZQdHI8 UmFuZ2U+IHJhbmdlID0gc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCktPnRvTm9ybWFsaXplZFJh bmdlKCk7Ci0gICAgICAgICAgICBpZiAocmFuZ2UuZ2V0KCkpIHsKKyAgICAgICAgICAgIGlmIChy YW5nZS5nZXQoKSAmJiByYW5nZS0+Y29sbGFwc2VkKCkpIHsKICAgICAgICAgICAgICAgICBWZWN0 b3I8RG9jdW1lbnRNYXJrZXIqPiBtYXJrZXJzID0gc2VsZWN0ZWRGcmFtZS0+ZG9jdW1lbnQoKS0+ bWFya2VycygpLT5tYXJrZXJzSW5SYW5nZShyYW5nZS5nZXQoKSwgRG9jdW1lbnRNYXJrZXI6OlNw ZWxsaW5nIHwgRG9jdW1lbnRNYXJrZXI6OkdyYW1tYXIpOwogICAgICAgICAgICAgICAgIGlmICgh bWFya2Vycy5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgVmVjdG9yPFN0cmluZz4g c3VnZ2VzdGlvbnM7CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1l SW1wbC5jcHAJKHJldmlzaW9uIDEyMDU2MSkKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNTUsMTAgKzEzNTUsMTEgQEAg dm9pZCBXZWJGcmFtZUltcGw6OnJlcGxhY2VNaXNzcGVsbGVkUmFuZwogICAgIFZlY3RvcjxEb2N1 bWVudE1hcmtlcio+IG1hcmtlcnMgPSBmcmFtZSgpLT5kb2N1bWVudCgpLT5tYXJrZXJzKCktPm1h cmtlcnNJblJhbmdlKGNhcmV0UmFuZ2UuZ2V0KCksIERvY3VtZW50TWFya2VyOjpTcGVsbGluZyB8 IERvY3VtZW50TWFya2VyOjpHcmFtbWFyKTsKICAgICBpZiAobWFya2Vycy5zaXplKCkgPCAxIHx8 IG1hcmtlcnNbMF0tPnN0YXJ0T2Zmc2V0KCkgPj0gbWFya2Vyc1swXS0+ZW5kT2Zmc2V0KCkpCiAg ICAgICAgIHJldHVybjsKLSAgICBSZWZQdHI8UmFuZ2U+IG1hcmtlclJhbmdlID0gVGV4dEl0ZXJh dG9yOjpyYW5nZUZyb21Mb2NhdGlvbkFuZExlbmd0aChmcmFtZSgpLT5zZWxlY3Rpb24oKS0+cm9v dEVkaXRhYmxlRWxlbWVudE9yRG9jdW1lbnRFbGVtZW50KCksIG1hcmtlcnNbMF0tPnN0YXJ0T2Zm c2V0KCksIG1hcmtlcnNbMF0tPmVuZE9mZnNldCgpIC0gbWFya2Vyc1swXS0+c3RhcnRPZmZzZXQo KSk7Ci0gICAgaWYgKCFtYXJrZXJSYW5nZS5nZXQoKSB8fCAhZnJhbWUoKS0+c2VsZWN0aW9uKCkt PnNob3VsZENoYW5nZVNlbGVjdGlvbihtYXJrZXJSYW5nZS5nZXQoKSkpCisgICAgY2FyZXRSYW5n ZS0+c2V0U3RhcnQoY2FyZXRSYW5nZS0+Zmlyc3ROb2RlKCksIG1hcmtlcnNbMF0tPnN0YXJ0T2Zm c2V0KCkpOworICAgIGNhcmV0UmFuZ2UtPnNldEVuZChjYXJldFJhbmdlLT5maXJzdE5vZGUoKSwg bWFya2Vyc1swXS0+ZW5kT2Zmc2V0KCkpOworICAgIGlmICghZnJhbWUoKS0+c2VsZWN0aW9uKCkt PnNob3VsZENoYW5nZVNlbGVjdGlvbihjYXJldFJhbmdlLmdldCgpKSkKICAgICAgICAgcmV0dXJu OwotICAgIGZyYW1lKCktPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24obWFya2VyUmFuZ2UuZ2V0 KCksIENoYXJhY3RlckdyYW51bGFyaXR5KTsKKyAgICBmcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0 U2VsZWN0aW9uKGNhcmV0UmFuZ2UuZ2V0KCksIENoYXJhY3RlckdyYW51bGFyaXR5KTsKICAgICBm cmFtZSgpLT5lZGl0b3IoKS0+cmVwbGFjZVNlbGVjdGlvbldpdGhUZXh0KHRleHQsIGZhbHNlLCB0 cnVlKTsKIH0KIAo= 148305 2012-06-19 03:37:55 -0700 2012-06-20 00:00:54 -0700 Patch v2 (fixed a regression on Mac) issue89331-patch2.txt text/plain 4256 hbono SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMjA2OTkpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA2LTE5ICBIaXJvbm9yaSBCb25vICA8aGJvbm9AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFtjaHJvbWl1bV0gU2VsZWN0IHRoZSBtYXJrZXIgcmFuZ2Ugd2hlbiByaWdodC1jbGlj a2luZyBvbiBhIG1hcmtlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg5MzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ2hyb21pdW0gYWx3YXlzIHNlbGVjdHMgb25seSBvbmUgd29yZCB3aGVuIHJpZ2h0 LWNsaWNraW5nIG9uIGEgc3BlbGxpbmcgbWFya2VyLgorICAgICAgICBUaGlzIHByZXZlbnRzIHNl bGVjdGluZyB3aG9sZSByZWdpb24gc3BlY2lmaWVkIGJ5IGEgbWFya2VyIGlmIHRoZSBtYXJrZXIK KyAgICAgICAgY29uc2lzdHMgb2YgdHdvIG9yIG1vcmUgd29yZHMuIFRoaXMgY2hhbmdlIHJldHJp ZXZlcyBhIHJhbmdlIGNvdmVydGVkIGJ5IGEKKyAgICAgICAgbWFya2VyIGFuZCBzZWxlY3QgdGhl IHJhbmdlLiBUaGlzIGVtdWxhdGVzIHRoZSBiZWhhdmlvciBvZiBNYWMgQ2hyb21pdW0gYW5kIGl0 CisgICAgICAgIGRvZXMgbm90IG5lZWQgYW55IHdvcmthcm91bmRzIGZvciBNYWMuCisKKyAgICAg ICAgKiBzcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29u dGV4dE1lbnVDbGllbnRJbXBsOjpnZXRDdXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyk6CisKIDIw MTItMDYtMTkgIE1pa2UgV2VzdCAgPG1rd3N0QGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbnRy b2R1Y2UgRU5BQkxFX0NTUF9ORVhUIGNvbmZpZ3VyYXRpb24gZmxhZy4KSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL0NvbnRleHRNZW51Q2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ29udGV4dE1lbnVDbGllbnRJbXBsLmNwcAko cmV2aXNpb24gMTIwNjkwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQ29udGV4dE1l bnVDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc4LDI1ICsyNzgsMjcgQEAgUGxh dGZvcm1NZW51RGVzY3JpcHRpb24gQ29udGV4dE1lbnVDbGllbgogICAgICAgICAvLyB3b3JkcyBh bmQgYXR0YWNoZXMgc3VnZ2VzdGlvbnMgdG8gdGhlc2UgbWFya2VycyBpbiB0aGUgYmFja2dyb3Vu ZC4gVGhlcmVmb3JlLCB3aGVuIGEgdXNlciByaWdodC1jbGlja3MKICAgICAgICAgLy8gYSBtb3Vz ZSBvbiBhIHdvcmQsIENocm9tZSBqdXN0IG5lZWRzIHRvIGZpbmQgYSBzcGVsbGluZyBtYXJrZXIg b24gdGhlIHdvcmQgaW5zdHJlYWQgb2Ygc3BlbGxjaGVja2luZyBpdC4KICAgICAgICAgaWYgKHNl bGVjdGVkRnJhbWUtPnNldHRpbmdzKCkgJiYgc2VsZWN0ZWRGcmFtZS0+c2V0dGluZ3MoKS0+YXN5 bmNocm9ub3VzU3BlbGxDaGVja2luZ0VuYWJsZWQoKSkgewotICAgICAgICAgICAgUmVmUHRyPFJh bmdlPiByYW5nZSA9IHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT50b05vcm1hbGl6ZWRSYW5n ZSgpOwotICAgICAgICAgICAgaWYgKHJhbmdlLmdldCgpKSB7CisgICAgICAgICAgICBWaXNpYmxl U2VsZWN0aW9uIHNlbGVjdGlvbiA9IHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5zZWxlY3Rp b24oKTsKKyAgICAgICAgICAgIGlmIChzZWxlY3Rpb24uaXNDYXJldE9yUmFuZ2UoKSkgeworICAg ICAgICAgICAgICAgIGlmIChzZWxlY3Rpb24uaXNDYXJldCgpKQorICAgICAgICAgICAgICAgICAg ICBzZWxlY3Rpb24uZXhwYW5kVXNpbmdHcmFudWxhcml0eShXb3JkR3JhbnVsYXJpdHkpOworICAg ICAgICAgICAgICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2UgPSBzZWxlY3Rpb24udG9Ob3JtYWxpemVk UmFuZ2UoKTsKICAgICAgICAgICAgICAgICBWZWN0b3I8RG9jdW1lbnRNYXJrZXIqPiBtYXJrZXJz ID0gc2VsZWN0ZWRGcmFtZS0+ZG9jdW1lbnQoKS0+bWFya2VycygpLT5tYXJrZXJzSW5SYW5nZShy YW5nZS5nZXQoKSwgRG9jdW1lbnRNYXJrZXI6OlNwZWxsaW5nIHwgRG9jdW1lbnRNYXJrZXI6Okdy YW1tYXIpOwotICAgICAgICAgICAgICAgIGlmICghbWFya2Vycy5pc0VtcHR5KCkpIHsKLSAgICAg ICAgICAgICAgICAgICAgVmVjdG9yPFN0cmluZz4gc3VnZ2VzdGlvbnM7Ci0gICAgICAgICAgICAg ICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbWFya2Vycy5zaXplKCk7ICsraSkgewotICAg ICAgICAgICAgICAgICAgICAgICAgaWYgKCFtYXJrZXJzW2ldLT5kZXNjcmlwdGlvbigpLmlzRW1w dHkoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZlY3RvcjxTdHJpbmc+IGRlc2Ny aXB0aW9uczsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJrZXJzW2ldLT5kZXNjcmlw dGlvbigpLnNwbGl0KCdcbicsIGRlc2NyaXB0aW9ucyk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3VnZ2VzdGlvbnMuYXBwZW5kKGRlc2NyaXB0aW9ucyk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAgZGF0 YS5taXNzcGVsbGVkV29yZCA9IHNlbGVjdE1pc3NwZWxsZWRXb3JkKGRlZmF1bHRNZW51LCBzZWxl Y3RlZEZyYW1lKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKCFzdWdnZXN0aW9ucy5pc0VtcHR5 KCkpCisgICAgICAgICAgICAgICAgaWYgKG1hcmtlcnMuc2l6ZSgpID09IDEpIHsKKyAgICAgICAg ICAgICAgICAgICAgcmFuZ2UtPnNldFN0YXJ0KHJhbmdlLT5zdGFydENvbnRhaW5lcigpLCBtYXJr ZXJzWzBdLT5zdGFydE9mZnNldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgcmFuZ2UtPnNldEVu ZChyYW5nZS0+ZW5kQ29udGFpbmVyKCksIG1hcmtlcnNbMF0tPmVuZE9mZnNldCgpKTsKKyAgICAg ICAgICAgICAgICAgICAgZGF0YS5taXNzcGVsbGVkV29yZCA9IHJhbmdlLT50ZXh0KCk7CisgICAg ICAgICAgICAgICAgICAgIGlmIChtYXJrZXJzWzBdLT5kZXNjcmlwdGlvbigpLmxlbmd0aCgpKSB7 CisgICAgICAgICAgICAgICAgICAgICAgICBWZWN0b3I8U3RyaW5nPiBzdWdnZXN0aW9uczsKKyAg ICAgICAgICAgICAgICAgICAgICAgIG1hcmtlcnNbMF0tPmRlc2NyaXB0aW9uKCkuc3BsaXQoJ1xu Jywgc3VnZ2VzdGlvbnMpOwogICAgICAgICAgICAgICAgICAgICAgICAgZGF0YS5kaWN0aW9uYXJ5 U3VnZ2VzdGlvbnMgPSBzdWdnZXN0aW9uczsKLSAgICAgICAgICAgICAgICAgICAgZWxzZSBpZiAo bV93ZWJWaWV3LT5zcGVsbENoZWNrQ2xpZW50KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgfSBl bHNlIGlmIChtX3dlYlZpZXctPnNwZWxsQ2hlY2tDbGllbnQoKSkgewogICAgICAgICAgICAgICAg ICAgICAgICAgaW50IG1pc3NwZWxsZWRPZmZzZXQsIG1pc3NwZWxsZWRMZW5ndGg7CiAgICAgICAg ICAgICAgICAgICAgICAgICBtX3dlYlZpZXctPnNwZWxsQ2hlY2tDbGllbnQoKS0+c3BlbGxDaGVj ayhkYXRhLm1pc3NwZWxsZWRXb3JkLCBtaXNzcGVsbGVkT2Zmc2V0LCBtaXNzcGVsbGVkTGVuZ3Ro LCAmZGF0YS5kaWN0aW9uYXJ5U3VnZ2VzdGlvbnMpOwogICAgICAgICAgICAgICAgICAgICB9Cisg ICAgICAgICAgICAgICAgICAgIHNlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24ocmFuZ2UuZ2V0 KCkpOworICAgICAgICAgICAgICAgICAgICBpZiAoc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCkt PnNob3VsZENoYW5nZVNlbGVjdGlvbihzZWxlY3Rpb24pKQorICAgICAgICAgICAgICAgICAgICAg ICAgc2VsZWN0ZWRGcmFtZS0+c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbihzZWxlY3Rpb24sIFdv cmRHcmFudWxhcml0eSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAg ICB9IGVsc2UgaWYgKG1fd2ViVmlldy0+Zm9jdXNlZFdlYkNvcmVGcmFtZSgpLT5lZGl0b3IoKS0+ aXNDb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQoKSkgewo=