36023 2010-03-11 11:26:35 -0800 [Chromium] Cmd-clicking submit buttons should submit in new tab 2010-03-12 09:04:01 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 1 thakis thakis commit-queue oldest_to_newest 198696 0 50519 thakis 2010-03-11 11:26:35 -0800 Created attachment 50519 Patch. Patch for the mouse part of http://crbug.com/32525 . 198788 1 50519 levin 2010-03-11 14:42:29 -0800 Comment on attachment 50519 Patch. > Index: WebKit/chromium/ChangeLog > =================================================================== > --- WebKit/chromium/ChangeLog (revision 55848) > +++ WebKit/chromium/ChangeLog (working copy) > @@ -1,3 +1,15 @@ > +2010-03-11 Nicolas Weber <thakis@chromium.org> > + > + Reviewed by NOBODY (OOPS!). Add bug title and bug link here. Like this: [Chromium] Cmd-clicking submit buttons should submit in new tab https://bugs.webkit.org/show_bug.cgi?id=36023 Then a blank line followed by your description. > + > + Take modifiers into account when clicking form buttons. E.g. > + cmd-clicking a submit button will submit in a new background tab, > + cmd-shift-clicking in a new foreground tab, shift-clicking in a new > + window. (On windows/linux, it's ctrl instead of cmd.) > + > + * src/FrameLoaderClientImpl.cpp: > + (WebKit::FrameLoaderClientImpl::actionSpecifiesNavigationPolicy): > + > Index: WebKit/chromium/src/FrameLoaderClientImpl.cpp > @@ -1477,13 +1477,25 @@ bool FrameLoaderClientImpl::actionSpecif > const NavigationAction& action, > WebNavigationPolicy* policy) > { > - if ((action.type() != NavigationTypeLinkClicked) || !action.event()->isMouseEvent()) > + if (action.type() == NavigationTypeLinkClicked > + && action.event()->isMouseEvent()) { > + const MouseEvent* event = > + static_cast<const MouseEvent*>(action.event()); > + return WebViewImpl::navigationPolicyFromMouseEvent( > + event->button(), event->ctrlKey(), event->shiftKey(), > + event->altKey(), event->metaKey(), policy); > + } else if (action.type() == NavigationTypeFormSubmitted > + && action.event() > + && action.event()->underlyingEvent() > + && action.event()->underlyingEvent()->isMouseEvent()) { > + const MouseEvent* event = > + static_cast<const MouseEvent*>(action.event()->underlyingEvent()); > + return WebViewImpl::navigationPolicyFromMouseEvent( > + event->button(), event->ctrlKey(), event->shiftKey(), > + event->altKey(), event->metaKey(), policy); > + } else { > return false; > + } There are several style issues here: 1. No need to stick to 80 columns strictly. (The code looks contorted in places to do this.) 2. When a clause ends with a "return", don't use else. 3. No braces for single line statements (the "return false;"). All that being said, it would be nice to have only one call to navigationPolicyFromMouseEvent since it looks heavy. I'd suggest this instead: const MouseEvent* event = 0; if (action.type() == NavigationTypeLinkClicked && action.event()->isMouseEvent()) event = static_cast<const MouseEvent*>(action.event()); else if (action.type() == NavigationTypeFormSubmitted && action.event() && action.event()->underlyingEvent() && action.event()->underlyingEvent()->isMouseEvent()) event = static_cast<const MouseEvent*>(action.event()->underlyingEvent()); if (!event) return false; return WebViewImpl::navigationPolicyFromMouseEvent( event->button(), event->ctrlKey(), event->shiftKey(), event->altKey(), event->metaKey(), policy); 198814 2 50553 thakis 2010-03-11 15:46:30 -0800 Created attachment 50553 New Patch. Thanks for the comments. 198835 3 50559 thakis 2010-03-11 16:36:57 -0800 Created attachment 50559 Rebase. 198870 4 50559 levin 2010-03-11 17:49:08 -0800 Comment on attachment 50559 Rebase. > Index: WebKit/chromium/src/FrameLoaderClientImpl.cpp > + if (action.type() == NavigationTypeLinkClicked > + && action.event()->isMouseEvent()) You really like wrapping this line :) 199086 5 50559 commit-queue 2010-03-12 09:03:56 -0800 Comment on attachment 50559 Rebase. Clearing flags on attachment: 50559 Committed r55908: <http://trac.webkit.org/changeset/55908> 199087 6 commit-queue 2010-03-12 09:04:01 -0800 All reviewed patches have been landed. Closing bug. 50519 2010-03-11 11:26:35 -0800 2010-03-11 15:46:30 -0800 Patch. tabform.patch text/plain 2529 thakis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMTEgIE5pY29s YXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRha2UgbW9kaWZpZXJzIGludG8gYWNjb3VudCB3aGVu IGNsaWNraW5nIGZvcm0gYnV0dG9ucy4gRS5nLgorICAgICAgICBjbWQtY2xpY2tpbmcgYSBzdWJt aXQgYnV0dG9uIHdpbGwgc3VibWl0IGluIGEgbmV3IGJhY2tncm91bmQgdGFiLAorICAgICAgICBj bWQtc2hpZnQtY2xpY2tpbmcgaW4gYSBuZXcgZm9yZWdyb3VuZCB0YWIsIHNoaWZ0LWNsaWNraW5n IGluIGEgbmV3CisgICAgICAgIHdpbmRvdy4gKE9uIHdpbmRvd3MvbGludXgsIGl0J3MgY3RybCBp bnN0ZWFkIG9mIGNtZC4pCisKKyAgICAgICAgKiBzcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6RnJhbWVMb2FkZXJDbGllbnRJbXBsOjphY3Rpb25TcGVjaWZp ZXNOYXZpZ2F0aW9uUG9saWN5KToKKwogMjAxMC0wMy0xMCAgRGFyaW4gRmlzaGVyICA8ZGFyaW5A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEplcmVteSBPcmxvdy4KSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5jcHAJKHJldmlz aW9uIDU1ODQ3KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudEltcGwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDc3LDEzICsxNDc3LDI1IEBAIGJvb2wgRnJhbWVMb2Fk ZXJDbGllbnRJbXBsOjphY3Rpb25TcGVjaWYKICAgICBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBh Y3Rpb24sCiAgICAgV2ViTmF2aWdhdGlvblBvbGljeSogcG9saWN5KQogewotICAgIGlmICgoYWN0 aW9uLnR5cGUoKSAhPSBOYXZpZ2F0aW9uVHlwZUxpbmtDbGlja2VkKSB8fCAhYWN0aW9uLmV2ZW50 KCktPmlzTW91c2VFdmVudCgpKQorICAgIGlmIChhY3Rpb24udHlwZSgpID09IE5hdmlnYXRpb25U eXBlTGlua0NsaWNrZWQKKyAgICAgICAgJiYgYWN0aW9uLmV2ZW50KCktPmlzTW91c2VFdmVudCgp KSB7CisgICAgICAgIGNvbnN0IE1vdXNlRXZlbnQqIGV2ZW50ID0KKyAgICAgICAgICAgIHN0YXRp Y19jYXN0PGNvbnN0IE1vdXNlRXZlbnQqPihhY3Rpb24uZXZlbnQoKSk7CisgICAgICAgIHJldHVy biBXZWJWaWV3SW1wbDo6bmF2aWdhdGlvblBvbGljeUZyb21Nb3VzZUV2ZW50KAorICAgICAgICAg ICAgZXZlbnQtPmJ1dHRvbigpLCBldmVudC0+Y3RybEtleSgpLCBldmVudC0+c2hpZnRLZXkoKSwK KyAgICAgICAgICAgIGV2ZW50LT5hbHRLZXkoKSwgZXZlbnQtPm1ldGFLZXkoKSwgcG9saWN5KTsK KyAgICB9IGVsc2UgaWYgKGFjdGlvbi50eXBlKCkgPT0gTmF2aWdhdGlvblR5cGVGb3JtU3VibWl0 dGVkCisgICAgICAgICYmIGFjdGlvbi5ldmVudCgpCisgICAgICAgICYmIGFjdGlvbi5ldmVudCgp LT51bmRlcmx5aW5nRXZlbnQoKQorICAgICAgICAmJiBhY3Rpb24uZXZlbnQoKS0+dW5kZXJseWlu Z0V2ZW50KCktPmlzTW91c2VFdmVudCgpKSB7CisgICAgICAgIGNvbnN0IE1vdXNlRXZlbnQqIGV2 ZW50ID0KKyAgICAgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IE1vdXNlRXZlbnQqPihhY3Rpb24u ZXZlbnQoKS0+dW5kZXJseWluZ0V2ZW50KCkpOworICAgICAgICByZXR1cm4gV2ViVmlld0ltcGw6 Om5hdmlnYXRpb25Qb2xpY3lGcm9tTW91c2VFdmVudCgKKyAgICAgICAgICAgIGV2ZW50LT5idXR0 b24oKSwgZXZlbnQtPmN0cmxLZXkoKSwgZXZlbnQtPnNoaWZ0S2V5KCksCisgICAgICAgICAgICBl dmVudC0+YWx0S2V5KCksIGV2ZW50LT5tZXRhS2V5KCksIHBvbGljeSk7CisgICAgfSBlbHNlIHsK ICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgY29uc3QgTW91c2VFdmVudCogZXZlbnQgPSBz dGF0aWNfY2FzdDxjb25zdCBNb3VzZUV2ZW50Kj4oYWN0aW9uLmV2ZW50KCkpOwotICAgIHJldHVy biBXZWJWaWV3SW1wbDo6bmF2aWdhdGlvblBvbGljeUZyb21Nb3VzZUV2ZW50KAotICAgICAgICBl dmVudC0+YnV0dG9uKCksIGV2ZW50LT5jdHJsS2V5KCksIGV2ZW50LT5zaGlmdEtleSgpLCBldmVu dC0+YWx0S2V5KCksCi0gICAgICAgIGV2ZW50LT5tZXRhS2V5KCksIHBvbGljeSk7CisgICAgfQog fQogCiB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6aGFuZGxlQmFja0ZvcndhcmROYXZpZ2F0 aW9uKGNvbnN0IEtVUkwmIHVybCkK 50553 2010-03-11 15:46:30 -0800 2010-03-11 16:36:57 -0800 New Patch. webkit-tabform.patch text/plain 2153 thakis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU4NDgpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMTEgIE5pY29s YXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQ21kLWNsaWNraW5nIHN1Ym1pdCBi dXR0b25zIHNob3VsZCBzdWJtaXQgaW4gbmV3IHRhYiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MDIzCisKKyAgICAgICAgVGFrZSBtb2RpZmllcnMg aW50byBhY2NvdW50IHdoZW4gY2xpY2tpbmcgZm9ybSBidXR0b25zLiBFLmcuCisgICAgICAgIGNt ZC1jbGlja2luZyBhIHN1Ym1pdCBidXR0b24gd2lsbCBzdWJtaXQgaW4gYSBuZXcgYmFja2dyb3Vu ZCB0YWIsCisgICAgICAgIGNtZC1zaGlmdC1jbGlja2luZyBpbiBhIG5ldyBmb3JlZ3JvdW5kIHRh Yiwgc2hpZnQtY2xpY2tpbmcgaW4gYSBuZXcKKyAgICAgICAgd2luZG93LiAoT24gd2luZG93cy9s aW51eCwgaXQncyBjdHJsIGluc3RlYWQgb2YgY21kLikKKworICAgICAgICAqIHNyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudElt cGw6OmFjdGlvblNwZWNpZmllc05hdmlnYXRpb25Qb2xpY3kpOgorCiAyMDEwLTAzLTEwICBEYXJp biBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVy ZW15IE9ybG93LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudElt cGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGll bnRJbXBsLmNwcAkocmV2aXNpb24gNTU4NDcpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1l TG9hZGVyQ2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NzcsMTMgKzE0NzcsMjIg QEAgYm9vbCBGcmFtZUxvYWRlckNsaWVudEltcGw6OmFjdGlvblNwZWNpZgogICAgIGNvbnN0IE5h dmlnYXRpb25BY3Rpb24mIGFjdGlvbiwKICAgICBXZWJOYXZpZ2F0aW9uUG9saWN5KiBwb2xpY3kp CiB7Ci0gICAgaWYgKChhY3Rpb24udHlwZSgpICE9IE5hdmlnYXRpb25UeXBlTGlua0NsaWNrZWQp IHx8ICFhY3Rpb24uZXZlbnQoKS0+aXNNb3VzZUV2ZW50KCkpCisgICAgY29uc3QgTW91c2VFdmVu dCogZXZlbnQgPSAwOworICAgIGlmIChhY3Rpb24udHlwZSgpID09IE5hdmlnYXRpb25UeXBlTGlu a0NsaWNrZWQKKyAgICAgICAgJiYgYWN0aW9uLmV2ZW50KCktPmlzTW91c2VFdmVudCgpKQorICAg ICAgICBldmVudCA9IHN0YXRpY19jYXN0PGNvbnN0IE1vdXNlRXZlbnQqPihhY3Rpb24uZXZlbnQo KSk7CisgICAgZWxzZSBpZiAoYWN0aW9uLnR5cGUoKSA9PSBOYXZpZ2F0aW9uVHlwZUZvcm1TdWJt aXR0ZWQKKyAgICAgICAgICAgICAmJiBhY3Rpb24uZXZlbnQoKQorICAgICAgICAgICAgICYmIGFj dGlvbi5ldmVudCgpLT51bmRlcmx5aW5nRXZlbnQoKQorICAgICAgICAgICAgICYmIGFjdGlvbi5l dmVudCgpLT51bmRlcmx5aW5nRXZlbnQoKS0+aXNNb3VzZUV2ZW50KCkpCisgICAgICAgIGV2ZW50 ID0gc3RhdGljX2Nhc3Q8Y29uc3QgTW91c2VFdmVudCo+KGFjdGlvbi5ldmVudCgpLT51bmRlcmx5 aW5nRXZlbnQoKSk7CisKKyAgICBpZiAoIWV2ZW50KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBjb25zdCBNb3VzZUV2ZW50KiBldmVudCA9IHN0YXRpY19jYXN0PGNvbnN0IE1vdXNlRXZl bnQqPihhY3Rpb24uZXZlbnQoKSk7CiAgICAgcmV0dXJuIFdlYlZpZXdJbXBsOjpuYXZpZ2F0aW9u UG9saWN5RnJvbU1vdXNlRXZlbnQoCiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjpo YW5kbGVCYWNrRm9yd2FyZE5hdmlnYXRpb24oY29uc3QgS1VSTCYgdXJsKQo= 50559 2010-03-11 16:36:57 -0800 2010-03-12 09:03:56 -0800 Rebase. webkit-tabform.patch text/plain 2192 thakis SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU4NjUpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMTEgIE5pY29s YXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gQ21kLWNsaWNraW5nIHN1Ym1pdCBi dXR0b25zIHNob3VsZCBzdWJtaXQgaW4gbmV3IHRhYiAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MDIzCisKKyAgICAgICAgVGFrZSBtb2RpZmllcnMg aW50byBhY2NvdW50IHdoZW4gY2xpY2tpbmcgZm9ybSBidXR0b25zLiBFLmcuCisgICAgICAgIGNt ZC1jbGlja2luZyBhIHN1Ym1pdCBidXR0b24gd2lsbCBzdWJtaXQgaW4gYSBuZXcgYmFja2dyb3Vu ZCB0YWIsCisgICAgICAgIGNtZC1zaGlmdC1jbGlja2luZyBpbiBhIG5ldyBmb3JlZ3JvdW5kIHRh Yiwgc2hpZnQtY2xpY2tpbmcgaW4gYSBuZXcKKyAgICAgICAgd2luZG93LiAoT24gd2luZG93cy9s aW51eCwgaXQncyBjdHJsIGluc3RlYWQgb2YgY21kLikKKworICAgICAgICAqIHNyYy9GcmFtZUxv YWRlckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudElt cGw6OmFjdGlvblNwZWNpZmllc05hdmlnYXRpb25Qb2xpY3kpOgorCiAyMDEwLTAzLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2aWQgSHlhdHQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50 SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNs aWVudEltcGwuY3BwCShyZXZpc2lvbiA1NTg2NSkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJh bWVMb2FkZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ3NywxMCArMTQ3Nywx OSBAQCBib29sIEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6YWN0aW9uU3BlY2lmCiAgICAgY29uc3Qg TmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLAogICAgIFdlYk5hdmlnYXRpb25Qb2xpY3kqIHBvbGlj eSkKIHsKLSAgICBpZiAoKGFjdGlvbi50eXBlKCkgIT0gTmF2aWdhdGlvblR5cGVMaW5rQ2xpY2tl ZCkgfHwgIWFjdGlvbi5ldmVudCgpLT5pc01vdXNlRXZlbnQoKSkKKyAgICBjb25zdCBNb3VzZUV2 ZW50KiBldmVudCA9IDA7CisgICAgaWYgKGFjdGlvbi50eXBlKCkgPT0gTmF2aWdhdGlvblR5cGVM aW5rQ2xpY2tlZAorICAgICAgICAmJiBhY3Rpb24uZXZlbnQoKS0+aXNNb3VzZUV2ZW50KCkpCisg ICAgICAgIGV2ZW50ID0gc3RhdGljX2Nhc3Q8Y29uc3QgTW91c2VFdmVudCo+KGFjdGlvbi5ldmVu dCgpKTsKKyAgICBlbHNlIGlmIChhY3Rpb24udHlwZSgpID09IE5hdmlnYXRpb25UeXBlRm9ybVN1 Ym1pdHRlZAorICAgICAgICAgICAgICYmIGFjdGlvbi5ldmVudCgpCisgICAgICAgICAgICAgJiYg YWN0aW9uLmV2ZW50KCktPnVuZGVybHlpbmdFdmVudCgpCisgICAgICAgICAgICAgJiYgYWN0aW9u LmV2ZW50KCktPnVuZGVybHlpbmdFdmVudCgpLT5pc01vdXNlRXZlbnQoKSkKKyAgICAgICAgZXZl bnQgPSBzdGF0aWNfY2FzdDxjb25zdCBNb3VzZUV2ZW50Kj4oYWN0aW9uLmV2ZW50KCktPnVuZGVy bHlpbmdFdmVudCgpKTsKKworICAgIGlmICghZXZlbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIGNvbnN0IE1vdXNlRXZlbnQqIGV2ZW50ID0gc3RhdGljX2Nhc3Q8Y29uc3QgTW91c2VF dmVudCo+KGFjdGlvbi5ldmVudCgpKTsKICAgICByZXR1cm4gV2ViVmlld0ltcGw6Om5hdmlnYXRp b25Qb2xpY3lGcm9tTW91c2VFdmVudCgKICAgICAgICAgZXZlbnQtPmJ1dHRvbigpLCBldmVudC0+ Y3RybEtleSgpLCBldmVudC0+c2hpZnRLZXkoKSwgZXZlbnQtPmFsdEtleSgpLAogICAgICAgICBl dmVudC0+bWV0YUtleSgpLCBwb2xpY3kpOwo=