35299 2010-02-23 09:11:27 -0800 [Gtk] mousemove event always has metaKey == true 2011-10-21 10:27:19 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) PC Linux RESOLVED FIXED PlatformOnly P2 Normal --- 0 grant_gayed webkit-unassigned mrobinson webkit.devdatta webkit.review.bot oldest_to_newest 192981 0 grant_gayed 2010-02-23 09:11:27 -0800 - observed with WebKitGTK 1.1.21 - view the page below in GtkLauncher, which just listens for mousemove and shows an alert with the event's metaKey value - mouse into the browser and note that alerts are shown with 'true' even though a modifier key is not being held -> (I'm not actually sure which key should set this value to true on a standard keyboard, I think Command does this on OS X) <html> <head> <script language="JavaScript"> function mousehandler(e) { alert(e.metaKey); } function init() { document.onmousemove = mousehandler; } </script> </head> <body onLoad="init()"> is meta key down? </body> </html> 192985 1 ap 2010-02-23 09:31:05 -0800 This doesn't happen for me in Safari, so it looks Gtk-specific. 458023 2 105450 webkit.devdatta 2011-08-28 13:21:17 -0700 Created attachment 105450 Patch 458024 3 105450 mrobinson 2011-08-28 14:32:16 -0700 Comment on attachment 105450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105450&action=review > Source/WebCore/ChangeLog:5 > + GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify > + the meta key state. Use GDK_META_MASK instead. > + https://bugs.webkit.org/show_bug.cgi?id=35299 The format here should be: bug title bug url review line description > Source/WebCore/ChangeLog:12 > + Test: manual-tests/special-key-states-for-mouse-events.html > + > + * manual-tests/special-key-states-for-mouse-events.html: Added a manual > + test which shows the status of special keys for different mouse events. As long as you are updating EventSender, it makes sense to make an automated test. > Tools/ChangeLog:7 > + GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify > + the meta key state. Use GDK_META_MASK instead. > + https://bugs.webkit.org/show_bug.cgi?id=35299 > + > + Reviewed by NOBODY (OOPS!). See above. > Tools/DumpRenderTree/gtk/EventSender.cpp:278 > - // Currently the metaKey as defined in WebCore/platform/gtk/MouseEventGtk.cpp > - // is GDK_MOD2_MASK. This code must be kept in sync with that file. > else if (JSStringIsEqualToUTF8CString(string, "metaKey")) Why remove this comment instead of updating it? 469254 4 107809 webkit.devdatta 2011-09-18 23:50:43 -0700 Created attachment 107809 Patch after incorporating review comments. Updated patch 469260 5 webkit.devdatta 2011-09-19 00:21:15 -0700 (In reply to comment #3) > (From update of attachment 105450 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105450&action=review > > > Source/WebCore/ChangeLog:5 > > + GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify > > + the meta key state. Use GDK_META_MASK instead. > > + https://bugs.webkit.org/show_bug.cgi?id=35299 > > The format here should be: > > bug title > bug url > > review line > > description > Modified the change log as per review comments. > > Source/WebCore/ChangeLog:12 > > + Test: manual-tests/special-key-states-for-mouse-events.html > > + > > + * manual-tests/special-key-states-for-mouse-events.html: Added a manual > > + test which shows the status of special keys for different mouse events. > > As long as you are updating EventSender, it makes sense to make an automated test. > The metaKey attribute in EventSender was not in sync with the mouse and keyboard events from WebCore. I have added a different bug for this <https://bugs.webkit.org/show_bug.cgi?id=68324>. Also, none of the ports uses modifier keys for mouse move in EventSender, hence a manual test case is added to test modifier keys for mouse move event. > > Tools/ChangeLog:7 > > + GDK_MOD2_MASK doesn't always mean meta so we can't use it to identify > > + the meta key state. Use GDK_META_MASK instead. > > + https://bugs.webkit.org/show_bug.cgi?id=35299 > > + > > + Reviewed by NOBODY (OOPS!). > > See above. > > > Tools/DumpRenderTree/gtk/EventSender.cpp:278 > > - // Currently the metaKey as defined in WebCore/platform/gtk/MouseEventGtk.cpp > > - // is GDK_MOD2_MASK. This code must be kept in sync with that file. > > else if (JSStringIsEqualToUTF8CString(string, "metaKey")) > > Why remove this comment instead of updating it? Updated the comment in the patch for Bug 68324. 469267 6 105450 mrobinson 2011-09-19 00:38:23 -0700 Comment on attachment 105450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105450&action=review >>> Source/WebCore/ChangeLog:12 >>> + test which shows the status of special keys for different mouse events. >> >> As long as you are updating EventSender, it makes sense to make an automated test. > > The metaKey attribute in EventSender was not in sync with the mouse and keyboard events from WebCore. I have added a different bug for this <https://bugs.webkit.org/show_bug.cgi?id=68324>. > > Also, none of the ports uses modifier keys for mouse move in EventSender, hence a manual test case is added to test modifier keys for mouse move event. I think it makes sense to add this to the EventSender and make the test GTK+ only for now. Manual tests don't protect us from regressions. I'm not sure why you use a separate bug to fix EventSender, since this patch changes it below. I think it's better as one patch, since you can make the fix and test it all at once. 469270 7 107809 mrobinson 2011-09-19 00:39:11 -0700 Comment on attachment 107809 Patch after incorporating review comments. This patch should fix EventSender and use an automated test. 469297 8 107820 webkit.devdatta 2011-09-19 02:28:57 -0700 Created attachment 107820 Combined patch for EventSender and metaKey state for mouse move I have combined both EventSender and mouse move patch into one and added an automated test under platform/gtk to test both the changes. 470398 9 107820 mrobinson 2011-09-20 15:27:37 -0700 Comment on attachment 107820 Combined patch for EventSender and metaKey state for mouse move View in context: https://bugs.webkit.org/attachment.cgi?id=107820&action=review > LayoutTests/platform/gtk/fast/events/event-sender-metakey.html:16 > + if(true == failed) > + return; > + if(e.metaKey != metaKey) > + failed = true; > + } You're missing spaces after both 'if's here. > LayoutTests/platform/gtk/fast/events/event-sender-metakey.html:40 > + resultDiv.innerHTML = (true == failed) ? "FAIL" : "PASS"; Why not just this resultDiv.innerHTML = failed ? "FAIL" : "PASS"; ? 470601 10 108108 webkit.devdatta 2011-09-20 22:26:36 -0700 Created attachment 108108 Patch after incorporating review comments. 470842 11 108108 mrobinson 2011-09-21 08:55:33 -0700 Comment on attachment 108108 Patch after incorporating review comments. Thank you! 488326 12 webkit.devdatta 2011-10-21 05:10:46 -0700 Hey Martin, Can you please help me commit this patch? I am unable to commit this as I am not a commiter. Thanks. 488462 13 108108 webkit.review.bot 2011-10-21 10:27:14 -0700 Comment on attachment 108108 Patch after incorporating review comments. Clearing flags on attachment: 108108 Committed r98108: <http://trac.webkit.org/changeset/98108> 488463 14 webkit.review.bot 2011-10-21 10:27:19 -0700 All reviewed patches have been landed. Closing bug. 105450 2011-08-28 13:21:17 -0700 2011-09-19 00:38:23 -0700 Patch bug-35299-20110829015114.patch text/plain 4921 webkit.devdatta SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzOTUwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMjggIERldmRhdHRh IERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAgICAgR0RLX01PRDJfTUFT SyBkb2Vzbid0IGFsd2F5cyBtZWFuIG1ldGEgc28gd2UgY2FuJ3QgdXNlIGl0IHRvIGlkZW50aWZ5 CisgICAgICAgIHRoZSBtZXRhIGtleSBzdGF0ZS4gVXNlIEdES19NRVRBX01BU0sgaW5zdGVhZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1Mjk5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogbWFu dWFsLXRlc3RzL3NwZWNpYWwta2V5LXN0YXRlcy1mb3ItbW91c2UtZXZlbnRzLmh0bWwKKworICAg ICAgICAqIG1hbnVhbC10ZXN0cy9zcGVjaWFsLWtleS1zdGF0ZXMtZm9yLW1vdXNlLWV2ZW50cy5o dG1sOiBBZGRlZCBhIG1hbnVhbAorICAgICAgICB0ZXN0IHdoaWNoIHNob3dzIHRoZSBzdGF0dXMg b2Ygc3BlY2lhbCBrZXlzIGZvciBkaWZmZXJlbnQgbW91c2UgZXZlbnRzLgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9QbGF0Zm9ybU1vdXNlRXZlbnRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOiBVc2UgR0RLX01FVEFfTUFT SyB0bworICAgICAgICBnZXQgdGhlIG1ldGEga2V5IHN0YXRlLgorCiAyMDExLTA4LTI3ICBBbmRy ZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KIAogICAgICAgICBTUUxpdGVTdGF0ZW1lbnQ6 OmdldENvbHVtblRleHQoKSBjb3VsZCBjb25zdHJ1Y3QgV1RGOjpTdHJpbmcgcmVzdWx0IG1vcmUg ZWZmaWNpZW50bHkuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9tYW51YWwtdGVzdHMvc3BlY2lhbC1r ZXktc3RhdGVzLWZvci1tb3VzZS1ldmVudHMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9tYW51YWwtdGVzdHMvc3BlY2lhbC1rZXktc3RhdGVzLWZvci1tb3VzZS1ldmVudHMuaHRt bAkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9zcGVjaWFsLWtl eS1zdGF0ZXMtZm9yLW1vdXNlLWV2ZW50cy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM4 IEBACis8aHRtbD48aGVhZD48L2hlYWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCB2ZXJpZmllcyB0 aGUgY29ycmVjdCBzdGF0ZXMgb2Ygc3BlY2lhbCBrZXlzIGFuZCBzZXF1ZW5jZSBvZiBtb3VzZSBl dmVudHMgZ2VuZXJhdGVkLiBUbyB0ZXN0IG1hbnVhbGx5LCBjbGljayBvciBob3ZlciBtb3VzZSBv biB0aGUgaW5wdXQgYnV0dG9uIGFuZCBjb21wYXJlIHJlc3VsdHMgdG8gb3RoZXIgYnJvd3NlcnMu PC9wPgorPGlucHV0IHR5cGU9ImJ1dHRvbiIgdmFsdWU9Ik1vdXNlIEV2ZW50cyI+PC9pbnB1dD4K KzxkaXY+Jm5ic3A7PC9kaXY+Cis8dHQgaWQ9ImxvZyIgc3R5bGU9J2JhY2tncm91bmQtY29sb3I6 I2VlZWVlZSc+CisgLS0gTm8gZXZlbnQgY2FwdHVyZWQgLS0KKzwvdHQ+Cis8c2NyaXB0PgorZnVu Y3Rpb24gbG9nKG1zZywgYXBwZW5kKSB7CisgIGlmKGFwcGVuZCkgCisgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImxvZyIpLmlubmVySFRNTCArPSBtc2cgKyAiPGJyPiI7CisgICBlbHNlCisg ICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImxvZyIpLmlubmVySFRNTCA9IG1zZyArICI8YnI+ IjsKK30KKworZnVuY3Rpb24gbG9nRXZlbnQoZSkgeworICB2YXIgc3RyID0KKyAgICAgICAgICJF VkVOVCBQUk9QRVJUSUVTPGJyPiIgICAgICAgICAgICAgICAgICAgICAgICsKKyAgICAgICAgICJ0 YXJnZXQgICAgICAgICAgPSAiK2UudGFyZ2V0KyI8YnI+IiAgICAgKworICAgICAgICAgInR5cGUg ICAgICAgICAgICA9ICIrZS50eXBlKyI8YnI+IiAgICAgICArCisgICAgICAgICAiY2FuY2VsYWJs ZSAgICAgID0gIitlLmNhbmNlbGFibGUrIjxicj4iICsKKyAgICAgICAgICJjdHJsS2V5ICAgICAg ICAgPSAiK2UuY3RybEtleSsiPGJyPiIgICAgKworICAgICAgICAgIm1ldGFLZXkgICAgICAgICA9 ICIrZS5tZXRhS2V5KyI8YnI+IiAgICArCisgICAgICAgICAic2hpZnRLZXkgICAgICAgID0gIitl LnNoaWZ0S2V5KyI8YnI+IiAgICsKKyAgICAgICAgICIiOworICB2YXIgYXBwZW5kID0gKGUudHlw ZSAhPSAibW91c2Vtb3ZlIiAmJiBlLnR5cGUgIT0gIm1vdXNlZG93biIpOworICBsb2coc3RyLCBh cHBlbmQpOworfQorCit2YXIgaW5wdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgi aW5wdXQiKVswXTsKK2lucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ2NsaWNrJywgbG9nRXZlbnQsIGZh bHNlKTsKK2lucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlZG93bicsIGxvZ0V2ZW50LCBmYWxz ZSk7CitpbnB1dC5hZGRFdmVudExpc3RlbmVyKCdtb3VzZXVwJywgbG9nRXZlbnQsIGZhbHNlKTsK K2lucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlbW92ZScsIGxvZ0V2ZW50LCBmYWxzZSk7Citp bnB1dC5mb2N1cygpOworPC9zY3JpcHQ+Cis8L2JvZHk+PC9odG1sPgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAJ KHJldmlzaW9uIDkzOTQ4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3Jt TW91c2VFdmVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDcgKzgzLDcgQEAgUGxhdGZv cm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoRwogICAgIG1fc2hpZnRLZXkgPSBtb3Rp b24tPnN0YXRlICYgR0RLX1NISUZUX01BU0s7CiAgICAgbV9jdHJsS2V5ID0gbW90aW9uLT5zdGF0 ZSAmIEdES19DT05UUk9MX01BU0s7CiAgICAgbV9hbHRLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RL X01PRDFfTUFTSzsKLSAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDJfTUFT SzsKKyAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01FVEFfTUFTSzsKIAogICAg IHN3aXRjaCAobW90aW9uLT50eXBlKSB7CiAgICAgY2FzZSBHREtfTU9USU9OX05PVElGWToKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDkzOTUwKQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTEtMDgtMjggIERldmRhdHRhIERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5j b20+CisKKyAgICAgICAgR0RLX01PRDJfTUFTSyBkb2Vzbid0IGFsd2F5cyBtZWFuIG1ldGEgc28g d2UgY2FuJ3QgdXNlIGl0IHRvIGlkZW50aWZ5CisgICAgICAgIHRoZSBtZXRhIGtleSBzdGF0ZS4g VXNlIEdES19NRVRBX01BU0sgaW5zdGVhZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1Mjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwOgor ICAgICAgICAoZ2RrTW9kaWZpZXJGcm9tSlNWYWx1ZSk6IFVzZSBHREtfTUVUQV9NQVNLIHRvIGdl dCBzdGF0ZSBvZiBtZXRhIGtleS4KKwogMjAxMS0wOC0yNyAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRl ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGEgYnVpbGQgYm90IGZvciBDaHJvbWl1bSB3 aXRoIE9TKEFORFJPSUQpCkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5k ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRl ci5jcHAJKHJldmlzaW9uIDkzOTQ4KQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50 U2VuZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc1LDExICsyNzUsOCBAQCBzdGF0aWMgZ3Vp bnQgZ2RrTW9kaWZpZXJGcm9tSlNWYWx1ZShKU0NvCiAgICAgICAgIGdka01vZGlmaWVyID0gR0RL X1NISUZUX01BU0s7CiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhz dHJpbmcsICJhbHRLZXkiKSkKICAgICAgICAgZ2RrTW9kaWZpZXIgPSBHREtfTU9EMV9NQVNLOwot ICAgIAotICAgIC8vIEN1cnJlbnRseSB0aGUgbWV0YUtleSBhcyBkZWZpbmVkIGluIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL01vdXNlRXZlbnRHdGsuY3BwCi0gICAgLy8gaXMgR0RLX01PRDJfTUFTSy4g VGhpcyBjb2RlIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggdGhhdCBmaWxlLgogICAgIGVsc2Ug aWYgKEpTU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJpbmcoc3RyaW5nLCAibWV0YUtleSIpKQotICAg ICAgICBnZGtNb2RpZmllciA9IEdES19NT0QyX01BU0s7CisgICAgICAgIGdka01vZGlmaWVyID0g R0RLX01FVEFfTUFTSzsKICAgICAKICAgICBKU1N0cmluZ1JlbGVhc2Uoc3RyaW5nKTsKICAgICBy ZXR1cm4gZ2RrTW9kaWZpZXI7Cg== 107809 2011-09-18 23:50:43 -0700 2011-09-19 02:28:57 -0700 Patch after incorporating review comments. Bug35299.patch text/plain 3243 webkit.devdatta SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDAxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDktMTggIERldmRhdHRh IERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAgICAgW0d0a10gbW91c2Vt b3ZlIGV2ZW50IGFsd2F5cyBoYXMgbWV0YUtleSA9PSB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdES19NT0QyX01BU0sgZG9lc24ndCBhbHdheXMg bWVhbiBtZXRhIHNvIHdlIGNhbid0IHVzZSBpdCB0byBpZGVudGlmeQorICAgICAgICB0aGUgbWV0 YSBrZXkgc3RhdGUuIFVzZSBHREtfTUVUQV9NQVNLIGluc3RlYWQuCisKKyAgICAgICAgKiBtYW51 YWwtdGVzdHMvc3BlY2lhbC1rZXktc3RhdGVzLWZvci1tb3VzZS1ldmVudHMuaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQ6OlBsYXRmb3JtTW91c2VFdmVudCk6CisK IDIwMTEtMDktMTggIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IGNocm9taXVtLXdpbjogIlNhdmUgdGltZWxpbmUgZGF0YSIg ZG9lcyBub3RoaW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUvbWFudWFsLXRlc3RzL3NwZWNpYWwt a2V5LXN0YXRlcy1mb3ItbW91c2UtZXZlbnRzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvbWFudWFsLXRlc3RzL3NwZWNpYWwta2V5LXN0YXRlcy1mb3ItbW91c2UtZXZlbnRzLmh0 bWwJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViQ29yZS9tYW51YWwtdGVzdHMvc3BlY2lhbC1r ZXktc3RhdGVzLWZvci1tb3VzZS1ldmVudHMuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwz OCBAQAorPGh0bWw+PGhlYWQ+PC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3QgdmVyaWZpZXMg dGhlIGNvcnJlY3Qgc3RhdGVzIG9mIHNwZWNpYWwga2V5cyBhbmQgc2VxdWVuY2Ugb2YgbW91c2Ug ZXZlbnRzIGdlbmVyYXRlZC4gVG8gdGVzdCBtYW51YWxseSwgY2xpY2sgb3IgaG92ZXIgbW91c2Ug b24gdGhlIGlucHV0IGJ1dHRvbiBhbmQgY29tcGFyZSByZXN1bHRzIHRvIG90aGVyIGJyb3dzZXJz LjwvcD4KKzxpbnB1dCB0eXBlPSJidXR0b24iIHZhbHVlPSJNb3VzZSBFdmVudHMiPjwvaW5wdXQ+ Cis8ZGl2PiZuYnNwOzwvZGl2PgorPHR0IGlkPSJsb2ciIHN0eWxlPSdiYWNrZ3JvdW5kLWNvbG9y OiNlZWVlZWUnPgorIC0tIE5vIGV2ZW50IGNhcHR1cmVkIC0tCis8L3R0PgorPHNjcmlwdD4KK2Z1 bmN0aW9uIGxvZyhtc2csIGFwcGVuZCkgeworICBpZihhcHBlbmQpIAorICAgIGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJsb2ciKS5pbm5lckhUTUwgKz0gbXNnICsgIjxicj4iOworICAgZWxzZQor ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJsb2ciKS5pbm5lckhUTUwgPSBtc2cgKyAiPGJy PiI7Cit9CisKK2Z1bmN0aW9uIGxvZ0V2ZW50KGUpIHsKKyAgdmFyIHN0ciA9CisgICAgICAgICAi RVZFTlQgUFJPUEVSVElFUzxicj4iICAgICAgICAgICAgICAgICAgICsKKyAgICAgICAgICJ0YXJn ZXQgICAgICAgICAgPSAiK2UudGFyZ2V0KyI8YnI+IiAgICAgKworICAgICAgICAgInR5cGUgICAg ICAgICAgICA9ICIrZS50eXBlKyI8YnI+IiAgICAgICArCisgICAgICAgICAiY2FuY2VsYWJsZSAg ICAgID0gIitlLmNhbmNlbGFibGUrIjxicj4iICsKKyAgICAgICAgICJjdHJsS2V5ICAgICAgICAg PSAiK2UuY3RybEtleSsiPGJyPiIgICAgKworICAgICAgICAgIm1ldGFLZXkgICAgICAgICA9ICIr ZS5tZXRhS2V5KyI8YnI+IiAgICArCisgICAgICAgICAic2hpZnRLZXkgICAgICAgID0gIitlLnNo aWZ0S2V5KyI8YnI+IiAgICsKKyAgICAgICAgICIiOworICB2YXIgYXBwZW5kID0gKGUudHlwZSAh PSAibW91c2Vtb3ZlIiAmJiBlLnR5cGUgIT0gIm1vdXNlZG93biIpOworICBsb2coc3RyLCBhcHBl bmQpOworfQorCit2YXIgaW5wdXQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgiaW5w dXQiKVswXTsKK2lucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ2NsaWNrJywgbG9nRXZlbnQsIGZhbHNl KTsKK2lucHV0LmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlZG93bicsIGxvZ0V2ZW50LCBmYWxzZSk7 CitpbnB1dC5hZGRFdmVudExpc3RlbmVyKCdtb3VzZXVwJywgbG9nRXZlbnQsIGZhbHNlKTsKK2lu cHV0LmFkZEV2ZW50TGlzdGVuZXIoJ21vdXNlbW92ZScsIGxvZ0V2ZW50LCBmYWxzZSk7CitpbnB1 dC5mb2N1cygpOworPC9zY3JpcHQ+Cis8L2JvZHk+PC9odG1sPgpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAJKHJl dmlzaW9uIDk1NDAwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91 c2VFdmVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDcgKzgzLDcgQEAgUGxhdGZvcm1N b3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoRwogICAgIG1fc2hpZnRLZXkgPSBtb3Rpb24t PnN0YXRlICYgR0RLX1NISUZUX01BU0s7CiAgICAgbV9jdHJsS2V5ID0gbW90aW9uLT5zdGF0ZSAm IEdES19DT05UUk9MX01BU0s7CiAgICAgbV9hbHRLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01P RDFfTUFTSzsKLSAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDJfTUFTSzsK KyAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01FVEFfTUFTSzsKIAogICAgIHN3 aXRjaCAobW90aW9uLT50eXBlKSB7CiAgICAgY2FzZSBHREtfTU9USU9OX05PVElGWToK 107820 2011-09-19 02:28:57 -0700 2011-09-20 22:27:27 -0700 Combined patch for EventSender and metaKey state for mouse move Bug35299.patch text/plain 6562 webkit.devdatta SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDA1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMTkgIERldmRhdHRh IERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAgICAgW0d0a10gbW91c2Vt b3ZlIGV2ZW50IGFsd2F5cyBoYXMgbWV0YUtleSA9PSB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdES19NT0QyX01BU0sgZG9lc24ndCBhbHdheXMg bWVhbiBtZXRhIHNvIHdlIGNhbid0IHVzZSBpdCB0byBpZGVudGlmeQorICAgICAgICB0aGUgbWV0 YSBrZXkgc3RhdGUuIFVzZSBHREtfTUVUQV9NQVNLIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDog cGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRha2V5Lmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybU1vdXNlRXZlbnRHdGsuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOgorCiAyMDEx LTA5LTE4ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRvbid0IHNo b3cgdXAgaW4gdGhlIHRpbWVsaW5lIHBhbmVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAJKHJldmlzaW9uIDk1 NDAwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0 ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDcgKzgzLDcgQEAgUGxhdGZvcm1Nb3VzZUV2ZW50 OjpQbGF0Zm9ybU1vdXNlRXZlbnQoRwogICAgIG1fc2hpZnRLZXkgPSBtb3Rpb24tPnN0YXRlICYg R0RLX1NISUZUX01BU0s7CiAgICAgbV9jdHJsS2V5ID0gbW90aW9uLT5zdGF0ZSAmIEdES19DT05U Uk9MX01BU0s7CiAgICAgbV9hbHRLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDFfTUFTSzsK LSAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDJfTUFTSzsKKyAgICBtX21l dGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01FVEFfTUFTSzsKIAogICAgIHN3aXRjaCAobW90 aW9uLT50eXBlKSB7CiAgICAgY2FzZSBHREtfTU9USU9OX05PVElGWToKSW5kZXg6IFRvb2xzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDA1KQor KysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEt MDktMTkgIERldmRhdHRhIERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAg ICAgW0d0a10gbW91c2Vtb3ZlIGV2ZW50IGFsd2F5cyBoYXMgbWV0YUtleSA9PSB0cnVlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI5OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKGdka01vZGlmaWVyRnJvbUpTVmFsdWUp OiBHREtfTUVUQV9NQVNLIGlzIHVzZWQgdG8gcmVwcmVzZW50IG1ldGFLZXkgZm9yIHBsYXRmb3Jt IEdUSyBtb3VzZSBhbmQKKyAgICAgICAga2V5Ym9hcmQgZXZlbnRzLiBTbyBtYWtpbmcgaXQgaW4g c3luYyB3aXRoIFdlYkNvcmUgZmlsZXMuCisgICAgICAgIChtb3VzZU1vdmVUb0NhbGxiYWNrKTog U2VuZGluZyBtb2RpZmllciBrZXlzIHN0YXRlIGZvciBtb3VzZSBtb3ZlIGV2ZW50LgorCiAyMDEx LTA5LTE2ICBFbGxpb3QgUG9nZXIgIDxlcG9nZXJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBhZGQg bm9uLUNHIFdlYmtpdC1NYWMgYnVpbGRzIHRvIGZsYWtpbmVzcyBkYXNoYm9hcmQKSW5kZXg6IFRv b2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcAkocmV2aXNpb24gOTU0MDApCisr KyBUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNzYsMTAgKzI3NiwxMCBAQCBzdGF0aWMgZ3VpbnQgZ2RrTW9kaWZpZXJGcm9tSlNWYWx1 ZShKU0NvCiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhzdHJpbmcs ICJhbHRLZXkiKSkKICAgICAgICAgZ2RrTW9kaWZpZXIgPSBHREtfTU9EMV9NQVNLOwogICAgIAot ICAgIC8vIEN1cnJlbnRseSB0aGUgbWV0YUtleSBhcyBkZWZpbmVkIGluIFdlYkNvcmUvcGxhdGZv cm0vZ3RrL01vdXNlRXZlbnRHdGsuY3BwCi0gICAgLy8gaXMgR0RLX01PRDJfTUFTSy4gVGhpcyBj b2RlIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggdGhhdCBmaWxlLgorICAgIC8vIEN1cnJlbnRs eSB0aGUgbWV0YUtleSBhcyBkZWZpbmVkIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3Jt TW91c2VFdmVudEd0ay5jcHAKKyAgICAvLyBpcyBHREtfTUVUQV9NQVNLLiBUaGlzIGNvZGUgbXVz dCBiZSBrZXB0IGluIHN5bmMgd2l0aCB0aGF0IGZpbGUuCiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJ c0VxdWFsVG9VVEY4Q1N0cmluZyhzdHJpbmcsICJtZXRhS2V5IikpCi0gICAgICAgIGdka01vZGlm aWVyID0gR0RLX01PRDJfTUFTSzsKKyAgICAgICAgZ2RrTW9kaWZpZXIgPSBHREtfTUVUQV9NQVNL OwogICAgIAogICAgIEpTU3RyaW5nUmVsZWFzZShzdHJpbmcpOwogICAgIHJldHVybiBnZGtNb2Rp ZmllcjsKQEAgLTM5NSw3ICszOTUsOSBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBtb3VzZU1vdmVUb0Nh bGxiYWNrKEpTCiAgICAgZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5k b3coR1RLX1dJREdFVCh2aWV3KSk7CiAgICAgZ19vYmplY3RfcmVmKGV2ZW50LT5tb3Rpb24ud2lu ZG93KTsKICAgICBldmVudC0+YnV0dG9uLmRldmljZSA9IGdldERlZmF1bHRHREtQb2ludGVyRGV2 aWNlKGV2ZW50LT5tb3Rpb24ud2luZG93KTsKLSAgICBldmVudC0+bW90aW9uLnN0YXRlID0gZ2V0 U3RhdGVGbGFncygpOworCisgICAgZ3VpbnQgbW9kaWZpZXJzID0gYXJndW1lbnRDb3VudCA+PSAz ID8gZ2RrTW9kaWZlcnNGcm9tSlNWYWx1ZShjb250ZXh0LCBhcmd1bWVudHNbMl0pIDogMDsKKyAg ICBldmVudC0+bW90aW9uLnN0YXRlID0gbW9kaWZpZXJzIHwgZ2V0U3RhdGVGbGFncygpOwogICAg IGV2ZW50LT5tb3Rpb24uYXhlcyA9IDA7CiAKICAgICBpbnQgeFJvb3QsIHlSb290OwpJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gOTU0MDUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wOS0xOSAgRGV2ZGF0dGEgRGVzaHBhbmRlICA8cHdq ZDczQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBbR3RrXSBtb3VzZW1vdmUgZXZlbnQgYWx3YXlz IGhhcyBtZXRhS2V5ID09IHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM1Mjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRm9yIHRlc3Rpbmcgc3RhdGUgb2YgbWV0YUtleSBmb3IgbW91c2UgYW5kIGtl eWJvYXJkIGV2ZW50cyBnZW5lcmF0ZWQKKyAgICAgICAgdXNpbmcgZXZuZXRTZW5kZXIgb2JqZWN0 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRh a2V5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvZXZl bnRzL2V2ZW50LXNlbmRlci1tZXRha2V5Lmh0bWw6IEFkZGVkLgorCiAyMDExLTA5LTE4ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRvbid0IHNob3cgdXAgaW4gdGhl IHRpbWVsaW5lIHBhbmVsLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZXZl bnRzL2V2ZW50LXNlbmRlci1tZXRha2V5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9ldmVudHMvZXZlbnQtc2VuZGVyLW1ldGFrZXktZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3Qv ZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRha2V5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwyIEBACitQQVNTCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0 L2V2ZW50cy9ldmVudC1zZW5kZXItbWV0YWtleS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9mYXN0L2V2ZW50cy9ldmVudC1zZW5kZXItbWV0YWtleS5odG1sCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50 LXNlbmRlci1tZXRha2V5Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDIgQEAKKzxodG1s PgorPGJvZHk+Cis8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPGlucHV0IGlkPSJ0ZXN0IiB0eXBl PSJidXR0b24iIHZhbHVlPSIiPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisK KyAgICB2YXIgbWV0YUtleSA9IGZhbHNlOworICAgIHZhciBmYWlsZWQgPSBmYWxzZTsKKyAgICBm dW5jdGlvbiBoYW5kbGVNZXRha2V5KGUpIHsKKyAgICAgICAgaWYodHJ1ZSA9PSBmYWlsZWQpCisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmKGUubWV0YUtleSAhPSBtZXRhS2V5KQorICAg ICAgICAgICAgZmFpbGVkID0gdHJ1ZTsKKyAgICB9CisgICAgdmFyIHRlc3QgPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgidGVzdCIpOworICAgIHRlc3QuYWRkRXZlbnRMaXN0ZW5lcignbW91c2Vt b3ZlJywgaGFuZGxlTWV0YWtleSwgZmFsc2UpOworICAgIHRlc3QuYWRkRXZlbnRMaXN0ZW5lcign bW91c2Vkb3duJywgaGFuZGxlTWV0YWtleSwgZmFsc2UpOworICAgIHRlc3QuYWRkRXZlbnRMaXN0 ZW5lcignbW91c2V1cCcsIGhhbmRsZU1ldGFrZXksIGZhbHNlKTsKKyAgICB0ZXN0LmFkZEV2ZW50 TGlzdGVuZXIoJ2tleWRvd24nLCBoYW5kbGVNZXRha2V5LCBmYWxzZSk7CisKKyAgICB0ZXN0LmZv Y3VzKCk7CisKKworICAgIC8vIEV2ZW50cyB3aXRoIG1ldGFrZXkgYXMgZmFsc2UKKyAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbyh0ZXN0Lm9mZnNldExlZnQsIHRlc3Qub2Zmc2V0VG9wKTsKKyAg ICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7Cisg ICAgZXZlbnRTZW5kZXIua2V5RG93bignYScpOworCisgICAgLy8gRXZlbnRzIHdpdGggbWV0YWtl eSBhcyB0cnVlCisgICAgbWV0YUtleSA9IHRydWU7CisgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8odGVzdC5vZmZzZXRMZWZ0LCB0ZXN0Lm9mZnNldFRvcCwgWyJtZXRhS2V5Il0pOworICAgIGV2 ZW50U2VuZGVyLm1vdXNlRG93bigxLCBbIm1ldGFLZXkiXSk7CisgICAgZXZlbnRTZW5kZXIubW91 c2VVcCgxLCBbIm1ldGFLZXkiXSk7CisgICAgZXZlbnRTZW5kZXIua2V5RG93bignYScsIFsibWV0 YUtleSJdKTsKKworICAgIHZhciByZXN1bHREaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi cmVzdWx0Iik7CisgICAgcmVzdWx0RGl2LmlubmVySFRNTCA9ICh0cnVlID09IGZhaWxlZCkgPyAi RkFJTCIgOiAiUEFTUyI7Cis8L3NjcmlwdD4KKzwvYm9keT4KXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBmaWxlCg== 108108 2011-09-20 22:26:36 -0700 2011-10-21 10:27:14 -0700 Patch after incorporating review comments. Bug35299.patch text/plain 6526 webkit.devdatta SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDA1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMTkgIERldmRhdHRh IERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAgICAgW0d0a10gbW91c2Vt b3ZlIGV2ZW50IGFsd2F5cyBoYXMgbWV0YUtleSA9PSB0cnVlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdES19NT0QyX01BU0sgZG9lc24ndCBhbHdheXMg bWVhbiBtZXRhIHNvIHdlIGNhbid0IHVzZSBpdCB0byBpZGVudGlmeQorICAgICAgICB0aGUgbWV0 YSBrZXkgc3RhdGUuIFVzZSBHREtfTUVUQV9NQVNLIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDog cGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRha2V5Lmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybU1vdXNlRXZlbnRHdGsuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQpOgorCiAyMDEx LTA5LTE4ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRvbid0IHNo b3cgdXAgaW4gdGhlIHRpbWVsaW5lIHBhbmVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0ay5jcHAJKHJldmlzaW9uIDk1 NDAwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtTW91c2VFdmVudEd0 ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzLDcgKzgzLDcgQEAgUGxhdGZvcm1Nb3VzZUV2ZW50 OjpQbGF0Zm9ybU1vdXNlRXZlbnQoRwogICAgIG1fc2hpZnRLZXkgPSBtb3Rpb24tPnN0YXRlICYg R0RLX1NISUZUX01BU0s7CiAgICAgbV9jdHJsS2V5ID0gbW90aW9uLT5zdGF0ZSAmIEdES19DT05U Uk9MX01BU0s7CiAgICAgbV9hbHRLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDFfTUFTSzsK LSAgICBtX21ldGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01PRDJfTUFTSzsKKyAgICBtX21l dGFLZXkgPSBtb3Rpb24tPnN0YXRlICYgR0RLX01FVEFfTUFTSzsKIAogICAgIHN3aXRjaCAobW90 aW9uLT50eXBlKSB7CiAgICAgY2FzZSBHREtfTU9USU9OX05PVElGWToKSW5kZXg6IFRvb2xzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk1NDA1KQor KysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEt MDktMTkgIERldmRhdHRhIERlc2hwYW5kZSAgPHB3amQ3M0Btb3Rvcm9sYS5jb20+CisKKyAgICAg ICAgW0d0a10gbW91c2Vtb3ZlIGV2ZW50IGFsd2F5cyBoYXMgbWV0YUtleSA9PSB0cnVlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTI5OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKGdka01vZGlmaWVyRnJvbUpTVmFsdWUp OiBHREtfTUVUQV9NQVNLIGlzIHVzZWQgdG8gcmVwcmVzZW50IG1ldGFLZXkgZm9yIHBsYXRmb3Jt IEdUSyBtb3VzZSBhbmQKKyAgICAgICAga2V5Ym9hcmQgZXZlbnRzLiBTbyBtYWtpbmcgaXQgaW4g c3luYyB3aXRoIFdlYkNvcmUgZmlsZXMuCisgICAgICAgIChtb3VzZU1vdmVUb0NhbGxiYWNrKTog U2VuZGluZyBtb2RpZmllciBrZXlzIHN0YXRlIGZvciBtb3VzZSBtb3ZlIGV2ZW50LgorCiAyMDEx LTA5LTE2ICBFbGxpb3QgUG9nZXIgIDxlcG9nZXJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBhZGQg bm9uLUNHIFdlYmtpdC1NYWMgYnVpbGRzIHRvIGZsYWtpbmVzcyBkYXNoYm9hcmQKSW5kZXg6IFRv b2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcAkocmV2aXNpb24gOTU0MDApCisr KyBUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNzYsMTAgKzI3NiwxMCBAQCBzdGF0aWMgZ3VpbnQgZ2RrTW9kaWZpZXJGcm9tSlNWYWx1 ZShKU0NvCiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhzdHJpbmcs ICJhbHRLZXkiKSkKICAgICAgICAgZ2RrTW9kaWZpZXIgPSBHREtfTU9EMV9NQVNLOwogICAgIAot ICAgIC8vIEN1cnJlbnRseSB0aGUgbWV0YUtleSBhcyBkZWZpbmVkIGluIFdlYkNvcmUvcGxhdGZv cm0vZ3RrL01vdXNlRXZlbnRHdGsuY3BwCi0gICAgLy8gaXMgR0RLX01PRDJfTUFTSy4gVGhpcyBj b2RlIG11c3QgYmUga2VwdCBpbiBzeW5jIHdpdGggdGhhdCBmaWxlLgorICAgIC8vIEN1cnJlbnRs eSB0aGUgbWV0YUtleSBhcyBkZWZpbmVkIGluIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3Jt TW91c2VFdmVudEd0ay5jcHAKKyAgICAvLyBpcyBHREtfTUVUQV9NQVNLLiBUaGlzIGNvZGUgbXVz dCBiZSBrZXB0IGluIHN5bmMgd2l0aCB0aGF0IGZpbGUuCiAgICAgZWxzZSBpZiAoSlNTdHJpbmdJ c0VxdWFsVG9VVEY4Q1N0cmluZyhzdHJpbmcsICJtZXRhS2V5IikpCi0gICAgICAgIGdka01vZGlm aWVyID0gR0RLX01PRDJfTUFTSzsKKyAgICAgICAgZ2RrTW9kaWZpZXIgPSBHREtfTUVUQV9NQVNL OwogICAgIAogICAgIEpTU3RyaW5nUmVsZWFzZShzdHJpbmcpOwogICAgIHJldHVybiBnZGtNb2Rp ZmllcjsKQEAgLTM5NSw3ICszOTUsOSBAQCBzdGF0aWMgSlNWYWx1ZVJlZiBtb3VzZU1vdmVUb0Nh bGxiYWNrKEpTCiAgICAgZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5k b3coR1RLX1dJREdFVCh2aWV3KSk7CiAgICAgZ19vYmplY3RfcmVmKGV2ZW50LT5tb3Rpb24ud2lu ZG93KTsKICAgICBldmVudC0+YnV0dG9uLmRldmljZSA9IGdldERlZmF1bHRHREtQb2ludGVyRGV2 aWNlKGV2ZW50LT5tb3Rpb24ud2luZG93KTsKLSAgICBldmVudC0+bW90aW9uLnN0YXRlID0gZ2V0 U3RhdGVGbGFncygpOworCisgICAgZ3VpbnQgbW9kaWZpZXJzID0gYXJndW1lbnRDb3VudCA+PSAz ID8gZ2RrTW9kaWZlcnNGcm9tSlNWYWx1ZShjb250ZXh0LCBhcmd1bWVudHNbMl0pIDogMDsKKyAg ICBldmVudC0+bW90aW9uLnN0YXRlID0gbW9kaWZpZXJzIHwgZ2V0U3RhdGVGbGFncygpOwogICAg IGV2ZW50LT5tb3Rpb24uYXhlcyA9IDA7CiAKICAgICBpbnQgeFJvb3QsIHlSb290OwpJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gOTU0MDUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wOS0xOSAgRGV2ZGF0dGEgRGVzaHBhbmRlICA8cHdq ZDczQG1vdG9yb2xhLmNvbT4KKworICAgICAgICBbR3RrXSBtb3VzZW1vdmUgZXZlbnQgYWx3YXlz IGhhcyBtZXRhS2V5ID09IHRydWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTM1Mjk5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRm9yIHRlc3Rpbmcgc3RhdGUgb2YgbWV0YUtleSBmb3IgbW91c2UgYW5kIGtl eWJvYXJkIGV2ZW50cyBnZW5lcmF0ZWQKKyAgICAgICAgdXNpbmcgZXZuZXRTZW5kZXIgb2JqZWN0 LgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRh a2V5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2Zhc3QvZXZl bnRzL2V2ZW50LXNlbmRlci1tZXRha2V5Lmh0bWw6IEFkZGVkLgorCiAyMDExLTA5LTE4ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiByZXF1ZXN0QW5pbWF0aW9uRnJhbWUgY2FsbGJhY2tzIGRvbid0IHNob3cgdXAgaW4gdGhl IHRpbWVsaW5lIHBhbmVsLgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZXZl bnRzL2V2ZW50LXNlbmRlci1tZXRha2V5LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvZmFzdC9ldmVudHMvZXZlbnQtc2VuZGVyLW1ldGFrZXktZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3Qv ZXZlbnRzL2V2ZW50LXNlbmRlci1tZXRha2V5LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwyIEBACitQQVNTCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9mYXN0 L2V2ZW50cy9ldmVudC1zZW5kZXItbWV0YWtleS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9mYXN0L2V2ZW50cy9ldmVudC1zZW5kZXItbWV0YWtleS5odG1sCShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Zhc3QvZXZlbnRzL2V2ZW50 LXNlbmRlci1tZXRha2V5Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDIgQEAKKzxodG1s PgorPGJvZHk+Cis8ZGl2IGlkPSJyZXN1bHQiPjwvZGl2PgorPGlucHV0IGlkPSJ0ZXN0IiB0eXBl PSJidXR0b24iIHZhbHVlPSIiPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisK KyAgICB2YXIgbWV0YUtleSA9IGZhbHNlOworICAgIHZhciBmYWlsZWQgPSBmYWxzZTsKKyAgICBm dW5jdGlvbiBoYW5kbGVNZXRha2V5KGUpIHsKKyAgICAgICAgaWYgKHRydWUgPT0gZmFpbGVkKQor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoZS5tZXRhS2V5ICE9IG1ldGFLZXkpCisg ICAgICAgICAgICBmYWlsZWQgPSB0cnVlOworICAgIH0KKyAgICB2YXIgdGVzdCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJ0ZXN0Iik7CisgICAgdGVzdC5hZGRFdmVudExpc3RlbmVyKCdtb3Vz ZW1vdmUnLCBoYW5kbGVNZXRha2V5LCBmYWxzZSk7CisgICAgdGVzdC5hZGRFdmVudExpc3RlbmVy KCdtb3VzZWRvd24nLCBoYW5kbGVNZXRha2V5LCBmYWxzZSk7CisgICAgdGVzdC5hZGRFdmVudExp c3RlbmVyKCdtb3VzZXVwJywgaGFuZGxlTWV0YWtleSwgZmFsc2UpOworICAgIHRlc3QuYWRkRXZl bnRMaXN0ZW5lcigna2V5ZG93bicsIGhhbmRsZU1ldGFrZXksIGZhbHNlKTsKKworICAgIHRlc3Qu Zm9jdXMoKTsKKworCisgICAgLy8gRXZlbnRzIHdpdGggbWV0YWtleSBhcyBmYWxzZQorICAgIGV2 ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHRlc3Qub2Zmc2V0TGVmdCwgdGVzdC5vZmZzZXRUb3ApOwor ICAgIGV2ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAoKTsK KyAgICBldmVudFNlbmRlci5rZXlEb3duKCdhJyk7CisKKyAgICAvLyBFdmVudHMgd2l0aCBtZXRh a2V5IGFzIHRydWUKKyAgICBtZXRhS2V5ID0gdHJ1ZTsKKyAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyh0ZXN0Lm9mZnNldExlZnQsIHRlc3Qub2Zmc2V0VG9wLCBbIm1ldGFLZXkiXSk7CisgICAg ZXZlbnRTZW5kZXIubW91c2VEb3duKDEsIFsibWV0YUtleSJdKTsKKyAgICBldmVudFNlbmRlci5t b3VzZVVwKDEsIFsibWV0YUtleSJdKTsKKyAgICBldmVudFNlbmRlci5rZXlEb3duKCdhJywgWyJt ZXRhS2V5Il0pOworCisgICAgdmFyIHJlc3VsdERpdiA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJyZXN1bHQiKTsKKyAgICByZXN1bHREaXYuaW5uZXJIVE1MID0gZmFpbGVkID8gIkZBSUwiIDog IlBBU1MiOworPC9zY3JpcHQ+Cis8L2JvZHk+Cg==