29177 2009-09-11 04:32:16 -0700 [GTK] Right click does not activate text entry 2010-03-01 20:12:51 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned bjt23 commit-queue eric jmalonzo jmillan oldest_to_newest 146520 0 xan.lopez 2009-09-11 04:32:16 -0700 From epiphany bug https://bugzilla.gnome.org/show_bug.cgi?id=575502#add_comment: > Also clicking with right mouse button on the text box does not make it active > (might be a heritage from the mac-land :P). When you are typing in one textbox > and then do a right mouse click on another text box and choose paste from the > context menu, text ends up in previously active (aka wrong) textbox. 184659 1 47430 jmillan 2010-01-26 11:49:11 -0800 Created attachment 47430 Proposed patch I think that this patch solves this problem. 184665 2 47430 gustavo 2010-01-26 12:09:16 -0800 Comment on attachment 47430 Proposed patch > + Makes the frame to handle the mouse click event before sending the You can remove that 'to' =) I can say 'go' to this patch if it keeps working to bring up the context menu in maps.google.com, and to remove talent points here: http://www.wowhead.com/?talent#I (click the squares to add points, then right-click to remove points). Does it? Would be good to have some layout tests for this =(. 184739 3 47430 eric 2010-01-26 14:28:28 -0800 Comment on attachment 47430 Proposed patch OK. But how do we test this? r- for lack of tests (or lack of explanation as to why testing is impossible here). 187089 4 47962 jmillan 2010-02-02 12:12:30 -0800 Created attachment 47962 Proposed patch This patch works in the pages commented in comment 2. There were already layout tests for this, but they were skipped in GTK. This patch removes them from the Skipped list. Also, popup menu position when invoked via keyboard is improved (popup menu appeared where the mouse cursor was, which could led to confusion if it was not above the selected node). Click event handling using javascript is tested in fast/events/mouse-click-events.html; WebKitGTK fails that text, but in the results page it can be seen that the right button is correctly handled. 190318 5 47962 gustavo 2010-02-14 08:21:45 -0800 Comment on attachment 47962 Proposed patch I very much like this patch, sorry for the delay in looking at it. I have a few questions:  235 if (mainFrame->view() && mainFrame->eventHandler()->handleMousePressEvent(event))  236 mousePressEventResult = TRUE; Why do we use the main frame here, instead of the focusedOrMainFrame? 285  if (!start.node() || !end.node())  303 if (!start.node() || !end.node()  304 || (page->mainFrame()->selection()->selection().isCaret() && !page->mainFrame()->selection()->selection().isContentEditable())) Same here, will this still work for multi-frame pages, such as, say, the patch review interface in this bugzilla? Thanks for digging the tests, that helps a lot in keeping the sanity =). 191697 6 bjt23 2010-02-18 12:20:33 -0800 *** Bug 35064 has been marked as a duplicate of this bug. *** 191986 7 49096 jmillan 2010-02-19 11:03:33 -0800 Created attachment 49096 Proposed patch New version of the patch, this time it works well with multi-frame pages. 194734 8 49096 gustavo 2010-03-01 10:53:09 -0800 Comment on attachment 49096 Proposed patch This looks better, thanks for the patch! 194880 9 49096 commit-queue 2010-03-01 17:12:23 -0800 Comment on attachment 49096 Proposed patch Clearing flags on attachment: 49096 Committed r55389: <http://trac.webkit.org/changeset/55389> 194881 10 commit-queue 2010-03-01 17:12:28 -0800 All reviewed patches have been landed. Closing bug. 194923 11 eric 2010-03-01 20:12:51 -0800 The build bots seem to think http://trac.webkit.org/changeset/55389 broke the mac builder. But I don't believe them. 47430 2010-01-26 11:49:11 -0800 2010-02-02 12:12:30 -0800 Proposed patch 20100135_rightclickfocus_29177.patch text/plain 2564 jmillan SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiA1Mzg2MSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEtMjYgIEpvc8OpIE1pbGzDoW4gU290byAg PGptaWxsYW5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBSaWdodCBjbGljayBkb2VzIG5vdCBhY3RpdmF0ZSB0ZXh0IGVu dHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE3 NworCisgICAgICAgIE1ha2VzIHRoZSBmcmFtZSB0byBoYW5kbGUgdGhlIG1vdXNlIGNsaWNrIGV2 ZW50IGJlZm9yZSBzZW5kaW5nIHRoZQorICAgICAgICBjb250ZXh0IG1lbnUgZXZlbnQuCisKKyAg ICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3Zp ZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3 X2J1dHRvbl9wcmVzc19ldmVudCk6CisKIDIwMTAtMDEtMTkgIEpvYW5tYXJpZSBEaWdncyAgPGpv YW5tYXJpZS5kaWdnc0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6 LgpJbmRleDogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKHJldmlzaW9uIDUzODYxKQor KysgV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIxMiwxOSArMjEyLDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb3J3YXJk XwogICAgIGlmICghaGFuZGxlZEV2ZW50KQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKLSAgICAv LyBJZiBjb3JlTWVudSBpcyBOVUxMLCB0aGlzIG1lYW5zIFdlYkNvcmUgZGVjaWRlZCB0byBub3Qg Y3JlYXRlCi0gICAgLy8gdGhlIGRlZmF1bHQgY29udGV4dCBtZW51OyB0aGlzIG1heSBzdGlsbCBt ZWFuIHRoYXQgdGhlIGZyYW1lCi0gICAgLy8gd2FudHMgdG8gY29uc3VtZSB0aGUgZXZlbnQgLSB0 aGlzIGhhcHBlbnMgd2hlbiB0aGUgcGFnZSBpcwotICAgIC8vIGhhbmRsaW5nIHRoZSByaWdodC1j bGljayBmb3IgcmVhc29ucyBvdGhlciB0aGFuIGEgY29udGV4dCBtZW51LAotICAgIC8vIHNvIHdl IGdpdmUgaXQgdG8gaXQuCiAgICAgQ29udGV4dE1lbnUqIGNvcmVNZW51ID0gcGFnZS0+Y29udGV4 dE1lbnVDb250cm9sbGVyKCktPmNvbnRleHRNZW51KCk7Ci0gICAgaWYgKCFjb3JlTWVudSkgewot ICAgICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJhbWUoKTsKLSAgICAg ICAgaWYgKGZyYW1lLT52aWV3KCkgJiYgZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3Vz ZVByZXNzRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50KSkpCi0gICAgICAgICAgICByZXR1 cm4gVFJVRTsKLQotICAgICAgICByZXR1cm4gRkFMU0U7Ci0gICAgfQogCiAgICAgLy8gSWYgd2Ug cmVhY2ggaGVyZSwgaXQncyBiZWNhdXNlIFdlYkNvcmUgaXMgZ29pbmcgdG8gc2hvdyB0aGUKICAg ICAvLyBkZWZhdWx0IGNvbnRleHQgbWVudS4gV2UgY2hlY2sgb3VyIHNldHRpbmcgdG8gZmlndXJl IG91dApAQCAtNTI0LDE1ICs1MTIsMTUgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmll d19idXR0b25fcAogICAgIC8vIEZJWE1FOiBuZWVkIHRvIGtlZXAgdHJhY2sgb2Ygc3ViZnJhbWUg Zm9jdXMgZm9yIGtleSBldmVudHMKICAgICBndGtfd2lkZ2V0X2dyYWJfZm9jdXMod2lkZ2V0KTsK IAotICAgIGlmIChldmVudC0+YnV0dG9uID09IDMpCi0gICAgICAgIHJldHVybiB3ZWJraXRfd2Vi X3ZpZXdfZm9yd2FyZF9jb250ZXh0X21lbnVfZXZlbnQod2ViVmlldywgUGxhdGZvcm1Nb3VzZUV2 ZW50KGV2ZW50KSk7Ci0KICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5tYWluRnJh bWUoKTsKICAgICBpZiAoIWZyYW1lLT52aWV3KCkpCiAgICAgICAgIHJldHVybiBGQUxTRTsKIAog ICAgIGdib29sZWFuIHJlc3VsdCA9IGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91c2VQ cmVzc0V2ZW50KFBsYXRmb3JtTW91c2VFdmVudChldmVudCkpOwogCisgICAgaWYgKGV2ZW50LT5i dXR0b24gPT0gMyAmJiByZXN1bHQpCisgICAgICAgIHJldHVybiB3ZWJraXRfd2ViX3ZpZXdfZm9y d2FyZF9jb250ZXh0X21lbnVfZXZlbnQod2ViVmlldywgUGxhdGZvcm1Nb3VzZUV2ZW50KGV2ZW50 KSk7CisKICNpZiBQTEFURk9STShYMTEpCiAgICAgLyogQ29weSBzZWxlY3Rpb24gdG8gdGhlIFgx MSBzZWxlY3Rpb24gY2xpcGJvYXJkICovCiAgICAgaWYgKGV2ZW50LT5idXR0b24gPT0gMikgewo= 47962 2010-02-02 12:12:30 -0800 2010-02-19 11:03:33 -0800 Proposed patch 20100202_rightclickfocus_29177_3.patch text/plain 9456 jmillan SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NDI0MykKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMDIgIEpvc8OpIE1pbGzDoW4gU290byAg PGptaWxsYW5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBSaWdodCBjbGljayBkb2VzIG5vdCBhY3RpdmF0ZSB0ZXh0IGVu dHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE3 NworCisgICAgICAgIE1ha2VzIHRoZSBmcmFtZSBoYW5kbGUgdGhlIG1vdXNlIGNsaWNrIGV2ZW50 IGJlZm9yZSBzZW5kaW5nIHRoZQorICAgICAgICBjb250ZXh0IG1lbnUgZXZlbnQuCisKKyAgICAg ICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChQb3B1cE1lbnVQb3NpdGlv bkZ1bmMpOgorICAgICAgICBGdW5jdGlvbiBjcmVhdGVkIHRvIG1ha2UgdGhlIHBvcHVwIG1lbnUg YXBwZWFyIGluIHRoZSBjb3JyZWN0IHBvc2l0aW9uLCBlc3BlY2lhbGx5CisgICAgICAgIHdoZW4g aW52b2tlZCBmcm9tIHRoZSBrZXlib2FyZC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19mb3J3 YXJkX2NvbnRleHRfbWVudV9ldmVudCk6CisgICAgICAgIE1vdXNlIGNsaWNrIGV2ZW50IGlzIHNl bnQgdG8gZnJhbWUgYmVmb3JlIGNyZWF0aW5nIGNvbnRleHQgbWVudSwKKyAgICAgICAgUG9wdXBN ZW51UG9zaXRpb25GdW5jIHVzZWQgdG8gZGV0ZXJtaW5lIHRoZSBwb3NpdGlvbiB3aGVyZSB0aGUg bWVudSBzaG91bGQgYXBwZWFyLgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3BvcHVwX21lbnVf aGFuZGxlcik6CisgICAgICAgIEltcHJvdmVkIGZvY3VzZWQgbm9kZSBwb3NpdGlvbiBkZXRlY3Rp b24uIEV2ZW50IGJ1dHRvbiBzZXQgdG8gcmlnaHQgYnV0dG9uLgorCiAyMDEwLTAyLTAyICBNYXJ0 aW4gUm9iaW5zb24gIDxtYXJ0aW4uamFtZXMucm9iaW5zb25AZ21haWwuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYSBTaWx2YS4KSW5kZXg6IFdlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbiA1NDI0MSkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dl YmtpdHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDEsMzMgKzIwMSw1MSBAQCBzdGF0 aWMgdm9pZCBkZXN0cm95X21lbnVfY2IoR3RrT2JqZWN0KiBvCiAgICAgcHJpdi0+Y3VycmVudE1l bnUgPSBOVUxMOwogfQogCitzdGF0aWMgdm9pZCBQb3B1cE1lbnVQb3NpdGlvbkZ1bmMoR3RrTWVu dSogbWVudSwgZ2ludCAqeCwgZ2ludCAqeSwgZ2Jvb2xlYW4gKnB1c2hJbiwgZ3BvaW50ZXIgdXNl ckRhdGEpCit7CisgICAgV2ViS2l0V2ViVmlldyogdmlldyA9IFdFQktJVF9XRUJfVklFVyh1c2Vy RGF0YSk7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBXRUJLSVRfV0VCX1ZJRVdf R0VUX1BSSVZBVEUodmlldyk7CisgICAgR2RrU2NyZWVuKiBzY3JlZW4gPSBndGtfd2lkZ2V0X2dl dF9zY3JlZW4oR1RLX1dJREdFVCh2aWV3KSk7CisgICAgR3RrUmVxdWlzaXRpb24gbWVudVNpemU7 CisKKyAgICBndGtfd2lkZ2V0X3NpemVfcmVxdWVzdChHVEtfV0lER0VUKG1lbnUpLCAmbWVudVNp emUpOworCisgICAgKnggPSBwcml2LT5sYXN0UG9wdXBYUG9zaXRpb247CisgICAgaWYgKCgqeCAr IG1lbnVTaXplLndpZHRoKSA+PSBnZGtfc2NyZWVuX2dldF93aWR0aChzY3JlZW4pKQorICAgICAg KnggLT0gbWVudVNpemUud2lkdGg7CisKKyAgICAqeSA9IHByaXYtPmxhc3RQb3B1cFlQb3NpdGlv bjsKKyAgICBpZiAoKCp5ICsgbWVudVNpemUuaGVpZ2h0KSA+PSBnZGtfc2NyZWVuX2dldF9oZWln aHQoc2NyZWVuKSkKKyAgICAgICp5IC09IG1lbnVTaXplLmhlaWdodDsKKworICAgICpwdXNoSW4g PSBGQUxTRTsKK30KKwogc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb3J3YXJkX2Nv bnRleHRfbWVudV9ldmVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBQbGF0Zm9ybU1v dXNlRXZlbnQmIGV2ZW50KQogewogICAgIFBhZ2UqIHBhZ2UgPSBjb3JlKHdlYlZpZXcpOwogICAg IHBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5jbGVhckNvbnRleHRNZW51KCk7CiAgICAg RnJhbWUqIGZvY3VzZWRGcmFtZSA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JN YWluRnJhbWUoKTsKKyAgICBGcmFtZSogbWFpbkZyYW1lID0gcGFnZS0+bWFpbkZyYW1lKCk7Cisg ICAgZ2Jvb2xlYW4gbW91c2VQcmVzc0V2ZW50UmVzdWx0ID0gRkFMU0U7CiAKICAgICBpZiAoIWZv Y3VzZWRGcmFtZS0+dmlldygpKQogICAgICAgICByZXR1cm4gRkFMU0U7CiAKKyAgICBpZiAobWFp bkZyYW1lLT52aWV3KCkgJiYgbWFpbkZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91c2VQ cmVzc0V2ZW50KGV2ZW50KSkKKyAgICAgICAgbW91c2VQcmVzc0V2ZW50UmVzdWx0ID0gVFJVRTsK KwogICAgIGZvY3VzZWRGcmFtZS0+dmlldygpLT5zZXRDdXJzb3IocG9pbnRlckN1cnNvcigpKTsK ICAgICBib29sIGhhbmRsZWRFdmVudCA9IGZvY3VzZWRGcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNl bmRDb250ZXh0TWVudUV2ZW50KGV2ZW50KTsKICAgICBpZiAoIWhhbmRsZWRFdmVudCkKICAgICAg ICAgcmV0dXJuIEZBTFNFOwogCiAgICAgLy8gSWYgY29yZU1lbnUgaXMgTlVMTCwgdGhpcyBtZWFu cyBXZWJDb3JlIGRlY2lkZWQgdG8gbm90IGNyZWF0ZQotICAgIC8vIHRoZSBkZWZhdWx0IGNvbnRl eHQgbWVudTsgdGhpcyBtYXkgc3RpbGwgbWVhbiB0aGF0IHRoZSBmcmFtZQotICAgIC8vIHdhbnRz IHRvIGNvbnN1bWUgdGhlIGV2ZW50IC0gdGhpcyBoYXBwZW5zIHdoZW4gdGhlIHBhZ2UgaXMKLSAg ICAvLyBoYW5kbGluZyB0aGUgcmlnaHQtY2xpY2sgZm9yIHJlYXNvbnMgb3RoZXIgdGhhbiBhIGNv bnRleHQgbWVudSwKLSAgICAvLyBzbyB3ZSBnaXZlIGl0IHRvIGl0LgorICAgIC8vIHRoZSBkZWZh dWx0IGNvbnRleHQgbWVudTsgdGhpcyBtYXkgaGFwcGVuIHdoZW4gdGhlIHBhZ2UgaXMKKyAgICAv LyBoYW5kbGluZyB0aGUgcmlnaHQtY2xpY2sgZm9yIHJlYXNvbnMgb3RoZXIgdGhhbiB0aGUgY29u dGV4dCBtZW51LgogICAgIENvbnRleHRNZW51KiBjb3JlTWVudSA9IHBhZ2UtPmNvbnRleHRNZW51 Q29udHJvbGxlcigpLT5jb250ZXh0TWVudSgpOwotICAgIGlmICghY29yZU1lbnUpIHsKLSAgICAg ICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJWaWV3KS0+bWFpbkZyYW1lKCk7Ci0gICAgICAgIGlm IChmcmFtZS0+dmlldygpICYmIGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91c2VQcmVz c0V2ZW50KFBsYXRmb3JtTW91c2VFdmVudChldmVudCkpKQotICAgICAgICAgICAgcmV0dXJuIFRS VUU7Ci0KLSAgICAgICAgcmV0dXJuIEZBTFNFOwotICAgIH0KKyAgICBpZiAoIWNvcmVNZW51KQor ICAgICAgICByZXR1cm4gbW91c2VQcmVzc0V2ZW50UmVzdWx0OwogCiAgICAgLy8gSWYgd2UgcmVh Y2ggaGVyZSwgaXQncyBiZWNhdXNlIFdlYkNvcmUgaXMgZ29pbmcgdG8gc2hvdyB0aGUKICAgICAv LyBkZWZhdWx0IGNvbnRleHQgbWVudS4gV2UgY2hlY2sgb3VyIHNldHRpbmcgdG8gZmlndXJlIG91 dApAQCAtMjYxLDggKzI3OSw4IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZm9y d2FyZF8KICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwogCiAgICAgZ3RrX21lbnVfcG9wdXAo bWVudSwgTlVMTCwgTlVMTCwKLSAgICAgICAgICAgICAgICAgICBOVUxMLAotICAgICAgICAgICAg ICAgICAgIHByaXYsIGV2ZW50LmJ1dHRvbigpICsgMSwgZ3RrX2dldF9jdXJyZW50X2V2ZW50X3Rp bWUoKSk7CisgICAgICAgICAgICAgICAgICAgJlBvcHVwTWVudVBvc2l0aW9uRnVuYywKKyAgICAg ICAgICAgICAgICAgICB3ZWJWaWV3LCBldmVudC5idXR0b24oKSArIDEsIGd0a19nZXRfY3VycmVu dF9ldmVudF90aW1lKCkpOwogICAgIHJldHVybiBUUlVFOwogfQogCkBAIC0yODIsNyArMzAwLDgg QEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19wb3B1cF9tZQogICAgIGludCByaWdo dEFsaWduZWQgPSBGQUxTRTsKICAgICBJbnRQb2ludCBsb2NhdGlvbjsKIAotICAgIGlmICghc3Rh cnQubm9kZSgpIHx8ICFlbmQubm9kZSgpKQorICAgIGlmICghc3RhcnQubm9kZSgpIHx8ICFlbmQu bm9kZSgpCisgICAgICAgIHx8IChwYWdlLT5tYWluRnJhbWUoKS0+c2VsZWN0aW9uKCktPnNlbGVj dGlvbigpLmlzQ2FyZXQoKSAmJiAhcGFnZS0+bWFpbkZyYW1lKCktPnNlbGVjdGlvbigpLT5zZWxl Y3Rpb24oKS5pc0NvbnRlbnRFZGl0YWJsZSgpKSkKICAgICAgICAgbG9jYXRpb24gPSBJbnRQb2lu dChyaWdodEFsaWduZWQgPyB2aWV3LT5jb250ZW50c1dpZHRoKCkgLSBjb250ZXh0TWVudU1hcmdp biA6IGNvbnRleHRNZW51TWFyZ2luLCBjb250ZXh0TWVudU1hcmdpbik7CiAgICAgZWxzZSB7CiAg ICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBzdGFydC5ub2RlKCktPnJlbmRlcmVyKCk7 CkBAIC0zMjgsOCArMzQ3LDE3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfcG9w dXBfbWUKICAgICAvLyBGSVhNRTogVGhlIEludFNpemUoMCwgLTEpIGlzIGEgaGFjayB0byBnZXQg dGhlIGhpdC10ZXN0aW5nIHRvIHJlc3VsdCBpbiB0aGUgc2VsZWN0ZWQgZWxlbWVudC4KICAgICAv LyBJZGVhbGx5IHdlJ2QgaGF2ZSB0aGUgcG9zaXRpb24gb2YgYSBjb250ZXh0IG1lbnUgZXZlbnQg YmUgc2VwYXJhdGUgZnJvbSBpdHMgdGFyZ2V0IG5vZGUuCiAgICAgbG9jYXRpb24gPSB2aWV3LT5j b250ZW50c1RvV2luZG93KGxvY2F0aW9uKSArIEludFNpemUoMCwgLTEpOworICAgIGlmIChsb2Nh dGlvbi55KCkgPCAwKQorICAgICAgICBsb2NhdGlvbi5zZXRZKGNvbnRleHRNZW51TWFyZ2luKTsK KyAgICBlbHNlIGlmIChsb2NhdGlvbi55KCkgPiB2aWV3LT5oZWlnaHQoKSkKKyAgICAgICAgbG9j YXRpb24uc2V0WSh2aWV3LT5oZWlnaHQoKSAtIGNvbnRleHRNZW51TWFyZ2luKTsKKyAgICBpZiAo bG9jYXRpb24ueCgpIDwgMCkKKyAgICAgICAgbG9jYXRpb24uc2V0WChjb250ZXh0TWVudU1hcmdp bik7CisgICAgZWxzZSBpZiAobG9jYXRpb24ueCgpID4gdmlldy0+d2lkdGgoKSkKKyAgICAgICAg bG9jYXRpb24uc2V0WCh2aWV3LT53aWR0aCgpIC0gY29udGV4dE1lbnVNYXJnaW4pOwogICAgIElu dFBvaW50IGdsb2JhbCA9IGxvY2F0aW9uICsgSW50U2l6ZSh4LCB5KTsKLSAgICBQbGF0Zm9ybU1v dXNlRXZlbnQgZXZlbnQobG9jYXRpb24sIGdsb2JhbCwgTm9CdXR0b24sIE1vdXNlRXZlbnRQcmVz c2VkLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZ3RrX2dldF9jdXJyZW50X2V2ZW50 X3RpbWUoKSk7CisKKyAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgZXZlbnQobG9jYXRpb24sIGdsb2Jh bCwgUmlnaHRCdXR0b24sIE1vdXNlRXZlbnRQcmVzc2VkLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNl LCBmYWxzZSwgZ3RrX2dldF9jdXJyZW50X2V2ZW50X3RpbWUoKSk7CiAKICAgICByZXR1cm4gd2Vi a2l0X3dlYl92aWV3X2ZvcndhcmRfY29udGV4dF9tZW51X2V2ZW50KFdFQktJVF9XRUJfVklFVyh3 aWRnZXQpLCBldmVudCk7CiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NDI0MykKKysrIExheW91dFRl c3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEwLTAyLTAy ICBKb3PDqSBNaWxsw6FuIFNvdG8gIDxqbWlsbGFuQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUmlnaHQgY2xpY2sgZG9l cyBub3QgYWN0aXZhdGUgdGV4dCBlbnRyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNzcKKworICAgICAgICBTdG9wIHNraXBwaW5nIHNvbWUgdGVz dHMgd2hpY2ggd2hlcmUgZmFpbGluZyBiZWNvdXNlIG9mIHJpZ2h0IGNsaWNrCisgICAgICAgIG5v dCBiZWluZyBjb3JyZWN0IGhhbmRsZWQuCisgICAgICAgIEFkZGluZyBleHBlY3RlZCByZXN1bHRz IGZvciBjb250ZXh0LW5vLWRlc2VsZWN0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1NraXBw ZWQ6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2NvbnRleHQtbm8tZGVzZWxl Y3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAxMC0wMi0wMiAgQWxleGV5IFByb3NrdXJ5YWtv diAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5k ZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCShyZXZpc2lvbiA1NDI0MykKKysrIExheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCSh3b3JraW5nIGNvcHkpCkBAIC0xMzI5LDE0ICsxMzI5 LDEyIEBAIGZhc3QvZXZlbnRzL2F1dG9zY3JvbGwtd2l0aC1ub24tc2Nyb2xsYWIKIGZhc3QvZXZl bnRzL2JsdXItZm9jdXMtd2luZG93LXNob3VsZC1ibHVyLWZvY3VzLWVsZW1lbnQuaHRtbAogZmFz dC9ldmVudHMvY2xpY2stY291bnQuaHRtbAogZmFzdC9ldmVudHMvY29udGVudC1jaGFuZ2VkLWR1 cmluZy1kcm9wLmh0bWwKLWZhc3QvZXZlbnRzL2NvbnRleHQtb25tb3VzZWRvd24tZXZlbnQuaHRt bAogZmFzdC9ldmVudHMvY3Jhc2gtb24tbXV0YXRlLWR1cmluZy1kcm9wLmh0bWwKIGZhc3QvZXZl bnRzL2RibGNsaWNrLWFkZEV2ZW50TGlzdGVuZXIuaHRtbAogZmFzdC9ldmVudHMvZHJhZy1pbi1m cmFtZXMuaHRtbAogZmFzdC9ldmVudHMvZnJhbWUtdGFiLWZvY3VzLmh0bWwKIGZhc3QvZXZlbnRz L2pzLWtleWJvYXJkLWV2ZW50LWNyZWF0aW9uLmh0bWwKIGZhc3QvZXZlbnRzL21vdXNlLWNsaWNr LWV2ZW50cy5odG1sCi1mYXN0L2V2ZW50cy9tb3VzZWNsaWNrLXRhcmdldC1hbmQtcG9zaXRpb25p bmcuaHRtbAogZmFzdC9ldmVudHMvbW91c2V1cC1mcm9tLWJ1dHRvbjIuaHRtbAogZmFzdC9ldmVu dHMvb2Zmc2V0WC1vZmZzZXRZLmh0bWwKIGZhc3QvZXZlbnRzL29uY2hhbmdlLXBhc3N3b3JkZmll bGQuaHRtbApAQCAtMTM1MSw3ICsxMzQ5LDYgQEAgZmFzdC9ldmVudHMvb3B0aW9uLXRhYi5odG1s CiBmYXN0L2V2ZW50cy9wYWdlc2hvdy1wYWdlaGlkZS1vbi1iYWNrLWNhY2hlZC13aXRoLWZyYW1l cy5odG1sCiBmYXN0L2V2ZW50cy9wb2ludGVyLWV2ZW50cy0yLmh0bWwKIGZhc3QvZXZlbnRzL3Bv cHVwLWJsb2NraW5nLWNsaWNrLWluLWlmcmFtZS5odG1sCi1mYXN0L2V2ZW50cy9yaWdodC1jbGlj ay1mb2N1cy5odG1sCiBmYXN0L2V2ZW50cy9zY3JvbGxiYXItZG91YmxlLWNsaWNrLmh0bWwKIGZh c3QvZXZlbnRzL3N0b3AtbG9hZC1pbi11bmxvYWQtaGFuZGxlci11c2luZy1kb2N1bWVudC13cml0 ZS5odG1sCiBmYXN0L2V2ZW50cy9zdG9wLWxvYWQtaW4tdW5sb2FkLWhhbmRsZXItdXNpbmctd2lu ZG93LXN0b3AuaHRtbApAQCAtMjI1Niw3ICsyMjUzLDYgQEAgZmFzdC9lbmNvZGluZy91dGYtMTYt bm8tYm9tLnhtbAogZmFzdC9lbmNvZGluZy94bWFjcm9tYW4tZW5jb2RpbmctdGVzdC5odG1sCiBm YXN0L2V2ZW50cy81MDU2NjE5Lmh0bWwKIGZhc3QvZXZlbnRzL2F1dG9zY3JvbGwuaHRtbAotZmFz dC9ldmVudHMvY29udGV4dC1uby1kZXNlbGVjdC5odG1sCiBmYXN0L2V2ZW50cy9ldmVudC1saXN0 ZW5lci1vbi1saW5rLmh0bWwKIGZhc3QvZXZlbnRzL2V2ZW50LXNlbmRlci1tb3VzZS1tb3ZlZC5o dG1sCiBmYXN0L2V2ZW50cy9mb2N1c2luZ1VubG9hZGVkRnJhbWUuaHRtbApJbmRleDogTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2NvbnRleHQtbm8tZGVzZWxlY3QtZXhwZWN0 ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2V2ZW50 cy9jb250ZXh0LW5vLWRlc2VsZWN0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0L2V2ZW50cy9jb250ZXh0LW5vLWRlc2VsZWN0LWV4cGVj dGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxNiBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6 ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAo MCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAw eDYwMAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzg0eDU4NAorICAgICAg UmVuZGVyVGV4dENvbnRyb2wge0lOUFVUfSBhdCAoMiwyKSBzaXplIDE3NXgyNiBbYmdjb2xvcj0j RkZGRkZGXQorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDApIHNpemUgMHgwCisgICAg ICBSZW5kZXJUZXh0IHsjdGV4dH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJlbmRlclRleHQg eyN0ZXh0fSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgw LDApIHNpemUgMHgwCitsYXllciBhdCAoMTMsMTMpIHNpemUgMTY5eDIwCisgIFJlbmRlckJsb2Nr IHtESVZ9IGF0ICgzLDMpIHNpemUgMTY5eDIwCisgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgx LDApIHNpemUgMTA4eDIwCisgICAgICB0ZXh0IHJ1biBhdCAoMSwwKSB3aWR0aCAxMDg6ICJzb21l IHNhbXBsZSB0ZXh0Igorc2VsZWN0aW9uIHN0YXJ0OiBwb3NpdGlvbiA1IG9mIGNoaWxkIDAgeyN0 ZXh0fSBvZiBjaGlsZCAwIHtESVZ9IG9mIGNoaWxkIDEge0lOUFVUfSBvZiBjaGlsZCAxIHtCT0RZ fSBvZiBjaGlsZCAwIHtIVE1MfSBvZiBkb2N1bWVudAorc2VsZWN0aW9uIGVuZDogICBwb3NpdGlv biAxNSBvZiBjaGlsZCAwIHsjdGV4dH0gb2YgY2hpbGQgMCB7RElWfSBvZiBjaGlsZCAxIHtJTlBV VH0gb2YgY2hpbGQgMSB7Qk9EWX0gb2YgY2hpbGQgMCB7SFRNTH0gb2YgZG9jdW1lbnQK 49096 2010-02-19 11:03:33 -0800 2010-03-01 17:12:23 -0800 Proposed patch 20100219_rightclickfocus_29177_4.patch text/plain 8936 jmillan SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NTAyMCkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDItMTkgIEpvc8OpIE1pbGzDoW4gU290byAg PGptaWxsYW5AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBbR1RLXSBSaWdodCBjbGljayBkb2VzIG5vdCBhY3RpdmF0ZSB0ZXh0IGVu dHJ5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE3 NworCisgICAgICAgIE1ha2VzIHRoZSBmcmFtZSBoYW5kbGUgdGhlIG1vdXNlIGNsaWNrIGV2ZW50 IGJlZm9yZSBzZW5kaW5nIHRoZQorICAgICAgICBjb250ZXh0IG1lbnUgZXZlbnQuCisKKyAgICAg ICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgIChQb3B1cE1lbnVQb3NpdGlv bkZ1bmMpOgorICAgICAgICBGdW5jdGlvbiBjcmVhdGVkIHRvIG1ha2UgdGhlIHBvcHVwIG1lbnUg YXBwZWFyIGluIHRoZSBjb3JyZWN0IHBvc2l0aW9uLCBlc3BlY2lhbGx5CisgICAgICAgIHdoZW4g aW52b2tlZCBmcm9tIHRoZSBrZXlib2FyZC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19mb3J3 YXJkX2NvbnRleHRfbWVudV9ldmVudCk6CisgICAgICAgIE1vdXNlIGNsaWNrIGV2ZW50IGlzIHNl bnQgdG8gZnJhbWUgYmVmb3JlIGNyZWF0aW5nIGNvbnRleHQgbWVudSwKKyAgICAgICAgUG9wdXBN ZW51UG9zaXRpb25GdW5jIHVzZWQgdG8gZGV0ZXJtaW5lIHRoZSBwb3NpdGlvbiB3aGVyZSB0aGUg bWVudSBzaG91bGQgYXBwZWFyLgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3BvcHVwX21lbnVf aGFuZGxlcik6CisgICAgICAgIEltcHJvdmVkIGZvY3VzZWQgbm9kZSBwb3NpdGlvbiBkZXRlY3Rp b24uIEV2ZW50IGJ1dHRvbiBzZXQgdG8gcmlnaHQgYnV0dG9uLgorCiAyMDEwLTAyLTE4ICBEaWVn byBFc2NhbGFudGUgVXJyZWxvICA8ZGVzY2FsYW50ZUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEd1c3Rhdm8gTm9yb25oYSBTaWx2YS4KSW5kZXg6IFdlYktpdC9ndGsvd2Via2l0 L3dlYmtpdHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwCShyZXZpc2lvbiA1NTAxNikKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMDEsMzMgKzIwMSw2OSBAQCBzdGF0aWMg dm9pZCBkZXN0cm95X21lbnVfY2IoR3RrT2JqZWN0KiBvCiAgICAgcHJpdi0+Y3VycmVudE1lbnUg PSBOVUxMOwogfQogCitzdGF0aWMgdm9pZCBQb3B1cE1lbnVQb3NpdGlvbkZ1bmMoR3RrTWVudSog bWVudSwgZ2ludCAqeCwgZ2ludCAqeSwgZ2Jvb2xlYW4gKnB1c2hJbiwgZ3BvaW50ZXIgdXNlckRh dGEpCit7CisgICAgV2ViS2l0V2ViVmlldyogdmlldyA9IFdFQktJVF9XRUJfVklFVyh1c2VyRGF0 YSk7CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBXRUJLSVRfV0VCX1ZJRVdfR0VU X1BSSVZBVEUodmlldyk7CisgICAgR2RrU2NyZWVuKiBzY3JlZW4gPSBndGtfd2lkZ2V0X2dldF9z Y3JlZW4oR1RLX1dJREdFVCh2aWV3KSk7CisgICAgR3RrUmVxdWlzaXRpb24gbWVudVNpemU7CisK KyAgICBndGtfd2lkZ2V0X3NpemVfcmVxdWVzdChHVEtfV0lER0VUKG1lbnUpLCAmbWVudVNpemUp OworCisgICAgKnggPSBwcml2LT5sYXN0UG9wdXBYUG9zaXRpb247CisgICAgaWYgKCgqeCArIG1l bnVTaXplLndpZHRoKSA+PSBnZGtfc2NyZWVuX2dldF93aWR0aChzY3JlZW4pKQorICAgICAgKngg LT0gbWVudVNpemUud2lkdGg7CisKKyAgICAqeSA9IHByaXYtPmxhc3RQb3B1cFlQb3NpdGlvbjsK KyAgICBpZiAoKCp5ICsgbWVudVNpemUuaGVpZ2h0KSA+PSBnZGtfc2NyZWVuX2dldF9oZWlnaHQo c2NyZWVuKSkKKyAgICAgICp5IC09IG1lbnVTaXplLmhlaWdodDsKKworICAgICpwdXNoSW4gPSBG QUxTRTsKK30KKwogc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb3J3YXJkX2NvbnRl eHRfbWVudV9ldmVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBQbGF0Zm9ybU1vdXNl RXZlbnQmIGV2ZW50KQogewogICAgIFBhZ2UqIHBhZ2UgPSBjb3JlKHdlYlZpZXcpOwogICAgIHBh Z2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLT5jbGVhckNvbnRleHRNZW51KCk7Ci0gICAgRnJh bWUqIGZvY3VzZWRGcmFtZSA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWlu RnJhbWUoKTsKKyAgICBGcmFtZSogZm9jdXNlZEZyYW1lOworICAgIEZyYW1lKiBtYWluRnJhbWUg PSBwYWdlLT5tYWluRnJhbWUoKTsKKyAgICBnYm9vbGVhbiBtb3VzZVByZXNzRXZlbnRSZXN1bHQg PSBGQUxTRTsKIAotICAgIGlmICghZm9jdXNlZEZyYW1lLT52aWV3KCkpCisgICAgaWYgKCFtYWlu RnJhbWUtPnZpZXcoKSkKICAgICAgICAgcmV0dXJuIEZBTFNFOwogCi0gICAgZm9jdXNlZEZyYW1l LT52aWV3KCktPnNldEN1cnNvcihwb2ludGVyQ3Vyc29yKCkpOworICAgIG1haW5GcmFtZS0+dmll dygpLT5zZXRDdXJzb3IocG9pbnRlckN1cnNvcigpKTsKKyAgICBpZiAocGFnZS0+ZnJhbWVDb3Vu dCgpKSB7CisgICAgICAgIEhpdFRlc3RSZXF1ZXN0IHJlcXVlc3QoSGl0VGVzdFJlcXVlc3Q6OkFj dGl2ZSk7CisgICAgICAgIEludFBvaW50IHBvaW50ID0gbWFpbkZyYW1lLT52aWV3KCktPndpbmRv d1RvQ29udGVudHMoZXZlbnQucG9zKCkpOworICAgICAgICBNb3VzZUV2ZW50V2l0aEhpdFRlc3RS ZXN1bHRzIG1ldiA9IG1haW5GcmFtZS0+ZG9jdW1lbnQoKS0+cHJlcGFyZU1vdXNlRXZlbnQocmVx dWVzdCwgcG9pbnQsIGV2ZW50KTsKKworICAgICAgICBGcmFtZSogdGFyZ2V0RnJhbWUgPSBFdmVu dEhhbmRsZXI6OnN1YmZyYW1lRm9yVGFyZ2V0Tm9kZShtZXYudGFyZ2V0Tm9kZSgpKTsKKyAgICAg ICAgaWYgKCF0YXJnZXRGcmFtZSkKKyAgICAgICAgICAgIHRhcmdldEZyYW1lID0gbWFpbkZyYW1l OworCisgICAgICAgIGZvY3VzZWRGcmFtZSA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1 c2VkT3JNYWluRnJhbWUoKTsKKyAgICAgICAgaWYgKHRhcmdldEZyYW1lICE9IGZvY3VzZWRGcmFt ZSkgeworICAgICAgICAgICAgcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEZvY3VzZWRGcmFt ZSh0YXJnZXRGcmFtZSk7CisgICAgICAgICAgICBmb2N1c2VkRnJhbWUgPSB0YXJnZXRGcmFtZTsK KyAgICAgICAgfQorICAgIH0gZWxzZQorICAgICAgICBmb2N1c2VkRnJhbWUgPSBtYWluRnJhbWU7 CisKKyAgICBpZiAoZm9jdXNlZEZyYW1lLT52aWV3KCkgJiYgZm9jdXNlZEZyYW1lLT5ldmVudEhh bmRsZXIoKS0+aGFuZGxlTW91c2VQcmVzc0V2ZW50KGV2ZW50KSkKKyAgICAgICAgbW91c2VQcmVz c0V2ZW50UmVzdWx0ID0gVFJVRTsKKworCiAgICAgYm9vbCBoYW5kbGVkRXZlbnQgPSBmb2N1c2Vk RnJhbWUtPmV2ZW50SGFuZGxlcigpLT5zZW5kQ29udGV4dE1lbnVFdmVudChldmVudCk7CiAgICAg aWYgKCFoYW5kbGVkRXZlbnQpCiAgICAgICAgIHJldHVybiBGQUxTRTsKIAogICAgIC8vIElmIGNv cmVNZW51IGlzIE5VTEwsIHRoaXMgbWVhbnMgV2ViQ29yZSBkZWNpZGVkIHRvIG5vdCBjcmVhdGUK LSAgICAvLyB0aGUgZGVmYXVsdCBjb250ZXh0IG1lbnU7IHRoaXMgbWF5IHN0aWxsIG1lYW4gdGhh dCB0aGUgZnJhbWUKLSAgICAvLyB3YW50cyB0byBjb25zdW1lIHRoZSBldmVudCAtIHRoaXMgaGFw cGVucyB3aGVuIHRoZSBwYWdlIGlzCi0gICAgLy8gaGFuZGxpbmcgdGhlIHJpZ2h0LWNsaWNrIGZv ciByZWFzb25zIG90aGVyIHRoYW4gYSBjb250ZXh0IG1lbnUsCi0gICAgLy8gc28gd2UgZ2l2ZSBp dCB0byBpdC4KKyAgICAvLyB0aGUgZGVmYXVsdCBjb250ZXh0IG1lbnU7IHRoaXMgbWF5IGhhcHBl biB3aGVuIHRoZSBwYWdlIGlzCisgICAgLy8gaGFuZGxpbmcgdGhlIHJpZ2h0LWNsaWNrIGZvciBy ZWFzb25zIG90aGVyIHRoYW4gdGhlIGNvbnRleHQgbWVudS4KICAgICBDb250ZXh0TWVudSogY29y ZU1lbnUgPSBwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS0+Y29udGV4dE1lbnUoKTsKLSAg ICBpZiAoIWNvcmVNZW51KSB7Ci0gICAgICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldykt Pm1haW5GcmFtZSgpOwotICAgICAgICBpZiAoZnJhbWUtPnZpZXcoKSAmJiBmcmFtZS0+ZXZlbnRI YW5kbGVyKCktPmhhbmRsZU1vdXNlUHJlc3NFdmVudChQbGF0Zm9ybU1vdXNlRXZlbnQoZXZlbnQp KSkKLSAgICAgICAgICAgIHJldHVybiBUUlVFOwotCi0gICAgICAgIHJldHVybiBGQUxTRTsKLSAg ICB9CisgICAgaWYgKCFjb3JlTWVudSkKKyAgICAgICAgcmV0dXJuIG1vdXNlUHJlc3NFdmVudFJl c3VsdDsKIAogICAgIC8vIElmIHdlIHJlYWNoIGhlcmUsIGl0J3MgYmVjYXVzZSBXZWJDb3JlIGlz IGdvaW5nIHRvIHNob3cgdGhlCiAgICAgLy8gZGVmYXVsdCBjb250ZXh0IG1lbnUuIFdlIGNoZWNr IG91ciBzZXR0aW5nIHRvIGZpZ3VyZSBvdXQKQEAgLTI2MSw4ICsyOTcsOCBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvcndhcmRfCiAgICAgICAgICAgICAgICAgICAgICBOVUxM KTsKIAogICAgIGd0a19tZW51X3BvcHVwKG1lbnUsIE5VTEwsIE5VTEwsCi0gICAgICAgICAgICAg ICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICBwcml2LCBldmVudC5idXR0b24oKSArIDEs IGd0a19nZXRfY3VycmVudF9ldmVudF90aW1lKCkpOworICAgICAgICAgICAgICAgICAgICZQb3B1 cE1lbnVQb3NpdGlvbkZ1bmMsCisgICAgICAgICAgICAgICAgICAgd2ViVmlldywgZXZlbnQuYnV0 dG9uKCkgKyAxLCBndGtfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZSgpKTsKICAgICByZXR1cm4gVFJV RTsKIH0KIApAQCAtMjcyLDE3ICszMDgsMTkgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJf dmlld19wb3B1cF9tZQogCiAgICAgLy8gVGhlIGNvbnRleHQgbWVudSBldmVudCB3YXMgZ2VuZXJh dGVkIGZyb20gdGhlIGtleWJvYXJkLCBzbyBzaG93IHRoZSBjb250ZXh0IG1lbnUgYnkgdGhlIGN1 cnJlbnQgc2VsZWN0aW9uLgogICAgIFBhZ2UqIHBhZ2UgPSBjb3JlKFdFQktJVF9XRUJfVklFVyh3 aWRnZXQpKTsKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBwYWdlLT5tYWluRnJhbWUoKS0+dmlldygp OworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JN YWluRnJhbWUoKTsKKyAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOwogICAgIGlm ICghdmlldykKICAgICAgICAgcmV0dXJuIEZBTFNFOyAgICAKIAotICAgIFBvc2l0aW9uIHN0YXJ0 ID0gcGFnZS0+bWFpbkZyYW1lKCktPnNlbGVjdGlvbigpLT5zZWxlY3Rpb24oKS5zdGFydCgpOwot ICAgIFBvc2l0aW9uIGVuZCA9IHBhZ2UtPm1haW5GcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2VsZWN0 aW9uKCkuZW5kKCk7CisgICAgUG9zaXRpb24gc3RhcnQgPSBmcmFtZS0+c2VsZWN0aW9uKCktPnNl bGVjdGlvbigpLnN0YXJ0KCk7CisgICAgUG9zaXRpb24gZW5kID0gZnJhbWUtPnNlbGVjdGlvbigp LT5zZWxlY3Rpb24oKS5lbmQoKTsKIAogICAgIGludCByaWdodEFsaWduZWQgPSBGQUxTRTsKICAg ICBJbnRQb2ludCBsb2NhdGlvbjsKIAotICAgIGlmICghc3RhcnQubm9kZSgpIHx8ICFlbmQubm9k ZSgpKQorICAgIGlmICghc3RhcnQubm9kZSgpIHx8ICFlbmQubm9kZSgpCisgICAgICAgIHx8IChm cmFtZS0+c2VsZWN0aW9uKCktPnNlbGVjdGlvbigpLmlzQ2FyZXQoKSAmJiAhZnJhbWUtPnNlbGVj dGlvbigpLT5zZWxlY3Rpb24oKS5pc0NvbnRlbnRFZGl0YWJsZSgpKSkKICAgICAgICAgbG9jYXRp b24gPSBJbnRQb2ludChyaWdodEFsaWduZWQgPyB2aWV3LT5jb250ZW50c1dpZHRoKCkgLSBjb250 ZXh0TWVudU1hcmdpbiA6IGNvbnRleHRNZW51TWFyZ2luLCBjb250ZXh0TWVudU1hcmdpbik7CiAg ICAgZWxzZSB7CiAgICAgICAgIFJlbmRlck9iamVjdCogcmVuZGVyZXIgPSBzdGFydC5ub2RlKCkt PnJlbmRlcmVyKCk7CkBAIC0zMjgsOCArMzY2LDE3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRf d2ViX3ZpZXdfcG9wdXBfbWUKICAgICAvLyBGSVhNRTogVGhlIEludFNpemUoMCwgLTEpIGlzIGEg aGFjayB0byBnZXQgdGhlIGhpdC10ZXN0aW5nIHRvIHJlc3VsdCBpbiB0aGUgc2VsZWN0ZWQgZWxl bWVudC4KICAgICAvLyBJZGVhbGx5IHdlJ2QgaGF2ZSB0aGUgcG9zaXRpb24gb2YgYSBjb250ZXh0 IG1lbnUgZXZlbnQgYmUgc2VwYXJhdGUgZnJvbSBpdHMgdGFyZ2V0IG5vZGUuCiAgICAgbG9jYXRp b24gPSB2aWV3LT5jb250ZW50c1RvV2luZG93KGxvY2F0aW9uKSArIEludFNpemUoMCwgLTEpOwor ICAgIGlmIChsb2NhdGlvbi55KCkgPCAwKQorICAgICAgICBsb2NhdGlvbi5zZXRZKGNvbnRleHRN ZW51TWFyZ2luKTsKKyAgICBlbHNlIGlmIChsb2NhdGlvbi55KCkgPiB2aWV3LT5oZWlnaHQoKSkK KyAgICAgICAgbG9jYXRpb24uc2V0WSh2aWV3LT5oZWlnaHQoKSAtIGNvbnRleHRNZW51TWFyZ2lu KTsKKyAgICBpZiAobG9jYXRpb24ueCgpIDwgMCkKKyAgICAgICAgbG9jYXRpb24uc2V0WChjb250 ZXh0TWVudU1hcmdpbik7CisgICAgZWxzZSBpZiAobG9jYXRpb24ueCgpID4gdmlldy0+d2lkdGgo KSkKKyAgICAgICAgbG9jYXRpb24uc2V0WCh2aWV3LT53aWR0aCgpIC0gY29udGV4dE1lbnVNYXJn aW4pOwogICAgIEludFBvaW50IGdsb2JhbCA9IGxvY2F0aW9uICsgSW50U2l6ZSh4LCB5KTsKLSAg ICBQbGF0Zm9ybU1vdXNlRXZlbnQgZXZlbnQobG9jYXRpb24sIGdsb2JhbCwgTm9CdXR0b24sIE1v dXNlRXZlbnRQcmVzc2VkLCAwLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCBmYWxzZSwgZ3RrX2dldF9j dXJyZW50X2V2ZW50X3RpbWUoKSk7CisKKyAgICBQbGF0Zm9ybU1vdXNlRXZlbnQgZXZlbnQobG9j YXRpb24sIGdsb2JhbCwgUmlnaHRCdXR0b24sIE1vdXNlRXZlbnRQcmVzc2VkLCAwLCBmYWxzZSwg ZmFsc2UsIGZhbHNlLCBmYWxzZSwgZ3RrX2dldF9jdXJyZW50X2V2ZW50X3RpbWUoKSk7CiAKICAg ICByZXR1cm4gd2Via2l0X3dlYl92aWV3X2ZvcndhcmRfY29udGV4dF9tZW51X2V2ZW50KFdFQktJ VF9XRUJfVklFVyh3aWRnZXQpLCBldmVudCk7CiB9CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1NTAyMCkK KysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDEwLTAyLTE5ICBKb3PDqSBNaWxsw6FuIFNvdG8gIDxqbWlsbGFuQGlnYWxpYS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gUmln aHQgY2xpY2sgZG9lcyBub3QgYWN0aXZhdGUgdGV4dCBlbnRyeQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNzcKKworICAgICAgICBTdG9wIHNraXBw aW5nIHNvbWUgdGVzdHMgd2hpY2ggd2hlcmUgZmFpbGluZyBiZWNhdXNlIG9mIHJpZ2h0IGNsaWNr CisgICAgICAgIG5vdCBiZWluZyBjb3JyZWN0IGhhbmRsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ndGsvU2tpcHBlZDoKKwogMjAxMC0wMi0xOSAgQW5kcmFzIEJlY3NpICA8YWJlY3NpQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4u CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkocmV2aXNpb24gNTUwMTYpCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkod29ya2luZyBjb3B5KQpAQCAtMTMzNSw3ICsx MzM1LDYgQEAgZmFzdC9ldmVudHMvZHJhZy1pbi1mcmFtZXMuaHRtbAogZmFzdC9ldmVudHMvZnJh bWUtdGFiLWZvY3VzLmh0bWwKIGZhc3QvZXZlbnRzL2pzLWtleWJvYXJkLWV2ZW50LWNyZWF0aW9u Lmh0bWwKIGZhc3QvZXZlbnRzL21vdXNlLWNsaWNrLWV2ZW50cy5odG1sCi1mYXN0L2V2ZW50cy9t b3VzZWNsaWNrLXRhcmdldC1hbmQtcG9zaXRpb25pbmcuaHRtbAogZmFzdC9ldmVudHMvbW91c2V1 cC1mcm9tLWJ1dHRvbjIuaHRtbAogZmFzdC9ldmVudHMvb2Zmc2V0WC1vZmZzZXRZLmh0bWwKIGZh c3QvZXZlbnRzL29uY2hhbmdlLXBhc3N3b3JkZmllbGQuaHRtbApAQCAtMTM1MCw3ICsxMzQ5LDYg QEAgZmFzdC9ldmVudHMvb3B0aW9uLXRhYi5odG1sCiBmYXN0L2V2ZW50cy9wYWdlc2hvdy1wYWdl aGlkZS1vbi1iYWNrLWNhY2hlZC13aXRoLWZyYW1lcy5odG1sCiBmYXN0L2V2ZW50cy9wb2ludGVy LWV2ZW50cy0yLmh0bWwKIGZhc3QvZXZlbnRzL3BvcHVwLWJsb2NraW5nLWNsaWNrLWluLWlmcmFt ZS5odG1sCi1mYXN0L2V2ZW50cy9yaWdodC1jbGljay1mb2N1cy5odG1sCiBmYXN0L2V2ZW50cy9z Y3JvbGxiYXItZG91YmxlLWNsaWNrLmh0bWwKIGZhc3QvZXZlbnRzL3N0b3AtbG9hZC1pbi11bmxv YWQtaGFuZGxlci11c2luZy1kb2N1bWVudC13cml0ZS5odG1sCiBmYXN0L2V2ZW50cy9zdG9wLWxv YWQtaW4tdW5sb2FkLWhhbmRsZXItdXNpbmctd2luZG93LXN0b3AuaHRtbAo=