40730 2010-06-16 12:37:41 -0700 allow ports with windowed plugins to support windowless plugin tests 2010-08-30 14:17:26 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk, Qt, QtTriaged P2 Normal --- 36702 1 robert webkit-unassigned andersca ap hausmann kenneth laszlo.gombos robert webkit.review.bot oldest_to_newest 239025 0 robert 2010-06-16 12:37:41 -0700 Ports that implement plugins windowed by default need to have a way of supporting plugin tests that assume the plugin is windowless. add this feature to the tests and support it in the webkit test plugin. Also add mouse and keyboard event logging to the webkit-test plugin on Unix. 239524 1 59027 robert 2010-06-17 12:19:21 -0700 Created attachment 59027 Patch 239526 2 webkit.review.bot 2010-06-17 12:23:35 -0700 Attachment 59027 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:244: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 239530 3 robert 2010-06-17 12:31:19 -0700 (In reply to comment #2) > Attachment 59027 [details] did not pass style-queue: > > Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 > WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:244: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] > Total errors found: 1 in 9 files > > > If any of these errors are false positives, please file a bug against check-webkit-style. This is the style of the other switch statements in the file. Opened 40796 to cover this. 246306 4 kenneth 2010-07-03 07:47:55 -0700 Looks good to me. Anders what do you think? 250628 5 robert 2010-07-13 11:12:33 -0700 Alexey, would you be able to look at this? 265630 6 robert 2010-08-17 10:37:55 -0700 This is rotting on the vine. Anyone care to take a look? 269812 7 59027 hausmann 2010-08-26 04:32:37 -0700 Comment on attachment 59027 Patch WebCore/plugins/qt/PluginViewQt.cpp:297 + if (!xEvent->xkey.keycode) { Perhaps this should be guarded with a drt run-time guard? WebCore/plugins/qt/PluginViewQt.cpp:@ + void PluginView::setFocus(bool focused) The changes in this function worry me a bit. Should sending the X focus event perhaps be guarded with !m_isWindowed or simply be moved into the else() block, in order to avoid that the event receives the X focus event twice, once through X itself (xembed) and once through the direct dispatchNPEvent() call. The rest of the patch looks excellent to me! I'm sorry that it's been rotting away :( I'm going to say r+ with the condition that the X focus event code should be moved so that it's not sent twice in case of windowed plugins. 271624 8 robert 2010-08-30 14:17:26 -0700 Committed r66408: <http://trac.webkit.org/changeset/66408> 59027 2010-06-17 12:19:21 -0700 2010-08-26 04:32:37 -0700 Patch bug-40730-20100617201918.patch text/plain 11209 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOGNjNDAyOWU1NGI2MTFjNWE2MTE0YzRmNTQxYzVhYmZkNmM4ZmVjLi5hZWRhNDM0 OTEzNjQ4MzQ3MzA3ZjQ3OGJjYWNiOTMyZmQ4ZTUxZDI2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAK KzIwMTAtMDYtMTYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGFsbG93IHBvcnRzIHdpdGgg d2luZG93ZWQgcGx1Z2lucyB0byBzdXBwb3J0IHdpbmRvd2xlc3MgcGx1Z2luIHRlc3RzCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNzMwCisKKyAg ICAgICAgUG9ydHMgdGhhdCBpbXBsZW1lbnQgcGx1Z2lucyB3aW5kb3dlZCBieSBkZWZhdWx0IG5l ZWQgdG8gaGF2ZSBhIHdheSBvZgorICAgICAgICBzdXBwb3J0aW5nIHBsdWdpbiB0ZXN0cyB0aGF0 IGFzc3VtZSB0aGUgcGx1Z2luIGlzIHdpbmRvd2xlc3MuIEFkZCB0aGlzCisgICAgICAgIGZlYXR1 cmUgdG8gdGhlIHRlc3RzIGFuZCBzdXBwb3J0IGl0IGluIHRoZSB3ZWJraXQgdGVzdCBwbHVnaW4u IEFsc28KKyAgICAgICAgYWRkIG1vdXNlIGFuZCBrZXlib2FyZCBldmVudCBsb2dnaW5nIHRvIHRo ZSB3ZWJraXQtdGVzdCBwbHVnaW4gb24gVW5peC4KKworICAgICAgICBVbnNraXAgdGhlIGZvbGxv d2luZyB0ZXN0cyBvbiBRdDoKKworICAgICAgICBwbHVnaW5zL21vdXNlLWV2ZW50cy5odG1sCisg ICAgICAgIHBsdWdpbnMva2V5Ym9hcmQtZXZlbnRzLmh0bWwKKyAgICAgICAgcGx1Z2lucy9tb3Vz ZS1ldmVudHMtZml4ZWRwb3MuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoK KyAgICAgICAgKiBwbHVnaW5zL2tleWJvYXJkLWV2ZW50cy5odG1sOgorICAgICAgICAqIHBsdWdp bnMvbW91c2UtZXZlbnRzLWZpeGVkcG9zLmh0bWw6CisgICAgICAgICogcGx1Z2lucy9tb3VzZS1l dmVudHMuaHRtbDoKKwogMjAxMC0wNi0xNyAgS2VubmV0aCBSdXNzZWxsICA8a2JyQGdvb2dsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0 L1NraXBwZWQKaW5kZXggNDgxNWUzM2IyMGUwMmE1OTVmZGE0ZDc3NDUzNmY2NmJjZmVjYjhhOC4u NzNmZjc3YTc4NGM2OTYxOWI2NTYzMzYwOTNhZmMwNzg4NWRlNjc5MSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9x dC9Ta2lwcGVkCkBAIC00MzUsMTAgKzQzNSw2IEBAIHBsdWdpbnMvZW1iZWQtYXR0cmlidXRlcy1z dHlsZS5odG1sCiAjIC0tLS0gZGVwZW5kcyBvbiBRdWlja1RpbWUgc3VwcG9ydAogcGx1Z2lucy9l bWJlZC1hdHRyaWJ1dGVzLXNldHRpbmcuaHRtbAogZmFzdC9kb20vb2JqZWN0LWVtYmVkLXBsdWdp bi1zY3JpcHRpbmcuaHRtbAotIyAtLS0tIGV2ZW50cyBub3QgZ2V0dGluZyB0byBwbHVnaW4KLXBs dWdpbnMvbW91c2UtZXZlbnRzLmh0bWwKLXBsdWdpbnMva2V5Ym9hcmQtZXZlbnRzLmh0bWwKLXBs dWdpbnMvbW91c2UtZXZlbnRzLWZpeGVkcG9zLmh0bWwKICMgLS0tLSB0byBiZSByZXZpZXdlZAog aHR0cC90ZXN0cy9wbHVnaW5zL3BsdWdpbi1kb2N1bWVudC1oYXMtZm9jdXMuaHRtbAogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL2tleWJvYXJkLWV2ZW50cy5odG1sIGIvTGF5b3V0 VGVzdHMvcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbAppbmRleCAzMGI5M2M5YmMzYTllNDQ0 NzNhMTZmMGY3MGE4ZDI4YmM4YjRlMmY1Li5iNTE4MDRmY2IzMTk4Y2NhM2Q3NTA0OTZjYTA0ZDNl MjBlYmQ0NGVlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbHVnaW5zL2tleWJvYXJkLWV2ZW50 cy5odG1sCisrKyBiL0xheW91dFRlc3RzL3BsdWdpbnMva2V5Ym9hcmQtZXZlbnRzLmh0bWwKQEAg LTQsNiArNCw3IEBACiA8cD5UaGlzIHRlc3QgY2hlY2tzIGlmIGEgcGx1Zy1pbiBjYW4gcmVjZWl2 ZSBrZXlib2FyZCBldmVudHMgc2VudCBmcm9tIGV2ZW50U2VuZGVyLiBUaGlzIGlzIGEgdGVzdCBm b3IgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0OTM2 Ij5CdWcgMzQ5MzY8L2E+LjwvcD4KIDxzY3JpcHQ+CiAKKyAgICBwbGcud2luZG93ZWRQbHVnaW4g PSBmYWxzZTsKICAgICBwbGcuZXZlbnRMb2dnaW5nRW5hYmxlZCA9IHRydWU7CiAKICAgICBpZiAo IXdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGx1Z2lucy9tb3VzZS1ldmVudHMtZml4ZWRwb3MuaHRtbCBiL0xheW91dFRlc3RzL3BsdWdpbnMv bW91c2UtZXZlbnRzLWZpeGVkcG9zLmh0bWwKaW5kZXggMjJjOWMxMTI4MGRmZjNmMDQ5OGUyZWY3 YzU0NzNjMTdkMjVjYzhmZi4uMjAwODhmNTcwZTY4N2IzMzgyODE5MjgwOWI2YzNiN2M4NDk1ODBm ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGx1Z2lucy9tb3VzZS1ldmVudHMtZml4ZWRwb3Mu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbHVnaW5zL21vdXNlLWV2ZW50cy1maXhlZHBvcy5odG1s CkBAIC0zMSw2ICszMSw3IEBACiAKICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0 KCk7CiAKKyAgICBwbGcud2luZG93ZWRQbHVnaW4gPSBmYWxzZTsKICAgICBwbGcuZXZlbnRMb2dn aW5nRW5hYmxlZCA9IHRydWU7CiAKICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyg3MCw3MCk7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL21vdXNlLWV2ZW50cy5odG1sIGIvTGF5 b3V0VGVzdHMvcGx1Z2lucy9tb3VzZS1ldmVudHMuaHRtbAppbmRleCA4OGI0ZjA4MTk0YzFhODk2 ZjgwOWNjMzUyMDM1YmQ0MGVkNGQ4MjljLi45NjM4ZTJlNjM4MGYxMjI4Y2U1ZDJlYTliNmFhODZj MWE1OWJiMWIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbHVnaW5zL21vdXNlLWV2ZW50cy5o dG1sCisrKyBiL0xheW91dFRlc3RzL3BsdWdpbnMvbW91c2UtZXZlbnRzLmh0bWwKQEAgLTUsNiAr NSw3IEBACiBGbGFzaCBjbGlja3MvaW50ZXJhY3Rpdml0eSBub3Qgd29ya2luZyBwcm9wZXJseS48 L3A+CiA8c2NyaXB0PgogCisgICAgcGxnLndpbmRvd2VkUGx1Z2luID0gZmFsc2U7CiAgICAgcGxn LmV2ZW50TG9nZ2luZ0VuYWJsZWQgPSB0cnVlOwogCiAgICAgaWYgKCF3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggNjI0NzBjZWE3MDlmNzM5MmY5NTY2YjgyOTRjMDUwOGU5ZDNlMjA1Ny4u NDNjOWY4NDIxZmMwNThlMGI5NTkwNjAzMGRhNzQ3ZWU4ZWQyOTIzYyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAor MjAxMC0wNi0xNiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYWxsb3cgcG9ydHMgd2l0aCB3 aW5kb3dlZCBwbHVnaW5zIHRvIHN1cHBvcnQgd2luZG93bGVzcyBwbHVnaW4gdGVzdHMKKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA3MzAKKworICAg ICAgICBQb3J0cyB0aGF0IGltcGxlbWVudCBwbHVnaW5zIHdpbmRvd2VkIGJ5IGRlZmF1bHQgbmVl ZCB0byBoYXZlIGEgd2F5IG9mCisgICAgICAgIHN1cHBvcnRpbmcgcGx1Z2luIHRlc3RzIHRoYXQg YXNzdW1lIHRoZSBwbHVnaW4gaXMgd2luZG93bGVzcy4gQWRkIHRoaXMKKyAgICAgICAgZmVhdHVy ZSB0byB0aGUgdGVzdHMgYW5kIHN1cHBvcnQgaXQgaW4gdGhlIHdlYmtpdCB0ZXN0IHBsdWdpbi4g QWxzbworICAgICAgICBhZGQgbW91c2UgYW5kIGtleWJvYXJkIGV2ZW50IGxvZ2dpbmcgdG8gdGhl IHdlYmtpdC10ZXN0IHBsdWdpbiBvbiBVbml4LgorCisgICAgICAgIFVuc2tpcCB0aGUgZm9sbG93 aW5nIHRlc3RzIG9uIFF0OgorCisgICAgICAgIHBsdWdpbnMvbW91c2UtZXZlbnRzLmh0bWwKKyAg ICAgICAgcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbAorICAgICAgICBwbHVnaW5zL21vdXNl LWV2ZW50cy1maXhlZHBvcy5odG1sCisKKyAgICAgICAgKiBwbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbHVnaW5WaWV3OjpzZXRGb2N1cyk6CisgICAgICAg IChXZWJDb3JlOjpzZXRYS2V5RXZlbnRTcGVjaWZpY0ZpZWxkcyk6CisKIDIwMTAtMDYtMTcgIEtl bm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERp bWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5WaWV3 UXQuY3BwIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAKaW5kZXggZmY1MjA3 MGZiM2Y2ZjNkNmYyOTE4OWUzZGZlOTI1YjIyOTE5NzA5Mi4uMWQ0MDYyMzFhNmNlZWE2ZDRhOTI3 NWVhMmVlZWIxNDJkMGE5NmRlZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdp blZpZXdRdC5jcHAKKysrIGIvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAKQEAg LTE0Miw2ICsxNDIsMTIgQEAgdm9pZCBQbHVnaW5WaWV3OjpzZXRGb2N1cyhib29sIGZvY3VzZWQp CiAgICAgfSBlbHNlIHsKICAgICAgICAgV2lkZ2V0OjpzZXRGb2N1cyhmb2N1c2VkKTsKICAgICB9 CisKKyAgICBYRXZlbnQgbnBFdmVudDsKKyAgICBpbml0WEV2ZW50KCZucEV2ZW50KTsKKyAgICBu cEV2ZW50LnR5cGUgPSAoZm9jdXNlZCkgPyA5IDogMTA7IC8vIGludHMgYXMgUXQgdW5zZXRzIEZv Y3VzSW4gYW5kIEZvY3VzT3V0CisgICAgaWYgKCFkaXNwYXRjaE5QRXZlbnQobnBFdmVudCkpCisg ICAgICAgIExPRyhFdmVudHMsICJQbHVnaW5WaWV3OjpzZXRGb2N1cyglZCk6IEZvY3VzIGV2ZW50 IG5vdCBhY2NlcHRlZCIsIGZvY3VzZWQpOwogfQogCiB2b2lkIFBsdWdpblZpZXc6OnNob3coKQpA QCAtMjg0LDYgKzI5MCwxNyBAQCB2b2lkIHNldFhLZXlFdmVudFNwZWNpZmljRmllbGRzKFhFdmVu dCogeEV2ZW50LCBLZXlib2FyZEV2ZW50KiBldmVudCkKICAgICB4RXZlbnQtPnhrZXkudGltZSA9 IGV2ZW50LT50aW1lU3RhbXAoKTsKICAgICB4RXZlbnQtPnhrZXkuc3RhdGUgPSBxS2V5RXZlbnQt Pm5hdGl2ZU1vZGlmaWVycygpOwogICAgIHhFdmVudC0+eGtleS5rZXljb2RlID0gcUtleUV2ZW50 LT5uYXRpdmVTY2FuQ29kZSgpOworCisgICAgLy8gV2UgbWF5IG5vdCBoYXZlIGEgbmF0aXZlU2Nh bkNvZGUoKSBpZiB0aGUga2V5IGV2ZW50IGlzIGZyb20gRFJUJ3MgZXZlbnRzZW5kZXIuIEluIHRo YXQKKyAgICAvLyBjYXNlIGp1c3QgcG9wdWxhdGUgdGhlIFhFdmVudCdzIGtleWNvZGUgd2l0aCB0 aGUgUXQgcGxhdGZvcm0taW5kZXBlbmRlbnQga2V5Y29kZS4gVGhlIG9ubHkKKyAgICAvLyBwbGFj ZSB0aGlzIGtleWNvZGUgd2lsbCBiZSB1c2VkIGlzIGluIHdlYmtpdF90ZXN0X3BsdWdpbl9oYW5k bGVfZXZlbnQoKS4KKyAgICBpZiAoIXhFdmVudC0+eGtleS5rZXljb2RlKSB7CisgICAgICAgIGlm ICghcUtleUV2ZW50LT50ZXh0KCkuaXNFbXB0eSgpKQorICAgICAgICAgICAgeEV2ZW50LT54a2V5 LmtleWNvZGUgPSBpbnQocUtleUV2ZW50LT50ZXh0KCkuYXQoMCkudW5pY29kZSgpICsgcUtleUV2 ZW50LT5tb2RpZmllcnMoKSk7CisgICAgICAgIGVsc2UgaWYgKHFLZXlFdmVudC0+a2V5KCkgJiYg KHFLZXlFdmVudC0+a2V5KCkgIT0gUXQ6OktleV91bmtub3duKSkKKyAgICAgICAgICAgIHhFdmVu dC0+eGtleS5rZXljb2RlID0gaW50KHFLZXlFdmVudC0+a2V5KCkgKyBxS2V5RXZlbnQtPm1vZGlm aWVycygpKTsKKyAgICB9CisKICAgICB4RXZlbnQtPnhrZXkuc2FtZV9zY3JlZW4gPSB0cnVlOwog CiAgICAgLy8gTk9URTogQXMgdGhlIFhFdmVudHMgc2VudCB0byB0aGUgcGx1Zy1pbiBhcmUgc3lu dGhlc2l6ZWQgYW5kIHRoZXJlIGlzIG5vdCBhIG5hdGl2ZSB3aW5kb3cKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCAwYTMxN2Qy NzkyNWE5NjFhZGZmYjg2M2VlNDcxZTRjNWE0MGFlZTY0Li4xMjYwYTM3ZWY1ZWExMDE3M2ZkNGEz NTRmMDQzMzAzMDdjYjBjZmZiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTAtMDYtMTYgIFJv YmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIGFsbG93IHBvcnRzIHdpdGggd2luZG93ZWQgcGx1Z2lu cyB0byBzdXBwb3J0IHdpbmRvd2xlc3MgcGx1Z2luIHRlc3RzCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNzMwCisKKyAgICAgICAgUG9ydHMgdGhh dCBpbXBsZW1lbnQgcGx1Z2lucyB3aW5kb3dlZCBieSBkZWZhdWx0IG5lZWQgdG8gaGF2ZSBhIHdh eSBvZgorICAgICAgICBzdXBwb3J0aW5nIHBsdWdpbiB0ZXN0cyB0aGF0IGFzc3VtZSB0aGUgcGx1 Z2luIGlzIHdpbmRvd2xlc3MuIEFkZCB0aGlzCisgICAgICAgIGZlYXR1cmUgdG8gdGhlIHRlc3Rz IGFuZCBzdXBwb3J0IGl0IGluIHRoZSB3ZWJraXQgdGVzdCBwbHVnaW4uIEFsc28KKyAgICAgICAg YWRkIG1vdXNlIGFuZCBrZXlib2FyZCBldmVudCBsb2dnaW5nIHRvIHRoZSB3ZWJraXQtdGVzdCBw bHVnaW4gb24gVW5peC4KKworICAgICAgICBVbnNraXAgdGhlIGZvbGxvd2luZyB0ZXN0cyBvbiBR dDoKKworICAgICAgICBwbHVnaW5zL21vdXNlLWV2ZW50cy5odG1sCisgICAgICAgIHBsdWdpbnMv a2V5Ym9hcmQtZXZlbnRzLmh0bWwKKyAgICAgICAgcGx1Z2lucy9tb3VzZS1ldmVudHMtZml4ZWRw b3MuaHRtbAorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luLnN1 YnByb2ovUGx1Z2luT2JqZWN0LmNwcDoKKyAgICAgICAgKHBsdWdpblNldFByb3BlcnR5KToKKyAg ICAgICAgKiBEdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9tYWluLmNw cDoKKyAgICAgICAgKE5QUF9OZXcpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3VuaXgvVGVz dE5ldHNjYXBlUGx1Z2luL1Rlc3ROZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAgICh3ZWJraXRf dGVzdF9wbHVnaW5faGFuZGxlX2V2ZW50KToKKwogMjAxMC0wNi0xNyAgRGFyaW4gQWRsZXIgIDxk YXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgT25lIG1vcmUgdHJ5IGF0IGZpeCBmb3IgQ2hyb21p dW0gYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0 c2NhcGVQbHVnSW4uc3VicHJvai9QbHVnaW5PYmplY3QuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luLnN1YnByb2ovUGx1Z2luT2JqZWN0LmNwcAppbmRl eCA2MDEwM2E1YTdkYjM1MmIwMDcyY2Q5MGU2MmI5YTkwYWJiYWM0ZDIxLi4zNDNkMjQzZDI2YTE0 ZmUxYWMyZmM5ZDI2YWM1MDg5MDgyNzViYTBiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4uc3VicHJvai9QbHVnaW5PYmplY3QuY3BwCisr KyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi5zdWJwcm9q L1BsdWdpbk9iamVjdC5jcHAKQEAgLTEzNiw2ICsxMzYsNyBAQCBlbnVtIHsKICAgICBJRF9QUk9Q RVJUWV9DQUNIRURfUFJJVkFURV9CUk9XU0lOR19FTkFCTEVELAogICAgIElEX1BST1BFUlRZX1RI Uk9XX0VYQ0VQVElPTl9QUk9QRVJUWSwKICAgICBJRF9MQVNUX1NFVF9XSU5ET1dfQVJHVU1FTlRT LAorICAgIElEX1BST1BFUlRZX1dJTkRPV0VEX1BMVUdJTiwKICAgICBOVU1fUFJPUEVSVFlfSURF TlRJRklFUlMKIH07CiAKQEAgLTE1MCw3ICsxNTEsOCBAQCBzdGF0aWMgY29uc3QgTlBVVEY4ICpw bHVnaW5Qcm9wZXJ0eUlkZW50aWZpZXJOYW1lc1tOVU1fUFJPUEVSVFlfSURFTlRJRklFUlNdID0g ewogICAgICJwcml2YXRlQnJvd3NpbmdFbmFibGVkIiwKICAgICAiY2FjaGVkUHJpdmF0ZUJyb3dz aW5nRW5hYmxlZCIsCiAgICAgInRlc3RUaHJvd0V4Y2VwdGlvblByb3BlcnR5IiwKLSAgICAibGFz dFNldFdpbmRvd0FyZ3VtZW50cyIKKyAgICAibGFzdFNldFdpbmRvd0FyZ3VtZW50cyIsCisgICAg IndpbmRvd2VkUGx1Z2luIgogfTsKIAogZW51bSB7CkBAIC0zMTcsNiArMzE5LDkgQEAgc3RhdGlj IGJvb2wgcGx1Z2luU2V0UHJvcGVydHkoTlBPYmplY3QqIG9iaiwgTlBJZGVudGlmaWVyIG5hbWUs IGNvbnN0IE5QVmFyaWFudCoKICAgICB9IGVsc2UgaWYgKG5hbWUgPT0gcGx1Z2luUHJvcGVydHlJ ZGVudGlmaWVyc1tJRF9QUk9QRVJUWV9USFJPV19FWENFUFRJT05fUFJPUEVSVFldKSB7CiAgICAg ICAgIGJyb3dzZXItPnNldGV4Y2VwdGlvbihvYmosICJwbHVnaW4gb2JqZWN0IHRlc3RUaHJvd0V4 Y2VwdGlvblByb3BlcnR5IFNVQ0NFU1MiKTsKICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSBl bHNlIGlmIChuYW1lID09IHBsdWdpblByb3BlcnR5SWRlbnRpZmllcnNbSURfUFJPUEVSVFlfV0lO RE9XRURfUExVR0lOXSkgeworICAgICAgICBicm93c2VyLT5zZXR2YWx1ZShwbHVnaW4tPm5wcCwg TlBQVnBsdWdpbldpbmRvd0Jvb2wsICh2b2lkICopTlBWQVJJQU5UX1RPX0JPT0xFQU4oKnZhcmlh bnQpKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCiAgICAgcmV0dXJuIGZhbHNlOwpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVR dC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNw cAppbmRleCBmNWZiYjVjMTgxMDUwNWI2YzdlNjZkY2UzMmZjZWE0MWFkNTAwMmJlLi5mZTU0NTkw NWM4Yzk4ZjIyYzYwMThjZjQyYWY1YWRmMTY2Yjk4MWYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAorKysgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcApAQCAtMTcwLDcgKzE3MCw2 IEBAIFdlYlBhZ2U6OldlYlBhZ2UoUU9iamVjdCogcGFyZW50LCBEdW1wUmVuZGVyVHJlZSogZHJ0 KQogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjpzZXROb3RpZmljYXRpb25zUmVjZWl2ZXIo bV9kcnQpOwogICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydFF0OjpzZXRDaGVja1Blcm1pc3Npb25G dW5jdGlvbihjaGVja1Blcm1pc3Npb25DYWxsYmFjayk7CiAgICAgRHVtcFJlbmRlclRyZWVTdXBw b3J0UXQ6OnNldFJlcXVlc3RQZXJtaXNzaW9uRnVuY3Rpb24ocmVxdWVzdFBlcm1pc3Npb25DYWxs YmFjayk7Ci0KIH0KIAogV2ViUGFnZTo6fldlYlBhZ2UoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvdW5peC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1 Z2luLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3VuaXgvVGVzdE5ldHNjYXBlUGx1 Z2luL1Rlc3ROZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggZTk2MGEwNjFkMjU3MzIyYWI4YzI5MjY1 Y2QxYjBhMjFhZjFhZWVkZS4uYzc5NzYzNzUyMWM4OTEzODZhMmZhMGU4MWI5MmYzYWM4MmRhNGVj YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvdW5peC9UZXN0TmV0c2Nh cGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS91bml4L1Rlc3ROZXRzY2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQbHVnaW4uY3BwCkBA IC0yMzksNyArMjM5LDMzIEBAIHdlYmtpdF90ZXN0X3BsdWdpbl9oYW5kbGVfZXZlbnQoTlBQIGlu c3RhbmNlLCB2b2lkKiBldmVudCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBYRXZlbnQqIGV2 dCA9IHN0YXRpY19jYXN0PFhFdmVudCo+KGV2ZW50KTsKLSAgICBwbHVnaW5Mb2coaW5zdGFuY2Us ICJldmVudCAlZCIsIGV2dC0+dHlwZSk7CisKKyAgICBzd2l0Y2ggKGV2dC0+dHlwZSkgeworICAg ICAgICBjYXNlIEJ1dHRvblJlbGVhc2U6CisgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2Us ICJtb3VzZVVwIGF0ICglZCwgJWQpIiwgZXZ0LT54YnV0dG9uLngsIGV2dC0+eGJ1dHRvbi55KTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEJ1dHRvblByZXNzOgorICAgICAgICAg ICAgcGx1Z2luTG9nKGluc3RhbmNlLCAibW91c2VEb3duIGF0ICglZCwgJWQpIiwgZXZ0LT54YnV0 dG9uLngsIGV2dC0+eGJ1dHRvbi55KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IEtleVJlbGVhc2U6CisgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJrZXlVcCAnJWMn IiwgZXZ0LT54a2V5LmtleWNvZGUpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Ug S2V5UHJlc3M6CisgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJrZXlEb3duICclYyci LCBldnQtPnhrZXkua2V5Y29kZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBN b3Rpb25Ob3RpZnk6CisgICAgICAgIGNhc2UgRW50ZXJOb3RpZnk6CisgICAgICAgIGNhc2UgTGVh dmVOb3RpZnk6CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb2N1c0luOgorICAg ICAgICAgICAgcGx1Z2luTG9nKGluc3RhbmNlLCAiZ2V0Rm9jdXNFdmVudCIpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgRm9jdXNPdXQ6CisgICAgICAgICAgICBwbHVnaW5Mb2co aW5zdGFuY2UsICJsb3NlRm9jdXNFdmVudCIpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGRlZmF1bHQ6CisgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJldmVudCAlZCIsIGV2 dC0+dHlwZSk7CisgICAgfQogCiAgICAgcmV0dXJuIDA7CiB9Cg==