50116 2010-11-26 10:03:01 -0800 On platforms other than Mac, right clicking anywhere discards the selection 2014-02-03 03:50:50 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) PC Linux RESOLVED INVALID Qt, QtTriaged P2 Normal --- 23351 1 pierre.rossi pierre.rossi ap avi benjamin dglazkov kalman rniwa tonikitoo victor.fernandez oldest_to_newest 314056 0 pierre.rossi 2010-11-26 10:03:01 -0800 This doesn't really make sense for right click for instance since one can't really select anything before a context menu pops up, and the editing behavior was fixed so that it doesn't even select the text underneath the cursor on right click now. 314057 1 74945 pierre.rossi 2010-11-26 10:07:37 -0800 Created attachment 74945 change proposal 314106 2 ap 2010-11-26 17:55:20 -0800 I'm primarily a Mac user, but I think that having a selection that's far away from the click point (and perhaps even invisible due to scrolling) would be super confusing. You won't know what will be copied when selecting Copy from the context menu. + const bool shouldReplaceSelection = (m_frame->editor()->behavior().shouldSelectOnContextualMenuClick() + || event.event().button() == LeftButton); This should be on one line. 315612 3 74945 tonikitoo 2010-12-01 06:03:54 -0800 Comment on attachment 74945 change proposal I looks reasonable, but it needs a layout test. NOTE: It has to be tested through all editing behaviors code paths: mac, win and unix. Please also fix what ap commented. r- due to the lack of tests. 315655 4 ap 2010-12-01 08:16:54 -0800 My comment amounted to resolving the bug as INVALID, in fact. Am I missing something that makes the proposed behavior good for users? 315656 5 pierre.rossi 2010-12-01 08:22:11 -0800 @Alexey: At the moment, the selection is discarded on right click, it doesn't select anything new. I can't think of any case where that would be much better than leaving it untouched. Besides, this doesn't feel very consistent with other applications' behavior on Linux, where neither gtk nor Qt does this. 315659 6 ap 2010-12-01 08:29:43 -0800 Right. My concern is about operating on a selection that may be invisible to the user, or otherwise outside of their mental context. 315661 7 tonikitoo 2010-12-01 08:30:10 -0800 (In reply to comment #5) > @Alexey: At the moment, the selection is discarded on right click, it doesn't select anything new. I can't think of any case where that would be much better than leaving it untouched. Besides, this doesn't feel very consistent with other applications' behavior on Linux, where neither gtk nor Qt does this. @ap, pierri: I also agree that this is something we should fix. For example, in firefox, selection some text with the mouse and right click somewhere else in the page (outside the selection bounds). Firefox shows the context menu, but keeps the previously selected text selected. We should behavior this way in my opinion on non-Mac editing-behaviors too. 315664 8 ap 2010-12-01 08:41:08 -0800 Is this the Firefox behavior on all platforms, or only on Linux? Are there other Windows applications that behave this way? 315667 9 tonikitoo 2010-12-01 08:48:35 -0800 (In reply to comment #8) > Is this the Firefox behavior on all platforms, or only on Linux? Are there other Windows applications that behave this way? Hum, good point. Firefox on linux, scenario 1: 1) select some text in the page. 2) right click somewhere else [the original selection if kept] 3) dismiss the context menu by left clicking the elsewhere in the page, outside the selection boundary [the original selection is kept] Firefox on linux, scenario 2: 1) select some text in the page. 2) right click somewhere else [the original selection if kept] 3) dismiss the context menu by pressing ESC [the original selection is kept] Firefox on linux, scenario 1: 1) select some text in the page. 2) right click somewhere else [the original selection if kept] 3) dismiss the context menu by left clicking the elsewhere in the page, outside the selection boundary [the original selection is gone] Firefox on Windows, scenario 2: 1) select some text in the page. 2) right click somewhere else [the original selection if kept] 3) dismiss the context menu by pressing ESC [the original selection is kept] I do not have a Mac handy to test though. 315668 10 tonikitoo 2010-12-01 08:50:10 -0800 Also in both cases above when there is a text selected, and user right clicks within or beyond the selection boundary, the context menu options that are shown are the same, as if the user had right clicked on the selected text. It is not what happens in webkit non-mac platform I suppose. 316092 11 benjamin 2010-12-02 05:34:02 -0800 (In reply to comment #9) > I do not have a Mac handy to test though. I just tested that. Firefox on Mac follows the Linux behavior, the selection is kept when right-clicking outside of the rect. 316097 12 benjamin 2010-12-02 05:46:30 -0800 I also tested Windows and the result is curious :) All the applications I have tried have the same behavior as what Antonio described. Except ... Internet Explorer 9 which as the same behavior as Mac OS. 316100 13 75369 pierre.rossi 2010-12-02 05:51:43 -0800 Created attachment 75369 Take 2 (updated for style and added a test) 316121 14 75369 tonikitoo 2010-12-02 07:02:26 -0800 Comment on attachment 75369 Take 2 (updated for style and added a test) Pierre, thanks for the test case. We would be now covering the ESC case, but I would also like to cover the 'click outside the selection bounds' case. Could you add this other test too, please? 316164 15 pierre.rossi 2010-12-02 08:26:32 -0800 (In reply to comment #14) > (From update of attachment 75369 [details]) > Pierre, thanks for the test case. We would be now covering the ESC case, but I would also like to cover the 'click outside the selection bounds' case. Could you add this other test too, please? Mhh, but I might need a little hint then: how would I take into account the actual platform that the test runs on ? (i.e it has to be ran on windows for the mouse click to actually discard the selection at the same time it discards the menu). 316189 16 ap 2010-12-02 09:14:06 -0800 > I also tested Windows and the result is curious :) > > All the applications I have tried have the same behavior as what Antonio described. Except ... Internet Explorer 9 which as the same behavior as Mac OS. Could you please list the ones you tried? I'm mostly interested if that included MS Word, Outlook and other major apps known to end users. 317639 17 benjamin 2010-12-06 08:30:18 -0800 (In reply to comment #16) > > I also tested Windows and the result is curious :) > > > > All the applications I have tried have the same behavior as what Antonio described. Except ... Internet Explorer 9 which as the same behavior as Mac OS. > > Could you please list the ones you tried? I'm mostly interested if that included MS Word, Outlook and other major apps known to end users. I tried with Notepad, wordpad, and all the default utilities I could find on Win7. On MS word 2007 and Outlook 2007, I get the same behavior as Mac, right click outside the selection discard the selection. 317644 18 tonikitoo 2010-12-06 08:43:00 -0800 (In reply to comment #17) > (In reply to comment #16) > > > I also tested Windows and the result is curious :) > > > > > > All the applications I have tried have the same behavior as what Antonio described. Except ... Internet Explorer 9 which as the same behavior as Mac OS. > > > > Could you please list the ones you tried? I'm mostly interested if that included MS Word, Outlook and other major apps known to end users. > > I tried with Notepad, wordpad, and all the default utilities I could find on Win7. > > On MS word 2007 and Outlook 2007, I get the same behavior as Mac, right click outside the selection discard the selection. I think is might make sense here to make not discarding the selection be UNIX specific then, once windows has mixed behavior, and Mac does discards on purpose. 317651 19 75369 ap 2010-12-06 09:01:01 -0800 Comment on attachment 75369 Take 2 (updated for style and added a test) r-, because we almost certainly don't want to be different from IE, Outlook and Word on Windows here. > On MS word 2007 and Outlook 2007, I get the same behavior as Mac, right click > outside the selection discard the selection. Do they also select the word under right click, like Mac? > Mhh, but I might need a little hint then: how would I take into account the actual > platform that the test runs on ? The correct way is to test all editing behaviors on all platforms - you can set the behavior with a layoutTestController method. 317655 20 tonikitoo 2010-12-06 09:07:13 -0800 > > On MS word 2007 and Outlook 2007, I get the same behavior as Mac, right click > > outside the selection discard the selection. > > Do they also select the word under right click, like Mac? no, ap. 320206 21 76212 pierre.rossi 2010-12-10 09:33:31 -0800 Created attachment 76212 Take 3 (Change windows behavior.) @Tonikitoo: well, after a lot of headaches I think I'm going to give up on discarding the menu with the mouse from javascript, since eventSender will pass the event to the page directly and not to X or whatever need to receive it to discard the menu on a given platform. Sure I could do with a middle click or something but that will only do for unstable tests in my opinion, since this seems border-line undefined behavior. Or should I do a Qt/C++ autotest then? What do you think ? 320210 22 pierre.rossi 2010-12-10 09:41:13 -0800 (In reply to comment #19) > > The correct way is to test all editing behaviors on all platforms - you can set the behavior with a layoutTestController method. What I meant was that the test would return different results for the windows behavior depending on whether it actually ran on windows or not. Due to what I mentioned in my previous comment to Antonio, and the change for the Windows behavior, it probably won't be necessary anymore but what I was looking for was probably something in that fashion: var onWinPlatform = navigator.userAgent.search("Windows") != -1 320216 23 ap 2010-12-10 10:10:10 -0800 > What I meant was that the test would return different results for the windows behavior depending on whether it actually ran on windows or not. Why? Actual behavior should respect editing behavior preference. 323370 24 pierre.rossi 2010-12-16 13:03:39 -0800 (In reply to comment #23) > > What I meant was that the test would return different results for the windows behavior depending on whether it actually ran on windows or not. > > Why? Actual behavior should respect editing behavior preference. The fact that the selection was discarded when clicking outside of the context menu was not caused by anything else than the fact that while this click discards the menu, it's *also* passed to the webpage, and this is because of the way events work on windows. Now the selection is discarded with the right click, to follow IE9 behavior, so it's not a problem anymore. 323377 25 ap 2010-12-16 13:23:10 -0800 Sorry, I'm afraid that I'm not following your reasoning. 323899 26 76212 rniwa 2010-12-17 11:34:51 -0800 Comment on attachment 76212 Take 3 (Change windows behavior.) View in context: https://bugs.webkit.org/attachment.cgi?id=76212&action=review > WebCore/editing/EditingBehavior.h:64 > + // On Linux, right clicking outside of the current selection shouldn't discard the existing selection > + bool shouldDiscardCurrentSelectionOnRightClick() const { return m_type != EditingUnixBehavior; } Nit: since editing behavior is "unix", we should probably say "On UNIX, right clicking..." > WebCore/page/EventHandler.cpp:403 > + // Don't alter the selection for buttons other than the left button unless it's desired behavior Nit: I don't think this comment is necessary. It repeats what code says. > WebCore/page/EventHandler.cpp:405 > + if (m_frame->selection()->shouldChangeSelection(newSelection) && shouldReplaceSelection) I'm not sure if we want to call editing delegates if we're not changing the selection. It's odd to call editing delegates to ask if the selection should change and then not changing regardless of what the delegates returns. We should probably swap the order and do: shouldReplaceSelection && m_frame->selection()->shouldChangeSelection(newSelection). 335776 27 79267 pierre.rossi 2011-01-18 05:30:03 -0800 Created attachment 79267 Modified as per Ryosuke's comments 338496 28 79267 tonikitoo 2011-01-21 21:07:26 -0800 Comment on attachment 79267 Modified as per Ryosuke's comments View in context: https://bugs.webkit.org/attachment.cgi?id=79267&action=review I have a question: with the patch applied, context menu does not deselect the text on UNIX editing behavior, but what options does the context menu show? Are they relative to selected content (i.e. copy, cut, etc) or relative to the page (reload, back, forward, etc). Firefox on linux does the former to me... > LayoutTests/editing/selection/selection-modified-on-right-click.html:21 > + Unneeded extra line 352637 29 rniwa 2011-02-17 00:11:55 -0800 Pierre, can you answer Antonio's question so that I can proceed with my review? Also, hit testing belongs HTML Editing component, not Text component. 353164 30 pierre.rossi 2011-02-17 14:12:47 -0800 (In reply to comment #28) > (From update of attachment 79267 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79267&action=review > > I have a question: with the patch applied, context menu does not deselect the text on UNIX editing behavior, but what options does the context menu show? Are they relative to selected content (i.e. copy, cut, etc) or relative to the page (reload, back, forward, etc). Firefox on linux does the former to me... > > > LayoutTests/editing/selection/selection-modified-on-right-click.html:21 > > + > > Unneeded extra line With the patch applied, the contents of the context menu depends on whether the click happened within the selected range or not (so the behavior is pretty much untouched in that respect I would say). So by default (in QtTestBrowser) if I click within the selection it offers "Copy", else only "Reload" Actually now that you point it out, firefox always offer a Copy action as long as there's a selection for me on Linux. 353169 31 pierre.rossi 2011-02-17 14:15:11 -0800 (In reply to comment #29) > Pierre, can you answer Antonio's question so that I can proceed with my review? > Thanks for the reminder, I had completely forgotten to answer this comment. > Also, hit testing belongs HTML Editing component, not Text component. I'm afraid I don't follow ? Could you clarify what this means practically (I suspect I have to move the layout test somewhere else but I have no clue where) ? 353244 32 rniwa 2011-02-17 16:49:32 -0800 (In reply to comment #31) > > Also, hit testing belongs HTML Editing component, not Text component. > > I'm afraid I don't follow ? Could you clarify what this means practically (I suspect I have to move the layout test somewhere else but I have no clue where) ? Oh, I just changed the component of this bug from Text to HTML Editing. That's all. Your test is already in LayoutTests/editing so it's fine. 353260 33 79267 rniwa 2011-02-17 17:26:40 -0800 Comment on attachment 79267 Modified as per Ryosuke's comments View in context: https://bugs.webkit.org/attachment.cgi?id=79267&action=review > LayoutTests/editing/selection/selection-modified-on-right-click.html:1 > +<body onload="load()"> Missing <!DOCTYPE html>. Do you really need to wait until page load? I feel like you can just run the test in the script element? > WebCore/ChangeLog:5 > + https://bugs.webkit.org/show_bug.cgi?id=50116 Missing bug title. > WebCore/page/EventHandler.cpp:404 > } else > newSelection = VisibleSelection(visiblePos); > - > - if (m_frame->selection()->shouldChangeSelection(newSelection)) > + > + const bool shouldReplaceSelection = (m_frame->editor()->behavior().shouldDiscardCurrentSelectionOnRightClick() || event.event().button() == LeftButton); > + if (shouldReplaceSelection && m_frame->selection()->shouldChangeSelection(newSelection)) It seems like we should avoid setting selection only if the above else statement was executed. i.e. we should set selection when selection is extended even if the editing behavior was Linux, and the right button is pressed. 354208 34 pierre.rossi 2011-02-19 12:09:43 -0800 (In reply to comment #33) > > WebCore/page/EventHandler.cpp:404 > > } else > > newSelection = VisibleSelection(visiblePos); > > - > > - if (m_frame->selection()->shouldChangeSelection(newSelection)) > > + > > + const bool shouldReplaceSelection = (m_frame->editor()->behavior().shouldDiscardCurrentSelectionOnRightClick() || event.event().button() == LeftButton); > > + if (shouldReplaceSelection && m_frame->selection()->shouldChangeSelection(newSelection)) > > It seems like we should avoid setting selection only if the above else statement was executed. i.e. we should set selection when selection is extended even if the editing behavior was Linux, and the right button is pressed. I don't like this idea that much, as it would mean the context menu pops out as the selection gets modified, this feels confusing to me (yes, apparently that's the way it works on Mac...) 354457 35 rniwa 2011-02-21 01:31:52 -0800 (In reply to comment #34) > (In reply to comment #33) > > It seems like we should avoid setting selection only if the above else statement was executed. i.e. we should set selection when selection is extended even if the editing behavior was Linux, and the right button is pressed. > > I don't like this idea that much, as it would mean the context menu pops out as the selection gets modified, this feels confusing to me (yes, apparently that's the way it works on Mac...) Is this what users expect on all Unix platforms? 355165 36 pierre.rossi 2011-02-22 03:43:11 -0800 (In reply to comment #35) > (In reply to comment #34) > > (In reply to comment #33) > > > It seems like we should avoid setting selection only if the above else statement was executed. i.e. we should set selection when selection is extended even if the editing behavior was Linux, and the right button is pressed. > > > > I don't like this idea that much, as it would mean the context menu pops out as the selection gets modified, this feels confusing to me (yes, apparently that's the way it works on Mac...) > > Is this what users expect on all Unix platforms? I don't know really, it's just the behavior I get in Firefox, and I feel it makes sense, or at least it's something I can live with. If you have any usability gurus at hand to discuss this, that'd be nice. ;) 386499 37 benjamin 2011-04-15 03:54:17 -0700 *** Bug 58647 has been marked as a duplicate of this bug. *** 975823 38 jturcotte 2014-02-03 03:50:50 -0800 === Bulk closing of Qt bugs === If you believe that this bug report is still relevant for a non-Qt port of webkit.org, please re-open it. If you believe that this is still an important QtWebKit bug, please fill a new report at https://bugreports.qt-project.org and add a link to this issue. See http://qt-project.org/wiki/ReportingBugsInQt for additional guidelines. 74945 2010-11-26 10:07:37 -0800 2010-12-02 05:51:43 -0800 change proposal webkit-keep-selection.patch text/plain 1595 pierre.rossi ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2JjN2MwYS4uMzU5MjBjZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMS0yNiAgUGllcnJlIFJvc3Np ICA8cGllcnJlLnJvc3NpQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTAxMTYKKworICAgICAgICBEb24ndCBkaXNjYXJkIHRoZSBleGlzdGluZyBzZWxlY2l0b24g b24gcmlnaHQgY2xpY2sKKyAgICAgICAgaWYgd2UncmUgbm90IGdvaW5nIHRvIHNlbGVjdCB0aGUg dGV4dCB1bmRlciB0aGUgY3Vyc29yLgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnRT aW5nbGVDbGljayk6CisKIDIwMTAtMTEtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5i b3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MjczMi4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKaW5kZXggZTA5NTEzNi4uODUyYjFlMCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxl ci5jcHAKQEAgLTM5OSw4ICszOTksMTEgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNl UHJlc3NFdmVudFNpbmdsZUNsaWNrKGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFIKICAgICAg ICAgbV9iZWdhblNlbGVjdGluZ1RleHQgPSB0cnVlOwogICAgIH0gZWxzZQogICAgICAgICBuZXdT ZWxlY3Rpb24gPSBWaXNpYmxlU2VsZWN0aW9uKHZpc2libGVQb3MpOwotICAgIAotICAgIGlmICht X2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2hvdWxkQ2hhbmdlU2VsZWN0aW9uKG5ld1NlbGVjdGlvbikp CisKKyAgICAvLyBEb24ndCBhbHRlciB0aGUgc2VsZWN0aW9uIGZvciBidXR0b25zIG90aGVyIHRo YW4gdGhlIGxlZnQgYnV0dG9uIHVubGVzcyBpdCdzIGRlc2lyZWQgYmVoYXZpb3IKKyAgICBjb25z dCBib29sIHNob3VsZFJlcGxhY2VTZWxlY3Rpb24gPSAobV9mcmFtZS0+ZWRpdG9yKCktPmJlaGF2 aW9yKCkuc2hvdWxkU2VsZWN0T25Db250ZXh0dWFsTWVudUNsaWNrKCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgZXZlbnQuZXZlbnQoKS5idXR0b24oKSA9PSBM ZWZ0QnV0dG9uKTsKKyAgICBpZiAobV9mcmFtZS0+c2VsZWN0aW9uKCktPnNob3VsZENoYW5nZVNl bGVjdGlvbihuZXdTZWxlY3Rpb24pICYmIHNob3VsZFJlcGxhY2VTZWxlY3Rpb24pCiAgICAgICAg IG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24obmV3U2VsZWN0aW9uLCBncmFudWxh cml0eSwgTWFrZU5vbkRpcmVjdGlvbmFsU2VsZWN0aW9uKTsKIAogICAgIHJldHVybiB0cnVlOwo= 75369 2010-12-02 05:51:43 -0800 2010-12-10 09:33:31 -0800 Take 2 (updated for style and added a test) webkit-keep-selection.patch text/plain 4269 pierre.rossi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1tb2Rp ZmllZC1vbi1yaWdodC1jbGljay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Nl bGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmZTk2MTgKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24t cmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGhpcyB0ZXN0IGNoZWNr cyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVudSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0 IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLgorCitMb3JlbSBpcHN1bQorRm9vIGJhcgorU1VDQ0VT UworU1VDQ0VTUworU1VDQ0VTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxl Y3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVkLW9uLXJpZ2h0LWNsaWNrLmh0bWwgYi9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2suaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNDRiNWYyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVk LW9uLXJpZ2h0LWNsaWNrLmh0bWwKQEAgLTAsMCArMSw2NSBAQAorPGJvZHkgb25sb2FkPSJsb2Fk KCkiPgorPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVu dSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLjwvcD4KKzxk aXYgaWQ9InRleHQiPkxvcmVtIGlwc3VtPC9kaXY+Cis8ZGl2IGlkPSJmb29iYXIiPkZvbyBiYXI8 L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdG1hYyI+UlVOTklORzwvZGl2PgorPGRpdiBpZD0icmVzdWx0 d2luIj5SVU5OSU5HPC9kaXY+Cis8ZGl2IGlkPSJyZXN1bHR1bml4Ij5SVU5OSU5HPC9kaXY+Cis8 L2JvZHk+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdChwbGF0Zm9ybSwgbmV3U2VsZWN0aW9uRXhw ZWN0ZWQsIHJlc3VsdCkKK3sKKyAgICB2YXIgc2VsID0gd2luZG93LmdldFNlbGVjdGlvbigpOwor CisgICAgLy8gY2xlYXIgc2VsZWN0aW9uCisgICAgc2VsLnJlbW92ZUFsbFJhbmdlcygpOworCisg ICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKworICAgIHZhciB0ZXh0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHQiKTsKKyAgICB2YXIgZm9vYmFyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImZvb2JhciIpOworCisKKyAgICByYW5nZS5zZWxlY3ROb2RlQ29u dGVudHMoZm9vYmFyKTsKKyAgICBzZWwuYWRkUmFuZ2UocmFuZ2UpOworCisgICAgdmFyIG9sZFNl bGVjdGVkVGV4dCA9IHNlbC50b1N0cmluZygpOworCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0RWRpdGluZ0JlaGF2aW9yKHBsYXRmb3JtKTsKKworICAgIHZhciB4ID0gdGV4dC5vZmZzZXRQ YXJlbnQub2Zmc2V0TGVmdCArIHRleHQub2Zmc2V0TGVmdCArIDQ7CisgICAgdmFyIHkgPSB0ZXh0 Lm9mZnNldFBhcmVudC5vZmZzZXRUb3AgKyB0ZXh0Lm9mZnNldFRvcCArIHRleHQub2Zmc2V0SGVp Z2h0IC8gMjsKKworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50 U2VuZGVyLmNvbnRleHRDbGljaygpOworICAgIC8vIGVzYyBrZXkgdG8ga2lsbCB0aGUgY29udGV4 dCBtZW51CisgICAgZXZlbnRTZW5kZXIua2V5RG93bihTdHJpbmcuZnJvbUNoYXJDb2RlKDB4MDAx QiksIG51bGwpOworCisgICAgdmFyIHJlc3VsdEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZChyZXN1bHQpOworICAgIHZhciBzZWxlY3RlZFRleHQgPSBzZWwudG9TdHJpbmcoKTsKKwor ICAgIGlmIChuZXdTZWxlY3Rpb25FeHBlY3RlZCkgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0 ICE9IG9sZFNlbGVjdGVkVGV4dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1M ID0gIlNVQ0NFU1MiOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50Lmlu bmVySFRNTCA9ICJGQUlMVVJFOiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSBkaWZmZXJlbnQuIjsK KyAgICB9IGVsc2UgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0ID09IG9sZFNlbGVjdGVkVGV4 dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1MID0gIlNVQ0NFU1MiOworICAg ICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50LmlubmVySFRNTCA9ICJGQUlMVVJF OiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSB0aGUgc2FtZS4iOworICAgIH0KK30KKworZnVuY3Rp b24gbG9hZCgpCit7CisgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIgfHwgIXdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdGVzdCgnbWFjJywgdHJ1ZSwgJ3Jlc3VsdG1hYycp OworICAgIHRlc3QoJ3dpbicsIGZhbHNlLCAncmVzdWx0d2luJyk7CisgICAgdGVzdCgndW5peCcs IGZhbHNlLCAncmVzdWx0dW5peCcpOworfQorPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDNiYzdjMGEuLjM1OTIwY2YgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMTEtMjYgIFBpZXJyZSBSb3NzaSAgPHBpZXJyZS5yb3NzaUBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMTE2CisKKyAgICAgICAg RG9uJ3QgZGlzY2FyZCB0aGUgZXhpc3Rpbmcgc2VsZWNpdG9uIG9uIHJpZ2h0IGNsaWNrCisgICAg ICAgIGlmIHdlJ3JlIG5vdCBnb2luZyB0byBzZWxlY3QgdGhlIHRleHQgdW5kZXIgdGhlIGN1cnNv ci4KKworICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50U2luZ2xlQ2xpY2spOgorCiAyMDEw LTExLTI1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzI3MzIuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmlu ZGV4IGUwOTUxMzYuLmIwMjIwODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0zOTksOCArMzk5 LDEwIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnRTaW5nbGVDbGlj ayhjb25zdCBNb3VzZUV2ZW50V2l0aEhpdFRlc3RSCiAgICAgICAgIG1fYmVnYW5TZWxlY3RpbmdU ZXh0ID0gdHJ1ZTsKICAgICB9IGVsc2UKICAgICAgICAgbmV3U2VsZWN0aW9uID0gVmlzaWJsZVNl bGVjdGlvbih2aXNpYmxlUG9zKTsKLSAgICAKLSAgICBpZiAobV9mcmFtZS0+c2VsZWN0aW9uKCkt PnNob3VsZENoYW5nZVNlbGVjdGlvbihuZXdTZWxlY3Rpb24pKQorCisgICAgLy8gRG9uJ3QgYWx0 ZXIgdGhlIHNlbGVjdGlvbiBmb3IgYnV0dG9ucyBvdGhlciB0aGFuIHRoZSBsZWZ0IGJ1dHRvbiB1 bmxlc3MgaXQncyBkZXNpcmVkIGJlaGF2aW9yCisgICAgY29uc3QgYm9vbCBzaG91bGRSZXBsYWNl U2VsZWN0aW9uID0gKG1fZnJhbWUtPmVkaXRvcigpLT5iZWhhdmlvcigpLnNob3VsZFNlbGVjdE9u Q29udGV4dHVhbE1lbnVDbGljaygpIHx8IGV2ZW50LmV2ZW50KCkuYnV0dG9uKCkgPT0gTGVmdEJ1 dHRvbik7CisgICAgaWYgKG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rp b24obmV3U2VsZWN0aW9uKSAmJiBzaG91bGRSZXBsYWNlU2VsZWN0aW9uKQogICAgICAgICBtX2Zy YW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgZ3JhbnVsYXJpdHks IE1ha2VOb25EaXJlY3Rpb25hbFNlbGVjdGlvbik7CiAKICAgICByZXR1cm4gdHJ1ZTsK 76212 2010-12-10 09:33:31 -0800 2011-01-18 05:30:03 -0800 Take 3 (Change windows behavior.) webkit-keep-selection.patch text/plain 4950 pierre.rossi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1tb2Rp ZmllZC1vbi1yaWdodC1jbGljay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Nl bGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmZTk2MTgKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24t cmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGhpcyB0ZXN0IGNoZWNr cyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVudSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0 IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLgorCitMb3JlbSBpcHN1bQorRm9vIGJhcgorU1VDQ0VT UworU1VDQ0VTUworU1VDQ0VTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxl Y3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVkLW9uLXJpZ2h0LWNsaWNrLmh0bWwgYi9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2suaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kNDRiNWYyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVk LW9uLXJpZ2h0LWNsaWNrLmh0bWwKQEAgLTAsMCArMSw2NSBAQAorPGJvZHkgb25sb2FkPSJsb2Fk KCkiPgorPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVu dSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLjwvcD4KKzxk aXYgaWQ9InRleHQiPkxvcmVtIGlwc3VtPC9kaXY+Cis8ZGl2IGlkPSJmb29iYXIiPkZvbyBiYXI8 L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdG1hYyI+UlVOTklORzwvZGl2PgorPGRpdiBpZD0icmVzdWx0 d2luIj5SVU5OSU5HPC9kaXY+Cis8ZGl2IGlkPSJyZXN1bHR1bml4Ij5SVU5OSU5HPC9kaXY+Cis8 L2JvZHk+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdChwbGF0Zm9ybSwgbmV3U2VsZWN0aW9uRXhw ZWN0ZWQsIHJlc3VsdCkKK3sKKyAgICB2YXIgc2VsID0gd2luZG93LmdldFNlbGVjdGlvbigpOwor CisgICAgLy8gY2xlYXIgc2VsZWN0aW9uCisgICAgc2VsLnJlbW92ZUFsbFJhbmdlcygpOworCisg ICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKworICAgIHZhciB0ZXh0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHQiKTsKKyAgICB2YXIgZm9vYmFyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImZvb2JhciIpOworCisKKyAgICByYW5nZS5zZWxlY3ROb2RlQ29u dGVudHMoZm9vYmFyKTsKKyAgICBzZWwuYWRkUmFuZ2UocmFuZ2UpOworCisgICAgdmFyIG9sZFNl bGVjdGVkVGV4dCA9IHNlbC50b1N0cmluZygpOworCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0RWRpdGluZ0JlaGF2aW9yKHBsYXRmb3JtKTsKKworICAgIHZhciB4ID0gdGV4dC5vZmZzZXRQ YXJlbnQub2Zmc2V0TGVmdCArIHRleHQub2Zmc2V0TGVmdCArIDQ7CisgICAgdmFyIHkgPSB0ZXh0 Lm9mZnNldFBhcmVudC5vZmZzZXRUb3AgKyB0ZXh0Lm9mZnNldFRvcCArIHRleHQub2Zmc2V0SGVp Z2h0IC8gMjsKKworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50 U2VuZGVyLmNvbnRleHRDbGljaygpOworICAgIC8vIGVzYyBrZXkgdG8ga2lsbCB0aGUgY29udGV4 dCBtZW51CisgICAgZXZlbnRTZW5kZXIua2V5RG93bihTdHJpbmcuZnJvbUNoYXJDb2RlKDB4MDAx QiksIG51bGwpOworCisgICAgdmFyIHJlc3VsdEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZChyZXN1bHQpOworICAgIHZhciBzZWxlY3RlZFRleHQgPSBzZWwudG9TdHJpbmcoKTsKKwor ICAgIGlmIChuZXdTZWxlY3Rpb25FeHBlY3RlZCkgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0 ICE9IG9sZFNlbGVjdGVkVGV4dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1M ID0gIlNVQ0NFU1MiOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50Lmlu bmVySFRNTCA9ICJGQUlMVVJFOiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSBkaWZmZXJlbnQuIjsK KyAgICB9IGVsc2UgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0ID09IG9sZFNlbGVjdGVkVGV4 dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1MID0gIlNVQ0NFU1MiOworICAg ICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50LmlubmVySFRNTCA9ICJGQUlMVVJF OiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSB0aGUgc2FtZS4iOworICAgIH0KK30KKworZnVuY3Rp b24gbG9hZCgpCit7CisgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIgfHwgIXdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdGVzdCgnbWFjJywgdHJ1ZSwgJ3Jlc3VsdG1hYycp OworICAgIHRlc3QoJ3dpbicsIHRydWUsICdyZXN1bHR3aW4nKTsKKyAgICB0ZXN0KCd1bml4Jywg ZmFsc2UsICdyZXN1bHR1bml4Jyk7Cit9Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JjN2MwYS4uMzU5MjBjZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMC0xMS0yNiAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxMTYKKworICAgICAgICBE b24ndCBkaXNjYXJkIHRoZSBleGlzdGluZyBzZWxlY2l0b24gb24gcmlnaHQgY2xpY2sKKyAgICAg ICAgaWYgd2UncmUgbm90IGdvaW5nIHRvIHNlbGVjdCB0aGUgdGV4dCB1bmRlciB0aGUgY3Vyc29y LgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnRTaW5nbGVDbGljayk6CisKIDIwMTAt MTEtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MjczMi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv ZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaCBiL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZp b3IuaAppbmRleCBhMzY3YzUyLi4xZDhmOTZmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcv RWRpdGluZ0JlaGF2aW9yLmgKKysrIGIvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5o CkBAIC02MCw2ICs2MCw5IEBAIHB1YmxpYzoKICAgICAvLyBPbiBNYWMsIHdoZW4gcHJvY2Vzc2lu ZyBhIGNvbnRleHR1YWwgY2xpY2ssIHRoZSBvYmplY3QgYmVpbmcgY2xpY2tlZCB1cG9uIHNob3Vs ZCBiZSBzZWxlY3RlZC4KICAgICBib29sIHNob3VsZFNlbGVjdE9uQ29udGV4dHVhbE1lbnVDbGlj aygpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBFZGl0aW5nTWFjQmVoYXZpb3I7IH0KIAorICAg IC8vIE9uIExpbnV4LCByaWdodCBjbGlja2luZyBvdXRzaWRlIG9mIHRoZSBjdXJyZW50IHNlbGVj dGlvbiBzaG91bGRuJ3QgZGlzY2FyZCB0aGUgZXhpc3Rpbmcgc2VsZWN0aW9uCisgICAgYm9vbCBz aG91bGREaXNjYXJkQ3VycmVudFNlbGVjdGlvbk9uUmlnaHRDbGljaygpIGNvbnN0IHsgcmV0dXJu IG1fdHlwZSAhPSBFZGl0aW5nVW5peEJlaGF2aW9yOyB9CisKIHByaXZhdGU6CiAgICAgRWRpdGlu Z0JlaGF2aW9yVHlwZSBtX3R5cGU7CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0V2ZW50 SGFuZGxlci5jcHAgYi9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCBlMDk1MTM2 Li4yYTQwMTU1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysg Yi9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApAQCAtMzk5LDggKzM5OSwxMCBAQCBib29s IEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50U2luZ2xlQ2xpY2soY29uc3QgTW91 c2VFdmVudFdpdGhIaXRUZXN0UgogICAgICAgICBtX2JlZ2FuU2VsZWN0aW5nVGV4dCA9IHRydWU7 CiAgICAgfSBlbHNlCiAgICAgICAgIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24odmlz aWJsZVBvcyk7Ci0gICAgCi0gICAgaWYgKG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zaG91bGRDaGFu Z2VTZWxlY3Rpb24obmV3U2VsZWN0aW9uKSkKKworICAgIC8vIERvbid0IGFsdGVyIHRoZSBzZWxl Y3Rpb24gZm9yIGJ1dHRvbnMgb3RoZXIgdGhhbiB0aGUgbGVmdCBidXR0b24gdW5sZXNzIGl0J3Mg ZGVzaXJlZCBiZWhhdmlvcgorICAgIGNvbnN0IGJvb2wgc2hvdWxkUmVwbGFjZVNlbGVjdGlvbiA9 IChtX2ZyYW1lLT5lZGl0b3IoKS0+YmVoYXZpb3IoKS5zaG91bGREaXNjYXJkQ3VycmVudFNlbGVj dGlvbk9uUmlnaHRDbGljaygpIHx8IGV2ZW50LmV2ZW50KCkuYnV0dG9uKCkgPT0gTGVmdEJ1dHRv bik7CisgICAgaWYgKG1fZnJhbWUtPnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rpb24o bmV3U2VsZWN0aW9uKSAmJiBzaG91bGRSZXBsYWNlU2VsZWN0aW9uKQogICAgICAgICBtX2ZyYW1l LT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uKG5ld1NlbGVjdGlvbiwgZ3JhbnVsYXJpdHksIE1h a2VOb25EaXJlY3Rpb25hbFNlbGVjdGlvbik7CiAKICAgICByZXR1cm4gdHJ1ZTsK 79267 2011-01-18 05:30:03 -0800 2011-04-11 15:37:48 -0700 Modified as per Ryosuke's comments webkit-keep-selection.patch text/plain 4846 pierre.rossi ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL3NlbGVjdGlvbi1tb2Rp ZmllZC1vbi1yaWdodC1jbGljay1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3Nl bGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjNmZTk2MTgKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24t cmlnaHQtY2xpY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorVGhpcyB0ZXN0IGNoZWNr cyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVudSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0 IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLgorCitMb3JlbSBpcHN1bQorRm9vIGJhcgorU1VDQ0VT UworU1VDQ0VTUworU1VDQ0VTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxl Y3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVkLW9uLXJpZ2h0LWNsaWNrLmh0bWwgYi9MYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9zZWxlY3Rpb24tbW9kaWZpZWQtb24tcmlnaHQtY2xpY2suaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xM2E4NWNmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vc2VsZWN0aW9uLW1vZGlmaWVk LW9uLXJpZ2h0LWNsaWNrLmh0bWwKQEAgLTAsMCArMSw2NSBAQAorPGJvZHkgb25sb2FkPSJsb2Fk KCkiPgorPHA+VGhpcyB0ZXN0IGNoZWNrcyB0aGF0IHRyaWdnZXJpbmcgdGhlIGNvbnRleHQgbWVu dSBzZWxlY3RzL2RvZXNuJ3Qgc2VsZWN0IGFzIHBsYXRmb3JtLWFwcHJvcHJpYXRlLjwvcD4KKzxk aXYgaWQ9InRleHQiPkxvcmVtIGlwc3VtPC9kaXY+Cis8ZGl2IGlkPSJmb29iYXIiPkZvbyBiYXI8 L2Rpdj4KKzxkaXYgaWQ9InJlc3VsdG1hYyI+UlVOTklORzwvZGl2PgorPGRpdiBpZD0icmVzdWx0 d2luIj5SVU5OSU5HPC9kaXY+Cis8ZGl2IGlkPSJyZXN1bHR1bml4Ij5SVU5OSU5HPC9kaXY+Cis8 L2JvZHk+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdChwbGF0Zm9ybSwgbmV3U2VsZWN0aW9uRXhw ZWN0ZWQsIHJlc3VsdCkKK3sKKyAgICB2YXIgc2VsID0gd2luZG93LmdldFNlbGVjdGlvbigpOwor CisgICAgLy8gY2xlYXIgc2VsZWN0aW9uCisgICAgc2VsLnJlbW92ZUFsbFJhbmdlcygpOworCisg ICAgdmFyIHJhbmdlID0gZG9jdW1lbnQuY3JlYXRlUmFuZ2UoKTsKKworICAgIHZhciB0ZXh0ID0g ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInRleHQiKTsKKyAgICB2YXIgZm9vYmFyID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImZvb2JhciIpOworCisKKyAgICByYW5nZS5zZWxlY3ROb2RlQ29u dGVudHMoZm9vYmFyKTsKKyAgICBzZWwuYWRkUmFuZ2UocmFuZ2UpOworCisgICAgdmFyIG9sZFNl bGVjdGVkVGV4dCA9IHNlbC50b1N0cmluZygpOworCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu c2V0RWRpdGluZ0JlaGF2aW9yKHBsYXRmb3JtKTsKKworICAgIHZhciB4ID0gdGV4dC5vZmZzZXRQ YXJlbnQub2Zmc2V0TGVmdCArIHRleHQub2Zmc2V0TGVmdCArIDQ7CisgICAgdmFyIHkgPSB0ZXh0 Lm9mZnNldFBhcmVudC5vZmZzZXRUb3AgKyB0ZXh0Lm9mZnNldFRvcCArIHRleHQub2Zmc2V0SGVp Z2h0IC8gMjsKKworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOworICAgIGV2ZW50 U2VuZGVyLmNvbnRleHRDbGljaygpOworICAgIC8vIGVzYyBrZXkgdG8ga2lsbCB0aGUgY29udGV4 dCBtZW51CisgICAgZXZlbnRTZW5kZXIua2V5RG93bihTdHJpbmcuZnJvbUNoYXJDb2RlKDB4MDAx QiksIG51bGwpOworCisgICAgdmFyIHJlc3VsdEVsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZChyZXN1bHQpOworICAgIHZhciBzZWxlY3RlZFRleHQgPSBzZWwudG9TdHJpbmcoKTsKKwor ICAgIGlmIChuZXdTZWxlY3Rpb25FeHBlY3RlZCkgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0 ICE9IG9sZFNlbGVjdGVkVGV4dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1M ID0gIlNVQ0NFU1MiOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50Lmlu bmVySFRNTCA9ICJGQUlMVVJFOiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSBkaWZmZXJlbnQuIjsK KyAgICB9IGVsc2UgeworICAgICAgICBpZiAoc2VsZWN0ZWRUZXh0ID09IG9sZFNlbGVjdGVkVGV4 dCkKKyAgICAgICAgICAgIHJlc3VsdEVsZW1lbnQuaW5uZXJIVE1MID0gIlNVQ0NFU1MiOworICAg ICAgICBlbHNlCisgICAgICAgICAgICByZXN1bHRFbGVtZW50LmlubmVySFRNTCA9ICJGQUlMVVJF OiBUaGUgc2VsZWN0aW9uIHNob3VsZCBiZSB0aGUgc2FtZS4iOworICAgIH0KK30KKworZnVuY3Rp b24gbG9hZCgpCit7CisgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIgfHwgIXdpbmRvdy5sYXlv dXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgdGVzdCgnbWFjJywgdHJ1ZSwgJ3Jlc3VsdG1hYycp OworICAgIHRlc3QoJ3dpbicsIHRydWUsICdyZXN1bHR3aW4nKTsKKyAgICB0ZXN0KCd1bml4Jywg ZmFsc2UsICdyZXN1bHR1bml4Jyk7Cit9Cis8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv Q2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JjN2MwYS4uMzU5MjBjZiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMC0xMS0yNiAgUGllcnJlIFJvc3NpICA8cGllcnJlLnJvc3NpQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxMTYKKworICAgICAgICBE b24ndCBkaXNjYXJkIHRoZSBleGlzdGluZyBzZWxlY2l0b24gb24gcmlnaHQgY2xpY2sKKyAgICAg ICAgaWYgd2UncmUgbm90IGdvaW5nIHRvIHNlbGVjdCB0aGUgdGV4dCB1bmRlciB0aGUgY3Vyc29y LgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRIYW5kbGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnRTaW5nbGVDbGljayk6CisKIDIwMTAt MTEtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3MjczMi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv ZWRpdGluZy9FZGl0aW5nQmVoYXZpb3IuaCBiL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nQmVoYXZp b3IuaAppbmRleCBhMzY3YzUyLi43YWU1NzhkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2VkaXRpbmcv RWRpdGluZ0JlaGF2aW9yLmgKKysrIGIvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdCZWhhdmlvci5o CkBAIC02MCw2ICs2MCw5IEBAIHB1YmxpYzoKICAgICAvLyBPbiBNYWMsIHdoZW4gcHJvY2Vzc2lu ZyBhIGNvbnRleHR1YWwgY2xpY2ssIHRoZSBvYmplY3QgYmVpbmcgY2xpY2tlZCB1cG9uIHNob3Vs ZCBiZSBzZWxlY3RlZC4KICAgICBib29sIHNob3VsZFNlbGVjdE9uQ29udGV4dHVhbE1lbnVDbGlj aygpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBFZGl0aW5nTWFjQmVoYXZpb3I7IH0KIAorICAg IC8vIE9uIFVuaXgsIHJpZ2h0IGNsaWNraW5nIG91dHNpZGUgb2YgdGhlIGN1cnJlbnQgc2VsZWN0 aW9uIHNob3VsZG4ndCBkaXNjYXJkIHRoZSBleGlzdGluZyBzZWxlY3Rpb24KKyAgICBib29sIHNo b3VsZERpc2NhcmRDdXJyZW50U2VsZWN0aW9uT25SaWdodENsaWNrKCkgY29uc3QgeyByZXR1cm4g bV90eXBlICE9IEVkaXRpbmdVbml4QmVoYXZpb3I7IH0KKwogcHJpdmF0ZToKICAgICBFZGl0aW5n QmVoYXZpb3JUeXBlIG1fdHlwZTsKIH07CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IGUwOTUxMzYu LjViNzAyNDAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCisrKyBi L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0zOTksOCArMzk5LDkgQEAgYm9vbCBF dmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUHJlc3NFdmVudFNpbmdsZUNsaWNrKGNvbnN0IE1vdXNl RXZlbnRXaXRoSGl0VGVzdFIKICAgICAgICAgbV9iZWdhblNlbGVjdGluZ1RleHQgPSB0cnVlOwog ICAgIH0gZWxzZQogICAgICAgICBuZXdTZWxlY3Rpb24gPSBWaXNpYmxlU2VsZWN0aW9uKHZpc2li bGVQb3MpOwotICAgIAotICAgIGlmIChtX2ZyYW1lLT5zZWxlY3Rpb24oKS0+c2hvdWxkQ2hhbmdl U2VsZWN0aW9uKG5ld1NlbGVjdGlvbikpCisKKyAgICBjb25zdCBib29sIHNob3VsZFJlcGxhY2VT ZWxlY3Rpb24gPSAobV9mcmFtZS0+ZWRpdG9yKCktPmJlaGF2aW9yKCkuc2hvdWxkRGlzY2FyZEN1 cnJlbnRTZWxlY3Rpb25PblJpZ2h0Q2xpY2soKSB8fCBldmVudC5ldmVudCgpLmJ1dHRvbigpID09 IExlZnRCdXR0b24pOworICAgIGlmIChzaG91bGRSZXBsYWNlU2VsZWN0aW9uICYmIG1fZnJhbWUt PnNlbGVjdGlvbigpLT5zaG91bGRDaGFuZ2VTZWxlY3Rpb24obmV3U2VsZWN0aW9uKSkKICAgICAg ICAgbV9mcmFtZS0+c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24sIGdyYW51 bGFyaXR5LCBNYWtlTm9uRGlyZWN0aW9uYWxTZWxlY3Rpb24pOwogCiAgICAgcmV0dXJuIHRydWU7 Cg==