47769 2010-10-16 07:48:57 -0700 [chromium] Keyboard+mouse selection in select popups only updated after unfocused 2011-05-04 10:48:03 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 progame+wk jcivelli commit-queue darin dglazkov eric fishd jcampan jcivelli rniwa oldest_to_newest 295131 0 70954 progame+wk 2010-10-16 07:48:57 -0700 Created attachment 70954 testcase 1. Download the testcase and follow the instructions: 2. Open the select element using the mouse by clicking on its downarrow 3. Type a letter [a,d] 4. Click on the highlighted item The box will close but wil not show the new selected item until the box is unfocused. If you select some other item instead of the one the keybaord search found, the selection will work as expected. Pressing the Enter key also works as expected. This regressed somewhere between 56426 and 56476. My guess is http://trac.webkit.org/changeset/56449/ (Bug 36062) inChromium issue: http://code.google.com/p/chromium/issues/detail?id=57124 342078 1 progame+wk 2011-01-29 04:05:13 -0800 it is possible that the regression window i posted is only true for Chromium, and Safari was affected even before that change. 346247 2 jcivelli 2011-02-06 00:45:46 -0800 I now understand the cause. With that CL we turned on the new behavior for the select popup: the actual popup window does not get the focus and we forward keyboard events to it. We were sending the keydown/up events but not the char ones. They would go to the focus element in the page, in that case the HTMLSelectElement, causing the weird behavior. Actually the behavior when selecting and item was broken, as the select is supposed to show the matching option as the selected one when you type a key. (like IE does). 346248 3 81393 jcivelli 2011-02-06 00:54:16 -0800 Created attachment 81393 Forward char event to select popups when one is showing. 346743 4 81393 fishd 2011-02-07 13:00:35 -0800 Comment on attachment 81393 Forward char event to select popups when one is showing. View in context: https://bugs.webkit.org/attachment.cgi?id=81393&action=review > Source/WebKit/chromium/src/WebViewImpl.cpp:722 > + // If there is a select popup, it should be the one processing that event, can you explain why this is the best place to put this delegation? why shouldn't this go further up? should we really call handleAccessKey if there is a popup present? etc. 347184 5 81604 jcivelli 2011-02-07 23:46:08 -0800 Created attachment 81604 Addressing fishd comment You are right Darin, we should not call any handler on the page. Actually when a select popup is showing, it should process any event key. I changed the keyEvent() to do just this (it used to pass the event to the page if the select popup would not handle it). 380564 6 81604 eric 2011-04-06 10:26:51 -0700 Comment on attachment 81604 Addressing fishd comment View in context: https://bugs.webkit.org/attachment.cgi?id=81604&action=review > Source/WebKit/chromium/ChangeLog:5 > + Send the char events to the select popup if one is showing to fix Tabs? Or just strange spacing? 392884 7 81604 ojan 2011-04-26 15:53:14 -0700 Comment on attachment 81604 Addressing fishd comment View in context: https://bugs.webkit.org/attachment.cgi?id=81604&action=review Just one concern. Otherwise the patch looks fine. > Source/WebKit/chromium/src/WebViewImpl.cpp:570 > + // If there is a select popup, it should be the one processing the event, > + // not the page. > + if (m_selectPopup) > + return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event)); seems like this should be after we set m_suppressNextKeypressEvent to false, no? > Source/WebKit/chromium/src/WebViewImpl.cpp:687 > + // If there is a select popup, it should be the one processing the event, > + // not the page. > + if (m_selectPopup) > + return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event)); seems like this should be after we set m_suppressNextKeypressEvent to false, no? 393845 8 91352 jcivelli 2011-04-27 14:43:10 -0700 Created attachment 91352 Patch 393846 9 81604 jcivelli 2011-04-27 14:43:26 -0700 Comment on attachment 81604 Addressing fishd comment View in context: https://bugs.webkit.org/attachment.cgi?id=81604&action=review >> Source/WebKit/chromium/ChangeLog:5 >> + Send the char events to the select popup if one is showing to fix > > Tabs? Or just strange spacing? Fixed. >> Source/WebKit/chromium/src/WebViewImpl.cpp:570 >> + return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event)); > > seems like this should be after we set m_suppressNextKeypressEvent to false, no? I guess you are right, if the keyEvent was to trigger a select popup, we might leave m_suppressNextKeypressEvent true which would interfere with the next key event sent to the renderer (once the popup is closed). 396437 10 91352 ojan 2011-05-02 10:13:15 -0700 Comment on attachment 91352 Patch Is there any way to test this code? I know we can't do it from layout tests, but can we do so from a chromium side test (e.g. a browser_test)? 397980 11 jcivelli 2011-05-04 09:39:08 -0700 I filed a bug on Chromium to write an interactive UI test for it. http://code.google.com/p/chromium/issues/detail?id=81550 I'll try to do that when I have some cycles. 398061 12 commit-queue 2011-05-04 10:46:51 -0700 The commit-queue encountered the following flaky tests while processing attachment 91352: http/tests/xmlhttprequest/cross-origin-authorization.html bug 52398 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 398062 13 91352 commit-queue 2011-05-04 10:47:56 -0700 Comment on attachment 91352 Patch Clearing flags on attachment: 91352 Committed r85759: <http://trac.webkit.org/changeset/85759> 398063 14 commit-queue 2011-05-04 10:48:03 -0700 All reviewed patches have been landed. Closing bug. 70954 2010-10-16 07:48:57 -0700 2010-10-16 07:48:57 -0700 testcase manual_testcase.html text/html 701 progame+wk CjwhLS0gc2F2ZWQgZnJvbSB1cmw9KDAwNDMpZmlsZTovLy9DOi9Eb3dubG9hZHMvdGVzdF9zZWxl Y3QlMjAoMikuaHRtbCAtLT4KPGh0bWw+PGhlYWQ+PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1U eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPgoKPC9oZWFkPjxib2R5Pk9w ZW4gdGhlIHNlbGVjdCBlbGVtZW50IHVzaW5nIHRoZSBtb3VzZSB0aGVuIHR5cGUgdGhlIGxldHRl ciBjLiAgVGhlIGFwcHJvcHJpYXRlIGVsZW1lbnQgc2hvdWxkIGJlIHNlbGVjdGVkLjxicj4KTm93 IGNsaWNrIG9uIHRoYXQgaGlnaGxpZ2h0ZWQgYyBpdGVtIHdpdGggdGhlIG1vdXNlLCB0aGUgc2Vs ZWN0IGVsZW1lbnQgc2hvdWxkIGNsb3NlIGJ1dCB3aWxsIG5vdCBzaG93IHRoZSBuZXcgYyBpdGVt IGFzIHNlbGVjdGVkIHVudGlsIHRoZSBzZWxlY3Rib3ggaXMgdW5mb2N1c2VkIChieSBjbGlja2lu ZyBvbiB0aGUgYmFja2dyb3VuZCBvZiB0aGlzIHBhZ2UpLjxicj48YnI+Cgo8c2VsZWN0PgogIDxv cHRpb24+YTwvb3B0aW9uPgogIDxvcHRpb24+Yjwvb3B0aW9uPgogIDxvcHRpb24+Yzwvb3B0aW9u PgogIDxvcHRpb24+ZDwvb3B0aW9uPgogIDxvcHRpb24+QTwvb3B0aW9uPgogIDxvcHRpb24+Qjwv b3B0aW9uPgogIDxvcHRpb24+Qzwvb3B0aW9uPgogIDxvcHRpb24+RDwvb3B0aW9uPgo8L3NlbGVj dD4KPC9ib2R5PjwvaHRtbD4= 81393 2011-02-06 00:54:16 -0800 2011-02-07 23:46:08 -0800 Forward char event to select popups when one is showing. select_popup_char_event.patch text/plain 1327 jcivelli SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3NzYyKQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NCBAQAorMjAxMS0wMi0wNiAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2VuZCB0aGUg Y2hhciBldmVudHMgdG8gdGhlIHNlbGVjdCBwb3B1cCBpZiBvbmUgaXMgc2hvd2luZyB0byBmaXgK KyAgICAgICAgYSBidWcgd2VyZSBwcmVzc2luZyBhIGxldHRlciB3b3VsZCBub3Qgc2VsZWN0IHRo ZSBtYXRjaGluZyBvcHRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD00Nzc2OQorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmNoYXJFdmVudCk6CisKIDIwMTEtMDItMDQgIENoYXJs aWUgUmVpcyAgPGNyZWlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaWhh aSBQYXJwYXJpdGEuCkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0NCi0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAJKHJldmlzaW9uIDc3Njg2KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MTksNiArNzE5LDExIEBAIGJvb2wg V2ViVmlld0ltcGw6OmNoYXJFdmVudChjb25zdCBXZWJLZXkKICAgICBpZiAoZXZ0LmlzU3lzdGVt S2V5KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIElmIHRoZXJlIGlzIGEgc2Vs ZWN0IHBvcHVwLCBpdCBzaG91bGQgYmUgdGhlIG9uZSBwcm9jZXNzaW5nIHRoYXQgZXZlbnQsCisg ICAgLy8gbm90IHRoZSBwYWdlLgorICAgIGlmIChtX3NlbGVjdFBvcHVwKQorICAgICAgICByZXR1 cm4gbV9zZWxlY3RQb3B1cC0+aGFuZGxlS2V5RXZlbnQoZXZ0KTsKKwogICAgIGlmICghc3VwcHJl c3MgJiYgIWhhbmRsZXItPmtleUV2ZW50KGV2dCkpCiAgICAgICAgIHJldHVybiBrZXlFdmVudERl ZmF1bHQoZXZlbnQpOwogCg== 81604 2011-02-07 23:46:08 -0800 2011-04-27 14:43:26 -0700 Addressing fishd comment select_popup_char_event.patch text/plain 3597 jcivelli SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc3OTEzKQorKysgU291 cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NiBAQAorMjAxMS0wMi0wNyAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICBTZW5kIHRoZSBj aGFyIGV2ZW50cyB0byB0aGUgc2VsZWN0IHBvcHVwIGlmIG9uZSBpcyBzaG93aW5nIHRvIGZpeAor ICAgICAgIGEgYnVnIHdlcmUgcHJlc3NpbmcgYSBsZXR0ZXIgd291bGQgbm90IHNlbGVjdCB0aGUg bWF0Y2hpbmcgb3B0aW9uLgorICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00Nzc2OQorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViVmlld0ltcGw6OmtleUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6OmNoYXJFdmVudCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTEt MDItMDcgIEFsZXhleSBNYXJpbmljaGV2ICA8YW1hcmluaWNoZXZAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFNvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAkocmV2aXNpb24gNzc2ODYpCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTU2NCw2ICs1NjQsMTEgQEAgYm9vbCBXZWJWaWV3SW1wbDo6a2V5RXZlbnQoY29uc3QgV2ViS2V5 YgogICAgICAgICB8fCAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpLZXlEb3duKQogICAg ICAgICB8fCAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpLZXlVcCkpOwogCisgICAgLy8g SWYgdGhlcmUgaXMgYSBzZWxlY3QgcG9wdXAsIGl0IHNob3VsZCBiZSB0aGUgb25lIHByb2Nlc3Np bmcgdGhlIGV2ZW50LAorICAgIC8vIG5vdCB0aGUgcGFnZS4KKyAgICBpZiAobV9zZWxlY3RQb3B1 cCkKKyAgICAgICAgcmV0dXJuIG1fc2VsZWN0UG9wdXAtPmhhbmRsZUtleUV2ZW50KFBsYXRmb3Jt S2V5Ym9hcmRFdmVudEJ1aWxkZXIoZXZlbnQpKTsKKwogICAgIC8vIFBsZWFzZSByZWZlciB0byB0 aGUgY29tbWVudHMgZXhwbGFpbmluZyB0aGUgbV9zdXBwcmVzc05leHRLZXlwcmVzc0V2ZW50CiAg ICAgLy8gbWVtYmVyLgogICAgIC8vIFRoZSBtX3N1cHByZXNzTmV4dEtleXByZXNzRXZlbnQgaXMg c2V0IGlmIHRoZSBLZXlEb3duIGlzIGhhbmRsZWQgYnkKQEAgLTU3MiwxMCArNTc3LDYgQEAgYm9v bCBXZWJWaWV3SW1wbDo6a2V5RXZlbnQoY29uc3QgV2ViS2V5YgogICAgIC8vIGV2ZW50LgogICAg IG1fc3VwcHJlc3NOZXh0S2V5cHJlc3NFdmVudCA9IGZhbHNlOwogCi0gICAgLy8gR2l2ZSBhbnkg c2VsZWN0IHBvcHVwIGEgY2hhbmNlIGF0IGNvbnN1bWluZyB0aGUga2V5IGV2ZW50LgotICAgIGlm IChzZWxlY3RQb3B1cEhhbmRsZUtleUV2ZW50KGV2ZW50KSkKLSAgICAgICAgcmV0dXJuIHRydWU7 Ci0KICAgICAvLyBHaXZlIEF1dG9jb21wbGV0ZSBhIGNoYW5jZSB0byBjb25zdW1lIHRoZSBrZXkg ZXZlbnRzIGl0IGlzIGludGVyZXN0ZWQgaW4uCiAgICAgaWYgKGF1dG9jb21wbGV0ZUhhbmRsZUtl eUV2ZW50KGV2ZW50KSkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC02MjUsMTQgKzYyNiw2IEBA IGJvb2wgV2ViVmlld0ltcGw6OmtleUV2ZW50KGNvbnN0IFdlYktleWIKICAgICByZXR1cm4ga2V5 RXZlbnREZWZhdWx0KGV2ZW50KTsKIH0KIAotYm9vbCBXZWJWaWV3SW1wbDo6c2VsZWN0UG9wdXBI YW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50JiBldmVudCkKLXsKLSAgICBpZiAo IW1fc2VsZWN0UG9wdXApCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBtX3Nl bGVjdFBvcHVwLT5oYW5kbGVLZXlFdmVudChQbGF0Zm9ybUtleWJvYXJkRXZlbnRCdWlsZGVyKGV2 ZW50KSk7Ci19Ci0KIGJvb2wgV2ViVmlld0ltcGw6OmF1dG9jb21wbGV0ZUhhbmRsZUtleUV2ZW50 KGNvbnN0IFdlYktleWJvYXJkRXZlbnQmIGV2ZW50KQogewogICAgIGlmICghbV9hdXRvRmlsbFBv cHVwU2hvd2luZwpAQCAtNjg4LDYgKzY4MSwxMSBAQCBib29sIFdlYlZpZXdJbXBsOjpjaGFyRXZl bnQoY29uc3QgV2ViS2V5CiB7CiAgICAgQVNTRVJUKGV2ZW50LnR5cGUgPT0gV2ViSW5wdXRFdmVu dDo6Q2hhcik7CiAKKyAgICAvLyBJZiB0aGVyZSBpcyBhIHNlbGVjdCBwb3B1cCwgaXQgc2hvdWxk IGJlIHRoZSBvbmUgcHJvY2Vzc2luZyB0aGUgZXZlbnQsCisgICAgLy8gbm90IHRoZSBwYWdlLgor ICAgIGlmIChtX3NlbGVjdFBvcHVwKQorICAgICAgICByZXR1cm4gbV9zZWxlY3RQb3B1cC0+aGFu ZGxlS2V5RXZlbnQoUGxhdGZvcm1LZXlib2FyZEV2ZW50QnVpbGRlcihldmVudCkpOworCiAgICAg Ly8gUGxlYXNlIHJlZmVyIHRvIHRoZSBjb21tZW50cyBleHBsYWluaW5nIHRoZSBtX3N1cHByZXNz TmV4dEtleXByZXNzRXZlbnQKICAgICAvLyBtZW1iZXIuICBUaGUgbV9zdXBwcmVzc05leHRLZXlw cmVzc0V2ZW50IGlzIHNldCBpZiB0aGUgS2V5RG93biBpcwogICAgIC8vIGhhbmRsZWQgYnkgV2Vi a2l0LiBBIGtleURvd24gZXZlbnQgaXMgdHlwaWNhbGx5IGFzc29jaWF0ZWQgd2l0aCBhCkluZGV4 OiBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkocmV2aXNpb24gNzc2 ODYpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCSh3b3JraW5n IGNvcHkpCkBAIC0zNzEsOSArMzcxLDYgQEAgcHJpdmF0ZToKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgdGhlIGV2ZW50IHdhcyBhY3R1YWxseSBwcm9jZXNzZWQuCiAgICAgYm9vbCBrZXlFdmVudERl ZmF1bHQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpOwogCi0gICAgLy8gUmV0dXJucyB0cnVlIGlm IHRoZSBzZWxlY3QgcG9wdXAgaGFzIGNvbnN1bWVkIHRoZSBldmVudC4KLSAgICBib29sIHNlbGVj dFBvcHVwSGFuZGxlS2V5RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpOwotCiAgICAgLy8g UmV0dXJucyB0cnVlIGlmIHRoZSBhdXRvY29tcGxlIGhhcyBjb25zdW1lZCB0aGUgZXZlbnQuCiAg ICAgYm9vbCBhdXRvY29tcGxldGVIYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50 Jik7CiAK 91352 2011-04-27 14:43:10 -0700 2011-05-04 10:47:56 -0700 Patch bug-47769-20110427144309.patch text/plain 3351 jcivelli U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5OTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg MTc4NTUzZjU3N2Q2YTJiMGUxNTY1NzRjMDhhZjNmZGVkZTVkZDk4ZC4uZWE3MTUxODg0OTM2NDU1 ZDYyZmE0MWRlY2VlNTQ5NTJmZWFmOGMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNiBAQAorMjAxMS0wNC0yNyAgSmF5IENpdmVsbGkgIDxqY2l2ZWxsaUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2VuZCB0aGUgY2hhciBldmVudHMgdG8gdGhlIHNlbGVjdCBwb3B1cCBpZiBvbmUgaXMgc2hvd2lu ZyB0byBmaXgKKyAgICAgICAgYSBidWcgd2VyZSBwcmVzc2luZyBhIGxldHRlciB3b3VsZCBub3Qg c2VsZWN0IHRoZSBtYXRjaGluZyBvcHRpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00Nzc2OQorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmtleUV2ZW50KToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OmNoYXJFdmVudCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs Lmg6CisKIDIwMTEtMDQtMjYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4NDk1MS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA0Nzk2NDFjNzc2ZGI1ZWVl MWJhZDQ5MDFhYmRiNzE5Mjc2OTkwMDBiLi42NTIwZWMzODkyMjM1NWU5NDJlY2IxZjJlZDFkNGE4 M2FkMDliNmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CkBAIC01ODgsOSArNTg4LDEwIEBAIGJvb2wgV2ViVmlld0ltcGw6OmtleUV2ZW50KGNvbnN0IFdl YktleWJvYXJkRXZlbnQmIGV2ZW50KQogICAgIC8vIGV2ZW50LgogICAgIG1fc3VwcHJlc3NOZXh0 S2V5cHJlc3NFdmVudCA9IGZhbHNlOwogCi0gICAgLy8gR2l2ZSBhbnkgc2VsZWN0IHBvcHVwIGEg Y2hhbmNlIGF0IGNvbnN1bWluZyB0aGUga2V5IGV2ZW50LgotICAgIGlmIChzZWxlY3RQb3B1cEhh bmRsZUtleUV2ZW50KGV2ZW50KSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgLy8gSWYgdGhl cmUgaXMgYSBzZWxlY3QgcG9wdXAsIGl0IHNob3VsZCBiZSB0aGUgb25lIHByb2Nlc3NpbmcgdGhl IGV2ZW50LAorICAgIC8vIG5vdCB0aGUgcGFnZS4KKyAgICBpZiAobV9zZWxlY3RQb3B1cCkKKyAg ICAgICAgcmV0dXJuIG1fc2VsZWN0UG9wdXAtPmhhbmRsZUtleUV2ZW50KFBsYXRmb3JtS2V5Ym9h cmRFdmVudEJ1aWxkZXIoZXZlbnQpKTsKIAogICAgIC8vIEdpdmUgQXV0b2NvbXBsZXRlIGEgY2hh bmNlIHRvIGNvbnN1bWUgdGhlIGtleSBldmVudHMgaXQgaXMgaW50ZXJlc3RlZCBpbi4KICAgICBp ZiAoYXV0b2NvbXBsZXRlSGFuZGxlS2V5RXZlbnQoZXZlbnQpKQpAQCAtNjM2LDE0ICs2MzcsNiBA QCBib29sIFdlYlZpZXdJbXBsOjprZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50JiBldmVu dCkKICAgICByZXR1cm4ga2V5RXZlbnREZWZhdWx0KGV2ZW50KTsKIH0KIAotYm9vbCBXZWJWaWV3 SW1wbDo6c2VsZWN0UG9wdXBIYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50JiBl dmVudCkKLXsKLSAgICBpZiAoIW1fc2VsZWN0UG9wdXApCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIHJldHVybiBtX3NlbGVjdFBvcHVwLT5oYW5kbGVLZXlFdmVudChQbGF0Zm9ybUtleWJv YXJkRXZlbnRCdWlsZGVyKGV2ZW50KSk7Ci19Ci0KIGJvb2wgV2ViVmlld0ltcGw6OmF1dG9jb21w bGV0ZUhhbmRsZUtleUV2ZW50KGNvbnN0IFdlYktleWJvYXJkRXZlbnQmIGV2ZW50KQogewogICAg IGlmICghbV9hdXRvRmlsbFBvcHVwU2hvd2luZwpAQCAtNzA3LDYgKzcwMCwxMSBAQCBib29sIFdl YlZpZXdJbXBsOjpjaGFyRXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAg Ym9vbCBzdXBwcmVzcyA9IG1fc3VwcHJlc3NOZXh0S2V5cHJlc3NFdmVudDsKICAgICBtX3N1cHBy ZXNzTmV4dEtleXByZXNzRXZlbnQgPSBmYWxzZTsKIAorICAgIC8vIElmIHRoZXJlIGlzIGEgc2Vs ZWN0IHBvcHVwLCBpdCBzaG91bGQgYmUgdGhlIG9uZSBwcm9jZXNzaW5nIHRoZSBldmVudCwKKyAg ICAvLyBub3QgdGhlIHBhZ2UuCisgICAgaWYgKG1fc2VsZWN0UG9wdXApCisgICAgICAgIHJldHVy biBtX3NlbGVjdFBvcHVwLT5oYW5kbGVLZXlFdmVudChQbGF0Zm9ybUtleWJvYXJkRXZlbnRCdWls ZGVyKGV2ZW50KSk7CisKICAgICBGcmFtZSogZnJhbWUgPSBmb2N1c2VkV2ViQ29yZUZyYW1lKCk7 CiAgICAgaWYgKCFmcmFtZSkKICAgICAgICAgcmV0dXJuIHN1cHByZXNzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggZjEwMjAyZjc2ZGE2Y2RlMzI2NTkwOWI0 ZmU2NWY3MGFhZGI4YmY5My4uMTkzYWUxZWJmNmUzYzhkMmFhNTMwMzE3ZTZkNDY3ZjhhZGE3ZDcz ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC0zNzUsOSAr Mzc1LDYgQEAgcHJpdmF0ZToKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIGV2ZW50IHdhcyBh Y3R1YWxseSBwcm9jZXNzZWQuCiAgICAgYm9vbCBrZXlFdmVudERlZmF1bHQoY29uc3QgV2ViS2V5 Ym9hcmRFdmVudCYpOwogCi0gICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZSBzZWxlY3QgcG9wdXAg aGFzIGNvbnN1bWVkIHRoZSBldmVudC4KLSAgICBib29sIHNlbGVjdFBvcHVwSGFuZGxlS2V5RXZl bnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpOwotCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRo ZSBhdXRvY29tcGxlIGhhcyBjb25zdW1lZCB0aGUgZXZlbnQuCiAgICAgYm9vbCBhdXRvY29tcGxl dGVIYW5kbGVLZXlFdmVudChjb25zdCBXZWJLZXlib2FyZEV2ZW50Jik7CiAK