44613 2010-08-25 09:06:30 -0700 [GTK] Provide Keyboard Events to Windowless plugins 2010-11-22 15:54:24 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC Linux RESOLVED FIXED http://www.communitymx.com/content/source/E5141/wmodetrans.htm P2 Normal --- 0 bharathwaaj.s webkit-unassigned abarth bharathwaaj.s commit-queue eric gustavo nicolas webkit.review.bot xan.lopez oldest_to_newest 269270 0 bharathwaaj.s 2010-08-25 09:06:30 -0700 Keyboard events are not being provided to plugins in windowless mode. This is observed from the code as PluginView::focusPluginElement() is not being called during handleMouseEvent. Patch coming soon. SVN TOT Revision: 61539 269278 1 65427 bharathwaaj.s 2010-08-25 09:17:54 -0700 Created attachment 65427 This patch focuses the plugin element when mouse clicked on plugin. Also while handling keyboard event, the XEvent is first initialized by calling initXEvent. Please find the initial patch to fix. This is my first time submitting. So please forgive if there are any mistakes in the attachment. 270379 2 xan.lopez 2010-08-27 01:32:25 -0700 The patch looks good, but would it be too much to ask to submit one patch per issue? They are not really related even though both are needed. Also, the formatting in the ChangeLog is a bit odd, the lines are too long. If you use emacs just press Alt-q to fix it. 270535 3 bharathwaaj.s 2010-08-27 09:17:41 -0700 (In reply to comment #2) > The patch looks good, but would it be too much to ask to submit one patch per issue? They are not really related even though both are needed. Also, the formatting in the ChangeLog is a bit odd, the lines are too long. If you use emacs just press Alt-q to fix it. Thanks for the comment. I've created a new bug for initializing keyboard event. https://bugs.webkit.org/show_bug.cgi?id=44771 270543 4 65723 bharathwaaj.s 2010-08-27 09:31:18 -0700 Created attachment 65723 Updated based on Xan's comment 270552 5 65723 xan.lopez 2010-08-27 09:44:57 -0700 Comment on attachment 65723 Updated based on Xan's comment LGTM. 270940 6 65723 commit-queue 2010-08-28 00:01:06 -0700 Comment on attachment 65723 Updated based on Xan's comment Rejecting patch 65723 from commit-queue. Failed to run "['WebKitTools/Scripts/test-webkitpy']" exit_code: 1 Last 500 characters of output: tForThreadsToFinishTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py", line 291, in test_exception self.assertRaises(ValueError, self.run_one_thread, 'Exception') AssertionError: ValueError not raised ---------------------------------------------------------------------- Ran 524 tests in 22.235s FAILED (failures=1) Full output: http://queues.webkit.org/results/3865044 274343 7 xan.lopez 2010-09-03 20:41:53 -0700 There's a test for this functionality in plugins/keyboard-events.html. Even with your patch attached I still get two kinds of failures there (the focus event is not received, and the keycodes are all wrong). Could you confirm this? 274344 8 eric 2010-09-03 20:45:20 -0700 Great! Lets file a bug about the failure and possibly unskip the test with gtk-specific results. :) glad to know we already have testing. We just need to turn it on for gtk eventually. :) 274420 9 66595 xan.lopez 2010-09-05 01:52:11 -0700 Created attachment 66595 pluginkeyboard.diff OK, took some time to try to make this pass the test. Two further fixes where needed, patch attached. 274531 10 bharathwaaj.s 2010-09-06 03:36:26 -0700 The new patch provided by Xan also fixes the following LayoutTests and needs to be removed from platform/gtk/Skipped file. plugins/mouse-events.html plugins/mouse-events-fixedpos.html plugins/geturlnotify-during-document-teardown.html plugins/private-browsing-mode.html 274612 11 66595 mrobinson 2010-09-06 07:27:54 -0700 Comment on attachment 66595 pluginkeyboard.diff LGTM! Please unskip the other three tests when landing your patch as well (if they are indeed passing for you as well). 274620 12 xan.lopez 2010-09-06 07:39:41 -0700 The mouse events are related to this, the other tests aren't, so I'll add those. 274621 13 66595 xan.lopez 2010-09-06 07:40:05 -0700 Comment on attachment 66595 pluginkeyboard.diff Landed as r66827 274623 14 xan.lopez 2010-09-06 07:40:32 -0700 Closing. 274640 15 webkit.review.bot 2010-09-06 08:17:09 -0700 http://trac.webkit.org/changeset/66827 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/66827 http://trac.webkit.org/changeset/66828 http://trac.webkit.org/changeset/66829 312574 16 nicolas 2010-11-22 15:54:24 -0800 Just found that 66827, sending a GdkEvent::keyval as if it was an valid XEvent::keycode is wrong. The original code was right, the XEvent::keycode matches the GdkEvent::hardware_keycode. Please have a look at the following bug for a fix: https://bugs.webkit.org/show_bug.cgi?id=49927 Obviously this is not covered by any test, so I might have to look into that. 65427 2010-08-25 09:17:54 -0700 2010-08-27 09:31:18 -0700 This patch focuses the plugin element when mouse clicked on plugin. Also while handling keyboard event, the XEvent is first initialized by calling initXEvent. gtkwindowlesspluginkeyboardevent.patch text/plain 2229 bharathwaaj.s SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjAxNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDgtMjUgIEJoYXJhdGh3YWFqIFNyaW5pdmFzYW4gIDxiaGFy YXRod2Fhai5zQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2 MTMKKworICAgICAgICBJbiBHVEssIGtleWJvYXJkIGV2ZW50cyBhcmUgbm90IGJlaW5nIHByb3Zp ZGVkIHRvIHBsdWdpbnMgaW4gd2luZG93bGVzcyBtb2RlLgorICAgICAgICBUaGlzIGlzIG9ic2Vy dmVkIGZyb20gdGhlIGNvZGUgYXMgUGx1Z2luVmlldzo6Zm9jdXNQbHVnaW5FbGVtZW50KCkgaXMK KyAgICAgICAgbm90IGJlaW5nIGNhbGxlZCBkdXJpbmcgaGFuZGxlTW91c2VFdmVudC4KKyAgICAg ICAgQWxzbyB3aGVuIHRoaXMgY29kZSB3YXMgYWRkZWQsIGJyb3dzZXIgY3Jhc2hlZCB3aGVuIGtl eSB3YXMgcHJlc3NlZC4KKyAgICAgICAgVGhpcyBjcmFzaCB3YXMgbm90IG9ic2VydmVkIHNvIGZh ciBiZWNhdXNlIGtleWJvYXJkIGV2ZW50IHdhcyBub3QKKyAgICAgICAgaGFuZGxlZC4gVGhlIHJl YXNvbiBpcyBiZWNhdXNlIHRoZSBYRXZlbnQgYmVpbmcgdXNlZCBpbiBoYW5kbGVLZXlib2FyZEV2 ZW50IGlzIG5vdAorICAgICAgICBiZWluZyBpbml0aWFsaXplZC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6aGFuZGxlS2V5Ym9hcmRFdmVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpoYW5kbGVNb3VzZUV2ZW50KToKKwogMjAxMC0w OC0yNSAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9ndGsv UGx1Z2luVmlld0d0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVn aW5WaWV3R3RrLmNwcAkocmV2aXNpb24gNjU4NTkpCisrKyBXZWJDb3JlL3BsdWdpbnMvZ3RrL1Bs dWdpblZpZXdHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVk ZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkVs ZW1lbnQuaCIKKyNpbmNsdWRlICJGb2N1c0NvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJGcmFtZUxv YWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZFJlcXVlc3QuaCIKICNpbmNsdWRlICJGcmFtZVRy ZWUuaCIKQEAgLTI5OSw2ICszMDAsNyBAQCB2b2lkIFBsdWdpblZpZXc6OmhhbmRsZUtleWJvYXJk RXZlbnQoS2V5CiAKICAgICBOUEV2ZW50IHhFdmVudDsKICNpZiBkZWZpbmVkKFhQX1VOSVgpCisg ICAgaW5pdFhFdmVudCgmeEV2ZW50KTsKICAgICBHZGtFdmVudEtleSogZ2RrRXZlbnQgPSBldmVu dC0+a2V5RXZlbnQoKS0+Z2RrRXZlbnRLZXkoKTsKIAogICAgIHhFdmVudC50eXBlID0gKGV2ZW50 LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmtleWRvd25FdmVudCkgPyAyIDogMzsgLy8gS2V5UHJl c3MvUmVsZWFzZSBnZXQgdW5zZXQgc29tZXdoZXJlCkBAIC00MjEsNiArNDIzLDEyIEBAIHZvaWQg UGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudChNb3VzZUUKICAgICBpZiAobV9pc1dpbmRvd2Vk KQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVz KCkubW91c2Vkb3duRXZlbnQpIHsKKyAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX3BhcmVudEZy YW1lLT5wYWdlKCkpCisgICAgICAgICAgICBwYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+c2V0QWN0 aXZlKHRydWUpOworICAgICAgICBmb2N1c1BsdWdpbkVsZW1lbnQoKTsKKyAgICB9CisKICAgICBO UEV2ZW50IHhFdmVudDsKICNpZiBkZWZpbmVkKFhQX1VOSVgpCiAgICAgaW5pdFhFdmVudCgmeEV2 ZW50KTsK 65723 2010-08-27 09:31:18 -0700 2010-09-05 01:52:55 -0700 Updated based on Xan's comment windowlesspluginkeyboardevent.patch text/plain 1591 bharathwaaj.s SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjIyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDgtMjcgIEJoYXJhdGh3YWFqIFNyaW5pdmFzYW4gIDxiaGFy YXRod2Fhai5zQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBLZXlib2FyZCBldmVudHMgYXJlIG5vdCBiZWluZyBwcm92aWRlZCB0byBw bHVnaW5zIGluIHdpbmRvd2xlc3MKKyAgICAgICAgbW9kZS4gVGhpcyBpcyBvYnNlcnZlZCBmcm9t IHRoZSBjb2RlIGFzCisgICAgICAgIFBsdWdpblZpZXc6OmZvY3VzUGx1Z2luRWxlbWVudCgpIGlz IG5vdCBiZWluZyBjYWxsZWQgZHVyaW5nCisgICAgICAgIGhhbmRsZU1vdXNlRXZlbnQuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDYxMworCisgICAg ICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGx1Z2lucy9ndGsvUGx1Z2lu Vmlld0d0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpoYW5kbGVNb3VzZUV2 ZW50KToKKwogMjAxMC0wOC0yNyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpJbmRleDogV2ViQ29y ZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs dWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCShyZXZpc2lvbiA2NTg1OSkKKysrIFdlYkNvcmUv cGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMz LDcgQEAKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgi CiAjaW5jbHVkZSAiRWxlbWVudC5oIgorI2luY2x1ZGUgIkZvY3VzQ29udHJvbGxlci5oIgogI2lu Y2x1ZGUgIkZyYW1lTG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkUmVxdWVzdC5oIgogI2lu Y2x1ZGUgIkZyYW1lVHJlZS5oIgpAQCAtNDIxLDYgKzQyMiwxMiBAQCB2b2lkIFBsdWdpblZpZXc6 OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VFCiAgICAgaWYgKG1faXNXaW5kb3dlZCkKICAgICAgICAg cmV0dXJuOwogCisgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNlZG93 bkV2ZW50KSB7CisgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9wYXJlbnRGcmFtZS0+cGFnZSgp KQorICAgICAgICAgICAgcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEFjdGl2ZSh0cnVlKTsK KyAgICAgICAgZm9jdXNQbHVnaW5FbGVtZW50KCk7CisgICAgfQorCiAgICAgTlBFdmVudCB4RXZl bnQ7CiAjaWYgZGVmaW5lZChYUF9VTklYKQogICAgIGluaXRYRXZlbnQoJnhFdmVudCk7Cg== 66595 2010-09-05 01:52:11 -0700 2010-09-06 07:40:05 -0700 pluginkeyboard.diff pluginkeyboard.diff text/plain 5549 xan.lopez RnJvbSBjNjcwODBmMTllMmFlYTJmNGU4YjllNmU3NzFjYjBjNjRiZTE2Yzc2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBT dW4sIDUgU2VwIDIwMTAgMTc6NTA6MjcgKzA5MDAKU3ViamVjdDogW1BBVENIXSBXZWJDb3JlOgoK MjAxMC0wOS0wNSAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBQcm92aWRlIEtleWJvYXJkIEV2 ZW50cyB0byBXaW5kb3dsZXNzIHBsdWdpbnMKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2MTMKCiAgICAgICAgRml4IGtleWJvYXJkIGV2ZW50IGRlbGl2 ZXJ5IGZvciB3aW5kb3dsZXNzIHBsdWdpbnMuCgogICAgICAgIEJhc2VkIG9uIGEgcGF0Y2ggYnkg QmhhcmF0aHdhYWouCgogICAgICAgICogcGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKICAgICAgICAo V2ViQ29yZTo6UGx1Z2luVmlldzo6aGFuZGxlRXZlbnQpOiBhbHNvIHRha2UgaW50byBhY2NvdW50 CiAgICAgICAgZm9jdXNlZHtpbixvdXR9IGV2ZW50cwogICAgICAgICogcGx1Z2lucy9ndGsvUGx1 Z2luVmlld0d0ay5jcHA6CiAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmhhbmRsZUtleWJv YXJkRXZlbnQpOiB3ZSB3YW50IHRoZSBrZXl2YWwKICAgICAgICBoZXJlLCBub3QgdGhlIGhhcmR3 YXJlIGtleWNvZGUKICAgICAgICAoV2ViQ29yZTo6UGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVu dCk6IGZvY3VzIHRoZSBwbHVnaW52aWV3IG9uIG1vdXNlIGV2ZW50cwoKTGF5b3V0VGVzdHM6Cgoy MDEwLTA5LTA1ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KCiAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHVEtdIFByb3ZpZGUgS2V5Ym9hcmQgRXZl bnRzIHRvIFdpbmRvd2xlc3MgcGx1Z2lucwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NDYxMwoKICAgICAgICBVbnNraXAgcGFzc2luZyB0ZXN0LgoKICAg ICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAg ICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvU2tpcHBlZCAgICAgIHwgICAgMSAtCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgIHwgICAxOSArKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BsdWdpbnMvUGx1Z2lu Vmlldy5jcHAgICAgICAgIHwgICAgNCArKy0tCiBXZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZp ZXdHdGsuY3BwIHwgICAgOSArKysrKysrKy0KIDUgZmlsZXMgY2hhbmdlZCwgNDAgaW5zZXJ0aW9u cygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWM1OGNlOC4uZmRhNmM0MyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDEwLTA5LTA1ICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBQ cm92aWRlIEtleWJvYXJkIEV2ZW50cyB0byBXaW5kb3dsZXNzIHBsdWdpbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NjEzCisKKyAgICAgICAgVW5z a2lwIHBhc3NpbmcgdGVzdC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOgorCiAy MDEwLTA5LTA0ICBTdGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmlu ZGV4IGYwOGM2MGIuLjZmNDlmZDQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC0zMjQ1 LDcgKzMyNDUsNiBAQCBwbHVnaW5zL2VtYmVkLWF0dHJpYnV0ZXMtc2V0dGluZy5odG1sCiBwbHVn aW5zL2dldC11cmwtd2l0aC1ibGFuay10YXJnZXQuaHRtbAogcGx1Z2lucy9tb3VzZS1ldmVudHMu aHRtbAogcGx1Z2lucy9tb3VzZS1ldmVudHMtZml4ZWRwb3MuaHRtbAotcGx1Z2lucy9rZXlib2Fy ZC1ldmVudHMuaHRtbAogcGx1Z2lucy9nZXR1cmxub3RpZnktZHVyaW5nLWRvY3VtZW50LXRlYXJk b3duLmh0bWwKIAogIyBUaGlzIHRlc3QgaXMgZm9yIGNsaWVudHMgdGhhdCBjaG9vc2UgdG8gbWFr ZSB0aGUgbWlzc2luZyBwbHVnaW4gaW5kaWNhdG9yIGEgYnV0dG9uCmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDUyYzY3NTUuLmQzMDUwYTkg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDktMDUgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IFByb3ZpZGUgS2V5Ym9hcmQgRXZlbnRzIHRvIFdpbmRvd2xlc3MgcGx1Z2lucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ2MTMKKworICAgICAgICBG aXgga2V5Ym9hcmQgZXZlbnQgZGVsaXZlcnkgZm9yIHdpbmRvd2xlc3MgcGx1Z2lucy4KKworICAg ICAgICBCYXNlZCBvbiBhIHBhdGNoIGJ5IEJoYXJhdGh3YWFqLgorCisgICAgICAgICogcGx1Z2lu cy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OmhhbmRsZUV2 ZW50KTogYWxzbyB0YWtlIGludG8gYWNjb3VudAorICAgICAgICBmb2N1c2Vke2luLG91dH0gZXZl bnRzCisgICAgICAgICogcGx1Z2lucy9ndGsvUGx1Z2luVmlld0d0ay5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQbHVnaW5WaWV3OjpoYW5kbGVLZXlib2FyZEV2ZW50KTogd2Ugd2FudCB0aGUga2V5 dmFsCisgICAgICAgIGhlcmUsIG5vdCB0aGUgaGFyZHdhcmUga2V5Y29kZQorICAgICAgICAoV2Vi Q29yZTo6UGx1Z2luVmlldzo6aGFuZGxlTW91c2VFdmVudCk6IGZvY3VzIHRoZSBwbHVnaW52aWV3 IG9uIG1vdXNlIGV2ZW50cworCiAyMDEwLTA5LTA0ICBKdXN0aW4gU2NodWggIDxqc2NodWhAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1dlYkNvcmUvcGx1Z2lu cy9QbHVnaW5WaWV3LmNwcAppbmRleCBiZWU4ZGNkLi4wNTY4YmM0IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZp ZXcuY3BwCkBAIC0xNjgsOSArMTY4LDkgQEAgdm9pZCBQbHVnaW5WaWV3OjpoYW5kbGVFdmVudChF dmVudCogZXZlbnQpCiAgICAgZWxzZSBpZiAoZXZlbnQtPmlzS2V5Ym9hcmRFdmVudCgpKQogICAg ICAgICBoYW5kbGVLZXlib2FyZEV2ZW50KHN0YXRpY19jYXN0PEtleWJvYXJkRXZlbnQqPihldmVu dCkpOwogI2lmIGRlZmluZWQoWFBfVU5JWCkgJiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkp Ci0gICAgZWxzZSBpZiAoZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNPdXRF dmVudCkKKyAgICBlbHNlIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5ET01Gb2N1 c091dEV2ZW50IHx8IGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLmZvY3Vzb3V0RXZlbnQp CiAgICAgICAgIGhhbmRsZUZvY3VzT3V0RXZlbnQoKTsKLSAgICBlbHNlIGlmIChldmVudC0+dHlw ZSgpID09IGV2ZW50TmFtZXMoKS5ET01Gb2N1c0luRXZlbnQpCisgICAgZWxzZSBpZiAoZXZlbnQt PnR5cGUoKSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNJbkV2ZW50IHx8IGV2ZW50LT50eXBlKCkg PT0gZXZlbnROYW1lcygpLmZvY3VzaW5FdmVudCkKICAgICAgICAgaGFuZGxlRm9jdXNJbkV2ZW50 KCk7CiAjZW5kaWYKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmll d0d0ay5jcHAgYi9XZWJDb3JlL3BsdWdpbnMvZ3RrL1BsdWdpblZpZXdHdGsuY3BwCmluZGV4IDQy M2EwNWEuLjZkNjMxZTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGx1Z2lucy9ndGsvUGx1Z2luVmll d0d0ay5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL2d0ay9QbHVnaW5WaWV3R3RrLmNwcApAQCAt MzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRM b2FkZXIuaCIKICNpbmNsdWRlICJFbGVtZW50LmgiCisjaW5jbHVkZSAiRm9jdXNDb250cm9sbGVy LmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRSZXF1ZXN0 LmgiCiAjaW5jbHVkZSAiRnJhbWVUcmVlLmgiCkBAIC0zMDcsNyArMzA4LDcgQEAgdm9pZCBQbHVn aW5WaWV3OjpoYW5kbGVLZXlib2FyZEV2ZW50KEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIHhF dmVudC54a2V5LnN1YndpbmRvdyA9IDA7IC8vIHdlIGhhdmUgbm8gY2hpbGQgd2luZG93CiAgICAg eEV2ZW50LnhrZXkudGltZSA9IGV2ZW50LT50aW1lU3RhbXAoKTsKICAgICB4RXZlbnQueGtleS5z dGF0ZSA9IGdka0V2ZW50LT5zdGF0ZTsgLy8gR2RrTW9kaWZpZXJUeXBlIG1pcnJvcnMgeGxpYiBz dGF0ZSBtYXNrcwotICAgIHhFdmVudC54a2V5LmtleWNvZGUgPSBnZGtFdmVudC0+aGFyZHdhcmVf a2V5Y29kZTsKKyAgICB4RXZlbnQueGtleS5rZXljb2RlID0gZ2RrRXZlbnQtPmtleXZhbDsKICAg ICB4RXZlbnQueGtleS5zYW1lX3NjcmVlbiA9IHRydWU7CiAKICAgICAvLyBOT1RFOiBBcyB0aGUg WEV2ZW50cyBzZW50IHRvIHRoZSBwbHVnLWluIGFyZSBzeW50aGVzaXplZCBhbmQgdGhlcmUgaXMg bm90IGEgbmF0aXZlIHdpbmRvdwpAQCAtNDIyLDYgKzQyMywxMiBAQCB2b2lkIFBsdWdpblZpZXc6 OmhhbmRsZU1vdXNlRXZlbnQoTW91c2VFdmVudCogZXZlbnQpCiAgICAgaWYgKG1faXNXaW5kb3dl ZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1l cygpLm1vdXNlZG93bkV2ZW50KSB7CisgICAgICAgIGlmIChQYWdlKiBwYWdlID0gbV9wYXJlbnRG cmFtZS0+cGFnZSgpKQorICAgICAgICAgICAgcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPnNldEFj dGl2ZSh0cnVlKTsKKyAgICAgICAgZm9jdXNQbHVnaW5FbGVtZW50KCk7CisgICAgfQorCiAgICAg TlBFdmVudCB4RXZlbnQ7CiAjaWYgZGVmaW5lZChYUF9VTklYKQogICAgIGluaXRYRXZlbnQoJnhF dmVudCk7Ci0tIAoxLjcuMi4yCgo=