50050 2010-11-24 20:33:33 -0800 [Qt] plugins/keyboard-events.html fails after r72717 2011-05-20 04:35:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED LayoutTestFailure, Qt, QtTriaged P2 Normal --- 1 mrobinson webkit-unassigned abarth abecsi benjamin commit-queue eric kling mrobinson ossy robert webkit.review.bot oldest_to_newest 313599 0 mrobinson 2010-11-24 20:33:33 -0800 Fixes to the Unix version of TestNetscapePlugin have uncovered a bug in PluginViewQt. This is related to a special-case for DumpRenderTree. 313600 1 mrobinson 2010-11-24 20:35:48 -0800 Committed r72719: <http://trac.webkit.org/changeset/72719> 313613 2 webkit.review.bot 2010-11-24 22:17:26 -0800 http://trac.webkit.org/changeset/72719 might have broken GTK Linux 64-bit Debug The following tests are not passing: editing/selection/extend-by-character-002.html 335056 3 79103 robert 2011-01-16 10:04:31 -0800 Created attachment 79103 Patch 335061 4 79103 kling 2011-01-16 11:17:32 -0800 Comment on attachment 79103 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79103&action=review > Source/WebCore/plugins/qt/PluginViewQt.cpp:427 > + const char* chr = qKeyEvent->text().left(1).toUtf8().constData(); > + xEvent->xkey.keycode = XKeysymToKeycode(QX11Info::display(), XStringToKeysym(chr)); 'chr' points to deleted data on the second line since the QByteArray returned by toUtf8() is temporary. 335068 5 79106 robert 2011-01-16 11:59:53 -0800 Created attachment 79106 Patch 335069 6 79106 kling 2011-01-16 12:34:23 -0800 Comment on attachment 79106 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79106&action=review LGTM, thanks for attending to this! > Source/WebCore/plugins/qt/PluginViewQt.cpp:426 > + QString chr = qKeyEvent->text().left(1); Nit: We don't abbreviate variable names in WebKit. 335073 7 79108 robert 2011-01-16 12:48:34 -0800 Created attachment 79108 Patch 335076 8 79108 commit-queue 2011-01-16 13:08:43 -0800 Comment on attachment 79108 Patch Clearing flags on attachment: 79108 Committed r75894: <http://trac.webkit.org/changeset/75894> 335077 9 commit-queue 2011-01-16 13:08:50 -0800 All reviewed patches have been landed. Closing bug. 335083 10 robert 2011-01-16 14:09:19 -0800 Committed r75895: <http://trac.webkit.org/changeset/75895> 335113 11 webkit.review.bot 2011-01-16 17:58:21 -0800 http://trac.webkit.org/changeset/75897 might have broken Leopard Intel Release (Build) 335443 12 robert 2011-01-17 12:17:02 -0800 I had to re-skip plugins/keyboard-events.html because it failed on the buildbot. The change that broke this originally for Qt is http://trac.webkit.org/changeset/72717 I think the reason my patch failed is as follows, and am hoping Martin might be amenable to going back to using the keysym for this event. In order to get the keycode of the keyboard event, we have to do: xEvent->xkey.keycode = XKeysymToKeycode(QX11Info::display(), XStringToKeysym(keyText.toUtf8().constData())); At first I thought it failed on the buildbot because it was headless, but the tests are run under xvfb so that was only half-right. The real reason, it seems to me, is because xvfb doesn't have a keyboard, so XKeysymToKeycode will always fail. (See http://lists.apple.com/archives/x11-users/2009/Apr/msg00016.html for an example of this elsewhere). Since there's no keyboard mapping available to xvfb it can't determine the keycode. I recreated the problem in Ossy's 'QtWebKit Builder and Tester VM (Q-BAT VM)'. I'm going to drop to a terminal session on this machine with no x server running so see if I can recreate it here too. I'll come back with my results but it looks as if using the keycodes won't work for us running our buildbot under xvfb. Looking at the output from the other buildbots I think qt may be alone running the layout tests under xvfb. Who would be able to confirm that do you know? 335470 13 robert 2011-01-17 12:58:38 -0800 So much for that theory - I can pass the test using xvfb-run in a session with no X server running on my own machine. The test always fails for me in the VM. My version of Xvfb is from xorg-server 1.7.6, the version of Xvfb on the VM/buildbot is 1.4.2. Mmmm... So that's my new copper-bottomed theory. I guess we wait for the buildbot to upgrade to debian squeeze and try again! 335476 14 ossy 2011-01-17 13:02:43 -0800 Bbandix, could you check Robert's idea on your hyper-up-to-date Arch Linux? :) 335494 15 robert 2011-01-17 13:31:53 -0800 For ease of reference, this should pass: xvfb-run --server-args="-screen 0 1024x768x24" Tools/Scripts/run-webkit-tests -- no-launch-safari --qt plugins/keyboard-events.html $@ 406996 16 robert 2011-05-20 04:35:56 -0700 Committed r86938: <http://trac.webkit.org/changeset/86938> 79103 2011-01-16 10:04:31 -0800 2011-01-16 11:59:46 -0800 Patch bug-50050-20110116180427.patch text/plain 3718 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzI2ZmY2ZDk1YWFiZWFmMzgwYmJkNjNjYzA0NTk2ZTk3YTNmODNmLi5kMWYwN2Uw YzRiNzA3ZDdlMDgxNWMzMzc2ODkwNTkzMWYxZTIzZTMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDEtMTYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gcGx1Z2lucy9rZXli b2FyZC1ldmVudHMuaHRtbCBmYWlscyBhZnRlciByNzI3MTcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMDUwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC9Ta2lwcGVkOiBVbnNraXAgcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbAorCiAyMDExLTAx LTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBm YXN0L2RvbS9SYW5nZS9yYW5nZS1jbG9uZS1jb250ZW50cy5odG1sIG9uIFdpbmRvd3MKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDBjMzk4NmZjYmRhMDdhMTIxMjUzMWIxM2M0MGU0MGM1ZTAz NzNmN2IuLjZjOTJiYWU5OGJkMzM5YjViNGQwYmZiYTk2MTRhODAzZWVmNTE0NTggMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQvU2tpcHBlZApAQCAtNTMxOSwxMCArNTMxOSw2IEBAIGh0dHAvdGVzdHMvc2VjdXJp dHkvYWJvdXRCbGFuay94c3MtREVOSUVELW5hdmlnYXRlLW9wZW5lci1kb2N1bWVudC13cml0ZS5o dG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Fib3V0QmxhbmsveHNzLURFTklFRC1uYXZpZ2F0ZS1v cGVuZXItamF2YXNjcmlwdC11cmwuaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9hYm91dEJsYW5r L3hzcy1ERU5JRUQtc2V0LW9wZW5lci5odG1sCiAKLSMgW1F0XSBwbHVnaW5zL2tleWJvYXJkLWV2 ZW50cy5odG1sIGZhaWxzIGFmdGVyIHI3MjcxNwotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTAwNTAKLXBsdWdpbnMva2V5Ym9hcmQtZXZlbnRzLmh0bWwKLQogIyBS RUdSRVNTSU9OKHI3Mjg2MSk6IGVkaXRpbmcvc2VsZWN0aW9uL2NsaWNrLWxlZnQtb2YtcnRsLXdy YXBwaW5nLXRleHQuaHRtbCBhbmQgbW9kaWZ5LXVwLW9uLXJ0bC13cmFwcGluZy10ZXh0Lmh0bWwg ZmFpbCBvbiBhbGwgYnV0IE1hYyBwbGF0Zm9ybQogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTAyMDQKIGVkaXRpbmcvc2VsZWN0aW9uL2NsaWNrLWxlZnQtb2YtcnRs LXdyYXBwaW5nLXRleHQuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwNDI4YTQwNDRlY2ZlYWNiOGFjYTMw ZmUwODgxMmQ1NGFiN2Y2MDcuLjk2ZDBmMjcyYTY0ODM2OTEwNjc0ZWQzYzc0NjJjNGQ4OWU5Nzkw MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wMS0xNiAgUm9iZXJ0IEhvZ2Fu ICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBwbHVnaW5zL2tleWJvYXJkLWV2ZW50cy5odG1sIGZhaWxzIGFm dGVyIHI3MjcxNworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTAwNTAKKworICAgICAgICAqIHBsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnNldFhLZXlFdmVudFNwZWNpZmljRmllbGRzKTogbWFwIGV2ZW50IHRleHQg dG8ga2V5Y29kZQorCiAyMDExLTAxLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzU3MDguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAKaW5kZXggZmRiZTU1MmQx YTUzMzAwMDAwY2VkYmExYmIyODcyN2M2MzhmN2IzMC4uZWFiNjU3ZTIxMTAzNjBiZjA0MmVhMWZk ZGY4YTE1YTY0YTJhN2ZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9Q bHVnaW5WaWV3UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmll d1F0LmNwcApAQCAtNDE3LDE1ICs0MTcsMTQgQEAgdm9pZCBzZXRYS2V5RXZlbnRTcGVjaWZpY0Zp ZWxkcyhYRXZlbnQqIHhFdmVudCwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCiAgICAgeEV2ZW50LT54 a2V5LmtleWNvZGUgPSBrZXlFdmVudC0+bmF0aXZlU2NhbkNvZGUoKTsKIAogICAgIC8vIFdlIG1h eSBub3QgaGF2ZSBhIG5hdGl2ZVNjYW5Db2RlKCkgaWYgdGhlIGtleSBldmVudCBpcyBmcm9tIERS VCdzIGV2ZW50c2VuZGVyLiBJbiB0aGF0Ci0gICAgLy8gY2FzZSBqdXN0IHBvcHVsYXRlIHRoZSBY RXZlbnQncyBrZXljb2RlIHdpdGggdGhlIFF0IHBsYXRmb3JtLWluZGVwZW5kZW50IGtleWNvZGUu IFRoZSBvbmx5CisgICAgLy8gY2FzZSBmZXRjaCB0aGUgWEV2ZW50J3Mga2V5Y29kZSBmcm9tIHRo ZSBldmVudCdzIHRleHQuIFRoZSBvbmx5CiAgICAgLy8gcGxhY2UgdGhpcyBrZXljb2RlIHdpbGwg YmUgdXNlZCBpcyBpbiB3ZWJraXRfdGVzdF9wbHVnaW5faGFuZGxlX2V2ZW50KCkuCisgICAgLy8g RklYTUU6IENyZWF0ZSBRdCBBUEkgc28gdGhhdCB3ZSBjYW4gc2V0IHRoZSBhcHByb3ByaWF0ZSBr ZXljb2RlIGluIERSVCBFdmVudFNlbmRlciBpbnN0ZWFkLgogICAgIGlmIChRV2ViUGFnZVByaXZh dGU6OmRydFJ1biAmJiAheEV2ZW50LT54a2V5LmtleWNvZGUpIHsKICAgICAgICAgUUtleUV2ZW50 KiBxS2V5RXZlbnQgPSBrZXlFdmVudC0+cXRFdmVudCgpOwogICAgICAgICBBU1NFUlQocUtleUV2 ZW50KTsKLSAgICAgICAgaWYgKCFxS2V5RXZlbnQtPnRleHQoKS5pc0VtcHR5KCkpCi0gICAgICAg ICAgICB4RXZlbnQtPnhrZXkua2V5Y29kZSA9IGludChxS2V5RXZlbnQtPnRleHQoKS5hdCgwKS51 bmljb2RlKCkgKyBxS2V5RXZlbnQtPm1vZGlmaWVycygpKTsKLSAgICAgICAgZWxzZSBpZiAocUtl eUV2ZW50LT5rZXkoKSAmJiAocUtleUV2ZW50LT5rZXkoKSAhPSBRdDo6S2V5X3Vua25vd24pKQot ICAgICAgICAgICAgeEV2ZW50LT54a2V5LmtleWNvZGUgPSBpbnQocUtleUV2ZW50LT5rZXkoKSAr IHFLZXlFdmVudC0+bW9kaWZpZXJzKCkpOworICAgICAgICBjb25zdCBjaGFyKiBjaHIgPSBxS2V5 RXZlbnQtPnRleHQoKS5sZWZ0KDEpLnRvVXRmOCgpLmNvbnN0RGF0YSgpOworICAgICAgICB4RXZl bnQtPnhrZXkua2V5Y29kZSA9IFhLZXlzeW1Ub0tleWNvZGUoUVgxMUluZm86OmRpc3BsYXkoKSwg WFN0cmluZ1RvS2V5c3ltKGNocikpOwogICAgIH0KIAogICAgIHhFdmVudC0+eGtleS5zYW1lX3Nj cmVlbiA9IHRydWU7Cg== 79106 2011-01-16 11:59:53 -0800 2011-01-16 12:48:28 -0800 Patch bug-50050-20110116195947.patch text/plain 3714 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzI2ZmY2ZDk1YWFiZWFmMzgwYmJkNjNjYzA0NTk2ZTk3YTNmODNmLi5kMWYwN2Uw YzRiNzA3ZDdlMDgxNWMzMzc2ODkwNTkzMWYxZTIzZTMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDEtMTYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gcGx1Z2lucy9rZXli b2FyZC1ldmVudHMuaHRtbCBmYWlscyBhZnRlciByNzI3MTcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMDUwCisKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC9Ta2lwcGVkOiBVbnNraXAgcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbAorCiAyMDExLTAx LTE1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBm YXN0L2RvbS9SYW5nZS9yYW5nZS1jbG9uZS1jb250ZW50cy5odG1sIG9uIFdpbmRvd3MKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCmluZGV4IDBjMzk4NmZjYmRhMDdhMTIxMjUzMWIxM2M0MGU0MGM1ZTAz NzNmN2IuLjZjOTJiYWU5OGJkMzM5YjViNGQwYmZiYTk2MTRhODAzZWVmNTE0NTggMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxh dGZvcm0vcXQvU2tpcHBlZApAQCAtNTMxOSwxMCArNTMxOSw2IEBAIGh0dHAvdGVzdHMvc2VjdXJp dHkvYWJvdXRCbGFuay94c3MtREVOSUVELW5hdmlnYXRlLW9wZW5lci1kb2N1bWVudC13cml0ZS5o dG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Fib3V0QmxhbmsveHNzLURFTklFRC1uYXZpZ2F0ZS1v cGVuZXItamF2YXNjcmlwdC11cmwuaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9hYm91dEJsYW5r L3hzcy1ERU5JRUQtc2V0LW9wZW5lci5odG1sCiAKLSMgW1F0XSBwbHVnaW5zL2tleWJvYXJkLWV2 ZW50cy5odG1sIGZhaWxzIGFmdGVyIHI3MjcxNwotIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTAwNTAKLXBsdWdpbnMva2V5Ym9hcmQtZXZlbnRzLmh0bWwKLQogIyBS RUdSRVNTSU9OKHI3Mjg2MSk6IGVkaXRpbmcvc2VsZWN0aW9uL2NsaWNrLWxlZnQtb2YtcnRsLXdy YXBwaW5nLXRleHQuaHRtbCBhbmQgbW9kaWZ5LXVwLW9uLXJ0bC13cmFwcGluZy10ZXh0Lmh0bWwg ZmFpbCBvbiBhbGwgYnV0IE1hYyBwbGF0Zm9ybQogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTAyMDQKIGVkaXRpbmcvc2VsZWN0aW9uL2NsaWNrLWxlZnQtb2YtcnRs LXdyYXBwaW5nLXRleHQuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwNDI4YTQwNDRlY2ZlYWNiOGFjYTMw ZmUwODgxMmQ1NGFiN2Y2MDcuLjk2ZDBmMjcyYTY0ODM2OTEwNjc0ZWQzYzc0NjJjNGQ4OWU5Nzkw MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wMS0xNiAgUm9iZXJ0IEhvZ2Fu ICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XSBwbHVnaW5zL2tleWJvYXJkLWV2ZW50cy5odG1sIGZhaWxzIGFm dGVyIHI3MjcxNworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTAwNTAKKworICAgICAgICAqIHBsdWdpbnMvcXQvUGx1Z2luVmlld1F0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OnNldFhLZXlFdmVudFNwZWNpZmljRmllbGRzKTogbWFwIGV2ZW50IHRleHQg dG8ga2V5Y29kZQorCiAyMDExLTAxLTE1ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90 QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzU3MDguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHAKaW5kZXggZmRiZTU1MmQx YTUzMzAwMDAwY2VkYmExYmIyODcyN2M2MzhmN2IzMC4uNGU5YzEzMjk0OWM2ZjYxZWNiZmE2ZmI2 OWUyNjg5ZWY1OTVhYTA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9Q bHVnaW5WaWV3UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1Z2luVmll d1F0LmNwcApAQCAtNDE3LDE1ICs0MTcsMTQgQEAgdm9pZCBzZXRYS2V5RXZlbnRTcGVjaWZpY0Zp ZWxkcyhYRXZlbnQqIHhFdmVudCwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCiAgICAgeEV2ZW50LT54 a2V5LmtleWNvZGUgPSBrZXlFdmVudC0+bmF0aXZlU2NhbkNvZGUoKTsKIAogICAgIC8vIFdlIG1h eSBub3QgaGF2ZSBhIG5hdGl2ZVNjYW5Db2RlKCkgaWYgdGhlIGtleSBldmVudCBpcyBmcm9tIERS VCdzIGV2ZW50c2VuZGVyLiBJbiB0aGF0Ci0gICAgLy8gY2FzZSBqdXN0IHBvcHVsYXRlIHRoZSBY RXZlbnQncyBrZXljb2RlIHdpdGggdGhlIFF0IHBsYXRmb3JtLWluZGVwZW5kZW50IGtleWNvZGUu IFRoZSBvbmx5CisgICAgLy8gY2FzZSBmZXRjaCB0aGUgWEV2ZW50J3Mga2V5Y29kZSBmcm9tIHRo ZSBldmVudCdzIHRleHQuIFRoZSBvbmx5CiAgICAgLy8gcGxhY2UgdGhpcyBrZXljb2RlIHdpbGwg YmUgdXNlZCBpcyBpbiB3ZWJraXRfdGVzdF9wbHVnaW5faGFuZGxlX2V2ZW50KCkuCisgICAgLy8g RklYTUU6IENyZWF0ZSBRdCBBUEkgc28gdGhhdCB3ZSBjYW4gc2V0IHRoZSBhcHByb3ByaWF0ZSBr ZXljb2RlIGluIERSVCBFdmVudFNlbmRlciBpbnN0ZWFkLgogICAgIGlmIChRV2ViUGFnZVByaXZh dGU6OmRydFJ1biAmJiAheEV2ZW50LT54a2V5LmtleWNvZGUpIHsKICAgICAgICAgUUtleUV2ZW50 KiBxS2V5RXZlbnQgPSBrZXlFdmVudC0+cXRFdmVudCgpOwogICAgICAgICBBU1NFUlQocUtleUV2 ZW50KTsKLSAgICAgICAgaWYgKCFxS2V5RXZlbnQtPnRleHQoKS5pc0VtcHR5KCkpCi0gICAgICAg ICAgICB4RXZlbnQtPnhrZXkua2V5Y29kZSA9IGludChxS2V5RXZlbnQtPnRleHQoKS5hdCgwKS51 bmljb2RlKCkgKyBxS2V5RXZlbnQtPm1vZGlmaWVycygpKTsKLSAgICAgICAgZWxzZSBpZiAocUtl eUV2ZW50LT5rZXkoKSAmJiAocUtleUV2ZW50LT5rZXkoKSAhPSBRdDo6S2V5X3Vua25vd24pKQot ICAgICAgICAgICAgeEV2ZW50LT54a2V5LmtleWNvZGUgPSBpbnQocUtleUV2ZW50LT5rZXkoKSAr IHFLZXlFdmVudC0+bW9kaWZpZXJzKCkpOworICAgICAgICBRU3RyaW5nIGNociA9IHFLZXlFdmVu dC0+dGV4dCgpLmxlZnQoMSk7CisgICAgICAgIHhFdmVudC0+eGtleS5rZXljb2RlID0gWEtleXN5 bVRvS2V5Y29kZShRWDExSW5mbzo6ZGlzcGxheSgpLCBYU3RyaW5nVG9LZXlzeW0oY2hyLnRvVXRm OCgpLmNvbnN0RGF0YSgpKSk7CiAgICAgfQogCiAgICAgeEV2ZW50LT54a2V5LnNhbWVfc2NyZWVu ID0gdHJ1ZTsK 79108 2011-01-16 12:48:34 -0800 2011-01-16 13:08:43 -0800 Patch bug-50050-20110116204829.patch text/plain 3720 robert ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1MzI2ZmY2ZDk1YWFiZWFmMzgwYmJkNjNjYzA0NTk2ZTk3YTNmODNmLi41NGNmNzky ZjE3MmEzMGJjMjNmMGU2OWJiNGFmMDUzNmEyNGJhNWY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDEtMTYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCisKKyAgICAgICAgW1F0XSBwbHVnaW5zL2tleWJv YXJkLWV2ZW50cy5odG1sIGZhaWxzIGFmdGVyIHI3MjcxNworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAwNTAKKworICAgICAgICAqIHBsYXRmb3JtL3F0 L1NraXBwZWQ6IFVuc2tpcCBwbHVnaW5zL2tleWJvYXJkLWV2ZW50cy5odG1sCisKIDIwMTEtMDEt MTUgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBTa2lwIGZh c3QvZG9tL1JhbmdlL3JhbmdlLWNsb25lLWNvbnRlbnRzLmh0bWwgb24gV2luZG93cwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3F0L1NraXBwZWQKaW5kZXggMGMzOTg2ZmNiZGEwN2ExMjEyNTMxYjEzYzQwZTQwYzVlMDM3 M2Y3Yi4uNmM5MmJhZTk4YmQzMzliNWI0ZDBiZmJhOTYxNGE4MDNlZWY1MTQ1OCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkCkBAIC01MzE5LDEwICs1MzE5LDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0 eS9hYm91dEJsYW5rL3hzcy1ERU5JRUQtbmF2aWdhdGUtb3BlbmVyLWRvY3VtZW50LXdyaXRlLmh0 bWwKIGh0dHAvdGVzdHMvc2VjdXJpdHkvYWJvdXRCbGFuay94c3MtREVOSUVELW5hdmlnYXRlLW9w ZW5lci1qYXZhc2NyaXB0LXVybC5odG1sCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Fib3V0Qmxhbmsv eHNzLURFTklFRC1zZXQtb3BlbmVyLmh0bWwKIAotIyBbUXRdIHBsdWdpbnMva2V5Ym9hcmQtZXZl bnRzLmh0bWwgZmFpbHMgYWZ0ZXIgcjcyNzE3Ci0jIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDA1MAotcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbAotCiAjIFJF R1JFU1NJT04ocjcyODYxKTogZWRpdGluZy9zZWxlY3Rpb24vY2xpY2stbGVmdC1vZi1ydGwtd3Jh cHBpbmctdGV4dC5odG1sIGFuZCBtb2RpZnktdXAtb24tcnRsLXdyYXBwaW5nLXRleHQuaHRtbCBm YWlsIG9uIGFsbCBidXQgTWFjIHBsYXRmb3JtCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDIwNAogZWRpdGluZy9zZWxlY3Rpb24vY2xpY2stbGVmdC1vZi1ydGwt d3JhcHBpbmctdGV4dC5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA0MjhhNDA0NGVjZmVhY2I4YWNhMzBm ZTA4ODEyZDU0YWI3ZjYwNy4uNjZlNzE2YmNjMGE0ZTM1ZWMwZTE4MTRlNjgxNmIwZGYxOWVhMDRk YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTAxLTE2ICBSb2JlcnQgSG9nYW4g IDxyb2JlcnRAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5n LgorCisgICAgICAgIFtRdF0gcGx1Z2lucy9rZXlib2FyZC1ldmVudHMuaHRtbCBmYWlscyBhZnRl ciByNzI3MTcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUwMDUwCisKKyAgICAgICAgKiBwbHVnaW5zL3F0L1BsdWdpblZpZXdRdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpzZXRYS2V5RXZlbnRTcGVjaWZpY0ZpZWxkcyk6IG1hcCBldmVudCB0ZXh0IHRv IGtleWNvZGUKKwogMjAxMS0wMS0xNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBn bWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjc1NzA4LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGx1Z2lucy9xdC9QbHVnaW5WaWV3UXQuY3BwCmluZGV4IGZkYmU1NTJkMWE1 MzMwMDAwMGNlZGJhMWJiMjg3MjdjNjM4ZjdiMzAuLjZjZjM2ZTk2NWNmMTE0YzM4ZWQzZGY1Mzg3 ZTVmYjQ5YTE3NDU0NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvcXQvUGx1 Z2luVmlld1F0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3F0L1BsdWdpblZpZXdR dC5jcHAKQEAgLTQxNywxNSArNDE3LDE0IEBAIHZvaWQgc2V0WEtleUV2ZW50U3BlY2lmaWNGaWVs ZHMoWEV2ZW50KiB4RXZlbnQsIEtleWJvYXJkRXZlbnQqIGV2ZW50KQogICAgIHhFdmVudC0+eGtl eS5rZXljb2RlID0ga2V5RXZlbnQtPm5hdGl2ZVNjYW5Db2RlKCk7CiAKICAgICAvLyBXZSBtYXkg bm90IGhhdmUgYSBuYXRpdmVTY2FuQ29kZSgpIGlmIHRoZSBrZXkgZXZlbnQgaXMgZnJvbSBEUlQn cyBldmVudHNlbmRlci4gSW4gdGhhdAotICAgIC8vIGNhc2UganVzdCBwb3B1bGF0ZSB0aGUgWEV2 ZW50J3Mga2V5Y29kZSB3aXRoIHRoZSBRdCBwbGF0Zm9ybS1pbmRlcGVuZGVudCBrZXljb2RlLiBU aGUgb25seQorICAgIC8vIGNhc2UgZmV0Y2ggdGhlIFhFdmVudCdzIGtleWNvZGUgZnJvbSB0aGUg ZXZlbnQncyB0ZXh0LiBUaGUgb25seQogICAgIC8vIHBsYWNlIHRoaXMga2V5Y29kZSB3aWxsIGJl IHVzZWQgaXMgaW4gd2Via2l0X3Rlc3RfcGx1Z2luX2hhbmRsZV9ldmVudCgpLgorICAgIC8vIEZJ WE1FOiBDcmVhdGUgUXQgQVBJIHNvIHRoYXQgd2UgY2FuIHNldCB0aGUgYXBwcm9wcmlhdGUga2V5 Y29kZSBpbiBEUlQgRXZlbnRTZW5kZXIgaW5zdGVhZC4KICAgICBpZiAoUVdlYlBhZ2VQcml2YXRl OjpkcnRSdW4gJiYgIXhFdmVudC0+eGtleS5rZXljb2RlKSB7CiAgICAgICAgIFFLZXlFdmVudCog cUtleUV2ZW50ID0ga2V5RXZlbnQtPnF0RXZlbnQoKTsKICAgICAgICAgQVNTRVJUKHFLZXlFdmVu dCk7Ci0gICAgICAgIGlmICghcUtleUV2ZW50LT50ZXh0KCkuaXNFbXB0eSgpKQotICAgICAgICAg ICAgeEV2ZW50LT54a2V5LmtleWNvZGUgPSBpbnQocUtleUV2ZW50LT50ZXh0KCkuYXQoMCkudW5p Y29kZSgpICsgcUtleUV2ZW50LT5tb2RpZmllcnMoKSk7Ci0gICAgICAgIGVsc2UgaWYgKHFLZXlF dmVudC0+a2V5KCkgJiYgKHFLZXlFdmVudC0+a2V5KCkgIT0gUXQ6OktleV91bmtub3duKSkKLSAg ICAgICAgICAgIHhFdmVudC0+eGtleS5rZXljb2RlID0gaW50KHFLZXlFdmVudC0+a2V5KCkgKyBx S2V5RXZlbnQtPm1vZGlmaWVycygpKTsKKyAgICAgICAgUVN0cmluZyBrZXlUZXh0ID0gcUtleUV2 ZW50LT50ZXh0KCkubGVmdCgxKTsKKyAgICAgICAgeEV2ZW50LT54a2V5LmtleWNvZGUgPSBYS2V5 c3ltVG9LZXljb2RlKFFYMTFJbmZvOjpkaXNwbGF5KCksIFhTdHJpbmdUb0tleXN5bShrZXlUZXh0 LnRvVXRmOCgpLmNvbnN0RGF0YSgpKSk7CiAgICAgfQogCiAgICAgeEV2ZW50LT54a2V5LnNhbWVf c2NyZWVuID0gdHJ1ZTsK