35900 2010-03-08 19:25:27 -0800 [Chromium] Need to send mouse events to plugin when it has mouse capture 2010-03-09 21:08:19 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jam jam darin dglazkov fishd webkit.review.bot oldest_to_newest 197424 0 jam 2010-03-08 19:25:27 -0800 This would allow a plugin to implement scrollbars in its region, for example. 197426 1 50270 jam 2010-03-08 19:32:24 -0800 Created attachment 50270 Proposed patch I don't like how I can't set m_haveMouseCapture to false in mouseCaptureLost(), any suggestions? 197436 2 webkit.review.bot 2010-03-08 20:33:24 -0800 Attachment 50270 did not build on chromium: Build output: http://webkit-commit-queue.appspot.com/results/453001 197438 3 50276 jam 2010-03-08 20:38:32 -0800 Created attachment 50276 Added missing file 197469 4 fishd 2010-03-08 22:58:01 -0800 What if WebWidget::mouseCaptureLost() is called? See the callsite in chrome/renderer/render_widget.cc. 197762 5 jam 2010-03-09 14:03:29 -0800 Right, that's my worry, that the window loses mouse capture without a right mouse button up event. Is it possible though? 197774 6 50350 jam 2010-03-09 14:27:37 -0800 Created attachment 50350 Updated patch Per Darin's advice, reversed the order that the browser sends the events (http://codereview.chromium.org/743003). This makes this change cleaner. 197832 7 50350 fishd 2010-03-09 16:12:30 -0800 Comment on attachment 50350 Updated patch > Index: WebKit/chromium/src/WebViewImpl.cpp ... > + if (m_haveMouseCapture && WebInputEvent::isMouseEventType(inputEvent.type)) { > + Node* node = focusedWebCoreNode(); > + if (node && node->renderer() && node->renderer()->isEmbeddedObject()) { > + AtomicString eventType; > + switch (inputEvent.type) { nit: indentation of AtomicString is off. > void WebViewImpl::mouseCaptureLost() > { > + m_haveMouseCapture = false; > } We may eventually wish to pass this event along to the plugin. Are there any compatibility concerns with enabling this patch for ordinary plugins? 197848 8 jam 2010-03-09 17:39:17 -0800 My hunch is that there shouldn't be any issue with passing this to NPAPI plugins. Basic testing with Flash hasn't shown any problems, but pushing this out will tell us conclusively. 197850 9 jam 2010-03-09 17:45:22 -0800 Committed r55758 197877 10 fishd 2010-03-09 21:08:19 -0800 (In reply to comment #8) > My hunch is that there shouldn't be any issue with passing this to NPAPI > plugins. Basic testing with Flash hasn't shown any problems, but pushing this > out will tell us conclusively. OK, sounds good. 50270 2010-03-08 19:32:24 -0800 2010-03-08 20:38:32 -0800 Proposed patch mousecapture.txt text/plain 3853 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3MDMpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDMtMDggIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIHNlbmQgbW91c2UgZXZlbnRzIHRvIHBs dWdpbiB3aGVuIGl0IGhhcyBtb3VzZSBjYXB0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTkwMAorCisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1vdXNlRG93bik6CisgICAgICAgIChXZWJLaXQ6Oldl YlZpZXdJbXBsOjptb3VzZVVwKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmhhbmRs ZUlucHV0RXZlbnQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTA4 ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIENocm9taXVt IGJ1aWxkIGZpeC4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCShyZXZpc2lv biA1NTcwMykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yNDUsNiArMjQ1LDcgQEAgV2ViVmlld0ltcGw6OldlYlZpZXdJbXBsKFdlYlZp ZXdDbGllbnQqIAogICAgICwgbV9zdWdnZXN0aW9uc1BvcHVwKDApCiAgICAgLCBtX2lzVHJhbnNw YXJlbnQoZmFsc2UpCiAgICAgLCBtX3RhYnNUb0xpbmtzKGZhbHNlKQorICAgICwgbV9oYXZlTW91 c2VDYXB0dXJlKGZhbHNlKQogewogICAgIC8vIFdlYktpdC93aW4vV2ViVmlldy5jcHAgZG9lcyB0 aGUgc2FtZSB0aGluZywgZXhjZXB0IHRoZXkgY2FsbCB0aGUKICAgICAvLyBLSlMgc3BlY2lmaWMg d3JhcHBlciBhcm91bmQgdGhpcyBtZXRob2QuIFdlIG5lZWQgdG8gaGF2ZSB0aHJlYWRpbmcKQEAg LTMyNyw2ICszMjgsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjptb3VzZURvd24oY29uc3QgV2ViTW91 CiAgICAgICAgIHJldHVybjsKIAogICAgIG1fbGFzdE1vdXNlRG93blBvaW50ID0gV2ViUG9pbnQo ZXZlbnQueCwgZXZlbnQueSk7CisgICAgbV9oYXZlTW91c2VDYXB0dXJlID0gdHJ1ZTsKIAogICAg IC8vIElmIGEgdGV4dCBmaWVsZCB0aGF0IGhhcyBmb2N1cyBpcyBjbGlja2VkIGFnYWluLCB3ZSBz aG91bGQgZGlzcGxheSB0aGUKICAgICAvLyBzdWdnZXN0aW9ucyBwb3B1cC4KQEAgLTQ0Miw2ICs0 NDQsMTAgQEAgdm9pZCBXZWJWaWV3SW1wbDo6bW91c2VVcChjb25zdCBXZWJNb3VzZQogI2VuZGlm CiAKICAgICBtb3VzZUNhcHR1cmVMb3N0KCk7CisgICAgLy8gV2Ugc2V0IG1faGF2ZU1vdXNlQ2Fw dHVyZSB0byBmYWxzZSBoZXJlLCBhbmQgbm90IGluIG1vdXNlQ2FwdHVyZUxvc3QsCisgICAgLy8g YmVjYXVzZSB0aGF0IGdldHMgY2FsbGVkIGJlZm9yZSB0aGUgTW91c2VVcCBjYWxsIGFuZCB3ZSB3 YW50IHRoYXQgdG8gZ28KKyAgICAvLyB0byB0aGUgcGx1Z2luIGlmIGl0IGhhcyBtb3VzZSBjYXB0 dXJlLgorICAgIG1faGF2ZU1vdXNlQ2FwdHVyZSA9IGZhbHNlOwogICAgIG1haW5GcmFtZUltcGwo KS0+ZnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KAogICAg ICAgICBQbGF0Zm9ybU1vdXNlRXZlbnRCdWlsZGVyKG1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3 KCksIGV2ZW50KSk7CiAKQEAgLTg5OSw2ICs5MDUsMzQgQEAgYm9vbCBXZWJWaWV3SW1wbDo6aGFu ZGxlSW5wdXRFdmVudChjb25zdAogICAgIGlmIChtX2lnbm9yZUlucHV0RXZlbnRzKQogICAgICAg ICByZXR1cm4gdHJ1ZTsKIAorICAgIGlmIChtX2hhdmVNb3VzZUNhcHR1cmUgJiYgV2ViSW5wdXRF dmVudDo6aXNNb3VzZUV2ZW50VHlwZShpbnB1dEV2ZW50LnR5cGUpKSB7CisgICAgICAgIE5vZGUq IG5vZGUgPSBmb2N1c2VkV2ViQ29yZU5vZGUoKTsKKyAgICAgICAgaWYgKG5vZGUgJiYgbm9kZS0+ cmVuZGVyZXIoKSAmJiBub2RlLT5yZW5kZXJlcigpLT5pc0VtYmVkZGVkT2JqZWN0KCkpIHsKKyAg ICAgICAgICBBdG9taWNTdHJpbmcgZXZlbnRUeXBlOworICAgICAgICAgICAgc3dpdGNoIChpbnB1 dEV2ZW50LnR5cGUpIHsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VNb3Zl OgorICAgICAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFtZXMoKS5tb3VzZW1vdmVFdmVu dDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgV2ViSW5wdXRFdmVu dDo6TW91c2VMZWF2ZToKKyAgICAgICAgICAgICAgICBldmVudFR5cGUgPSBldmVudE5hbWVzKCku bW91c2VvdXRFdmVudDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2Ug V2ViSW5wdXRFdmVudDo6TW91c2VEb3duOgorICAgICAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2 ZW50TmFtZXMoKS5tb3VzZWRvd25FdmVudDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6TW91c2VVcDoKKyAgICAgICAgICAgICAgICBldmVu dFR5cGUgPSBldmVudE5hbWVzKCkubW91c2V1cEV2ZW50OworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgbm9kZS0+ZGlzcGF0Y2hNb3VzZUV2 ZW50KAorICAgICAgICAgICAgICAgICAgUGxhdGZvcm1Nb3VzZUV2ZW50QnVpbGRlcihtYWluRnJh bWVJbXBsKCktPmZyYW1lVmlldygpLCAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91c2VFdmVudCo+ KCZpbnB1dEV2ZW50KSksCisgICAgICAgICAgICAgICAgICBldmVudFR5cGUpOworICAgICAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICB9CisKICAgICAvLyBGSVhNRTogUmVtb3Zl IG1fY3VycmVudElucHV0RXZlbnQuCiAgICAgLy8gVGhpcyBvbmx5IGV4aXN0cyB0byBhbGxvdyBD aHJvbWVDbGllbnQ6OnNob3coKSB0byBrbm93IHdoaWNoIG1vdXNlIGJ1dHRvbgogICAgIC8vIHRy aWdnZXJlZCBhIHdpbmRvdy5vcGVuIGV2ZW50LgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJWaWV3SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaAkocmV2aXNpb24gNTU3MDMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ0Niw2ICs0NDYsOCBAQCBwcml2YXRlOgogICAgIE5vdGlm aWNhdGlvblByZXNlbnRlckltcGwgbV9ub3RpZmljYXRpb25QcmVzZW50ZXI7CiAjZW5kaWYKIAor ICAgIGJvb2wgbV9oYXZlTW91c2VDYXB0dXJlOworCiAgICAgc3RhdGljIGNvbnN0IFdlYklucHV0 RXZlbnQqIG1fY3VycmVudElucHV0RXZlbnQ7CiB9OwogCg== 50276 2010-03-08 20:38:32 -0800 2010-03-09 14:27:37 -0800 Added missing file mousecapture2.txt text/plain 4701 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3MDUpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDMtMDggIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIHNlbmQgbW91c2UgZXZlbnRzIHRvIHBs dWdpbiB3aGVuIGl0IGhhcyBtb3VzZSBjYXB0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTkwMAorCisgICAgICAgICogcHVibGljL1dlYklucHV0 RXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5wdXRFdmVudDo6aXNNb3VzZUV2ZW50VHlw ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1v dXNlRG93bik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZVVwKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmhhbmRsZUlucHV0RXZlbnQpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIENocm9taXVtIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCShyZXZpc2lvbiA1NTcwMykKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsNiAr MTI4LDE2IEBAIHB1YmxpYzoKICAgICBpbnQgbW9kaWZpZXJzOwogICAgIGRvdWJsZSB0aW1lU3Rh bXBTZWNvbmRzOyAgIC8vIFNlY29uZHMgc2luY2UgZXBvY2guCiAKKyAgICAvLyBSZXR1cm5zIHRy dWUgaWYgdGhlIFdlYklucHV0RXZlbnQgfHR5cGV8IGlzIGEgbW91c2UgZXZlbnQuCisgICAgc3Rh dGljIGJvb2wgaXNNb3VzZUV2ZW50VHlwZShpbnQgdHlwZSkKKyAgICB7CisgICAgICAgIHJldHVy biB0eXBlID09IE1vdXNlRG93bgorICAgICAgICAgICAgfHwgdHlwZSA9PSBNb3VzZVVwCisgICAg ICAgICAgICB8fCB0eXBlID09IE1vdXNlTW92ZQorICAgICAgICAgICAgfHwgdHlwZSA9PSBNb3Vz ZUVudGVyCisgICAgICAgICAgICB8fCB0eXBlID09IE1vdXNlTGVhdmU7CisgICAgfQorCiAgICAg Ly8gUmV0dXJucyB0cnVlIGlmIHRoZSBXZWJJbnB1dEV2ZW50IHx0eXBlfCBpcyBhIGtleWJvYXJk IGV2ZW50LgogICAgIHN0YXRpYyBib29sIGlzS2V5Ym9hcmRFdmVudFR5cGUoaW50IHR5cGUpCiAg ICAgewpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDU1NzAz KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0NSw2ICsyNDUsNyBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVu dCogCiAgICAgLCBtX3N1Z2dlc3Rpb25zUG9wdXAoMCkKICAgICAsIG1faXNUcmFuc3BhcmVudChm YWxzZSkKICAgICAsIG1fdGFic1RvTGlua3MoZmFsc2UpCisgICAgLCBtX2hhdmVNb3VzZUNhcHR1 cmUoZmFsc2UpCiB7CiAgICAgLy8gV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBkb2VzIHRoZSBzYW1l IHRoaW5nLCBleGNlcHQgdGhleSBjYWxsIHRoZQogICAgIC8vIEtKUyBzcGVjaWZpYyB3cmFwcGVy IGFyb3VuZCB0aGlzIG1ldGhvZC4gV2UgbmVlZCB0byBoYXZlIHRocmVhZGluZwpAQCAtMzI3LDYg KzMyOCw3IEBAIHZvaWQgV2ViVmlld0ltcGw6Om1vdXNlRG93bihjb25zdCBXZWJNb3UKICAgICAg ICAgcmV0dXJuOwogCiAgICAgbV9sYXN0TW91c2VEb3duUG9pbnQgPSBXZWJQb2ludChldmVudC54 LCBldmVudC55KTsKKyAgICBtX2hhdmVNb3VzZUNhcHR1cmUgPSB0cnVlOwogCiAgICAgLy8gSWYg YSB0ZXh0IGZpZWxkIHRoYXQgaGFzIGZvY3VzIGlzIGNsaWNrZWQgYWdhaW4sIHdlIHNob3VsZCBk aXNwbGF5IHRoZQogICAgIC8vIHN1Z2dlc3Rpb25zIHBvcHVwLgpAQCAtNDQyLDYgKzQ0NCwxMCBA QCB2b2lkIFdlYlZpZXdJbXBsOjptb3VzZVVwKGNvbnN0IFdlYk1vdXNlCiAjZW5kaWYKIAogICAg IG1vdXNlQ2FwdHVyZUxvc3QoKTsKKyAgICAvLyBXZSBzZXQgbV9oYXZlTW91c2VDYXB0dXJlIHRv IGZhbHNlIGhlcmUsIGFuZCBub3QgaW4gbW91c2VDYXB0dXJlTG9zdCwKKyAgICAvLyBiZWNhdXNl IHRoYXQgZ2V0cyBjYWxsZWQgYmVmb3JlIHRoZSBNb3VzZVVwIGNhbGwgYW5kIHdlIHdhbnQgdGhh dCB0byBnbworICAgIC8vIHRvIHRoZSBwbHVnaW4gaWYgaXQgaGFzIG1vdXNlIGNhcHR1cmUuCisg ICAgbV9oYXZlTW91c2VDYXB0dXJlID0gZmFsc2U7CiAgICAgbWFpbkZyYW1lSW1wbCgpLT5mcmFt ZSgpLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQoCiAgICAgICAgIFBs YXRmb3JtTW91c2VFdmVudEJ1aWxkZXIobWFpbkZyYW1lSW1wbCgpLT5mcmFtZVZpZXcoKSwgZXZl bnQpKTsKIApAQCAtODk5LDYgKzkwNSwzNCBAQCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVJbnB1 dEV2ZW50KGNvbnN0CiAgICAgaWYgKG1faWdub3JlSW5wdXRFdmVudHMpCiAgICAgICAgIHJldHVy biB0cnVlOwogCisgICAgaWYgKG1faGF2ZU1vdXNlQ2FwdHVyZSAmJiBXZWJJbnB1dEV2ZW50Ojpp c01vdXNlRXZlbnRUeXBlKGlucHV0RXZlbnQudHlwZSkpIHsKKyAgICAgICAgTm9kZSogbm9kZSA9 IGZvY3VzZWRXZWJDb3JlTm9kZSgpOworICAgICAgICBpZiAobm9kZSAmJiBub2RlLT5yZW5kZXJl cigpICYmIG5vZGUtPnJlbmRlcmVyKCktPmlzRW1iZWRkZWRPYmplY3QoKSkgeworICAgICAgICAg IEF0b21pY1N0cmluZyBldmVudFR5cGU7CisgICAgICAgICAgICBzd2l0Y2ggKGlucHV0RXZlbnQu dHlwZSkgeworICAgICAgICAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpNb3VzZU1vdmU6CisgICAg ICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50OworICAg ICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpNb3Vz ZUxlYXZlOgorICAgICAgICAgICAgICAgIGV2ZW50VHlwZSA9IGV2ZW50TmFtZXMoKS5tb3VzZW91 dEV2ZW50OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgY2FzZSBXZWJJbnB1 dEV2ZW50OjpNb3VzZURvd246CisgICAgICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1l cygpLm1vdXNlZG93bkV2ZW50OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg Y2FzZSBXZWJJbnB1dEV2ZW50OjpNb3VzZVVwOgorICAgICAgICAgICAgICAgIGV2ZW50VHlwZSA9 IGV2ZW50TmFtZXMoKS5tb3VzZXVwRXZlbnQ7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICAgICAgfQorCisgICAgICAgICAgICBub2RlLT5kaXNwYXRjaE1vdXNlRXZlbnQoCisg ICAgICAgICAgICAgICAgICBQbGF0Zm9ybU1vdXNlRXZlbnRCdWlsZGVyKG1haW5GcmFtZUltcGwo KS0+ZnJhbWVWaWV3KCksICpzdGF0aWNfY2FzdDxjb25zdCBXZWJNb3VzZUV2ZW50Kj4oJmlucHV0 RXZlbnQpKSwKKyAgICAgICAgICAgICAgICAgIGV2ZW50VHlwZSk7CisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0KKwogICAgIC8vIEZJWE1FOiBSZW1vdmUgbV9jdXJy ZW50SW5wdXRFdmVudC4KICAgICAvLyBUaGlzIG9ubHkgZXhpc3RzIHRvIGFsbG93IENocm9tZUNs aWVudDo6c2hvdygpIHRvIGtub3cgd2hpY2ggbW91c2UgYnV0dG9uCiAgICAgLy8gdHJpZ2dlcmVk IGEgd2luZG93Lm9wZW4gZXZlbnQuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCShy ZXZpc2lvbiA1NTcwMykKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAkod29y a2luZyBjb3B5KQpAQCAtNDQ2LDYgKzQ0Niw4IEBAIHByaXZhdGU6CiAgICAgTm90aWZpY2F0aW9u UHJlc2VudGVySW1wbCBtX25vdGlmaWNhdGlvblByZXNlbnRlcjsKICNlbmRpZgogCisgICAgYm9v bCBtX2hhdmVNb3VzZUNhcHR1cmU7CisKICAgICBzdGF0aWMgY29uc3QgV2ViSW5wdXRFdmVudCog bV9jdXJyZW50SW5wdXRFdmVudDsKIH07CiAK 50350 2010-03-09 14:27:37 -0800 2010-03-09 16:12:30 -0800 Updated patch mousecapture4.txt text/plain 4652 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3MDUpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDMtMDggIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIHNlbmQgbW91c2UgZXZlbnRzIHRvIHBs dWdpbiB3aGVuIGl0IGhhcyBtb3VzZSBjYXB0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTkwMAorCisgICAgICAgICogcHVibGljL1dlYklucHV0 RXZlbnQuaDoKKyAgICAgICAgKFdlYktpdDo6V2ViSW5wdXRFdmVudDo6aXNNb3VzZUV2ZW50VHlw ZSk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OldlYlZpZXdJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6Om1v dXNlRG93bik6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjptb3VzZVVwKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmhhbmRsZUlucHV0RXZlbnQpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5oOgorCiAyMDEwLTAzLTA4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBA YXBwbGUuY29tPgogCiAgICAgICAgIENocm9taXVtIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCShyZXZpc2lvbiA1NTcwMykKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsNiAr MTI4LDE2IEBAIHB1YmxpYzoKICAgICBpbnQgbW9kaWZpZXJzOwogICAgIGRvdWJsZSB0aW1lU3Rh bXBTZWNvbmRzOyAgIC8vIFNlY29uZHMgc2luY2UgZXBvY2guCiAKKyAgICAvLyBSZXR1cm5zIHRy dWUgaWYgdGhlIFdlYklucHV0RXZlbnQgfHR5cGV8IGlzIGEgbW91c2UgZXZlbnQuCisgICAgc3Rh dGljIGJvb2wgaXNNb3VzZUV2ZW50VHlwZShpbnQgdHlwZSkKKyAgICB7CisgICAgICAgIHJldHVy biB0eXBlID09IE1vdXNlRG93bgorICAgICAgICAgICAgfHwgdHlwZSA9PSBNb3VzZVVwCisgICAg ICAgICAgICB8fCB0eXBlID09IE1vdXNlTW92ZQorICAgICAgICAgICAgfHwgdHlwZSA9PSBNb3Vz ZUVudGVyCisgICAgICAgICAgICB8fCB0eXBlID09IE1vdXNlTGVhdmU7CisgICAgfQorCiAgICAg Ly8gUmV0dXJucyB0cnVlIGlmIHRoZSBXZWJJbnB1dEV2ZW50IHx0eXBlfCBpcyBhIGtleWJvYXJk IGV2ZW50LgogICAgIHN0YXRpYyBib29sIGlzS2V5Ym9hcmRFdmVudFR5cGUoaW50IHR5cGUpCiAg ICAgewpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHJldmlzaW9uIDU1NzAz KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI0NSw2ICsyNDUsNyBAQCBXZWJWaWV3SW1wbDo6V2ViVmlld0ltcGwoV2ViVmlld0NsaWVu dCogCiAgICAgLCBtX3N1Z2dlc3Rpb25zUG9wdXAoMCkKICAgICAsIG1faXNUcmFuc3BhcmVudChm YWxzZSkKICAgICAsIG1fdGFic1RvTGlua3MoZmFsc2UpCisgICAgLCBtX2hhdmVNb3VzZUNhcHR1 cmUoZmFsc2UpCiB7CiAgICAgLy8gV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBkb2VzIHRoZSBzYW1l IHRoaW5nLCBleGNlcHQgdGhleSBjYWxsIHRoZQogICAgIC8vIEtKUyBzcGVjaWZpYyB3cmFwcGVy IGFyb3VuZCB0aGlzIG1ldGhvZC4gV2UgbmVlZCB0byBoYXZlIHRocmVhZGluZwpAQCAtMzI3LDYg KzMyOCw3IEBAIHZvaWQgV2ViVmlld0ltcGw6Om1vdXNlRG93bihjb25zdCBXZWJNb3UKICAgICAg ICAgcmV0dXJuOwogCiAgICAgbV9sYXN0TW91c2VEb3duUG9pbnQgPSBXZWJQb2ludChldmVudC54 LCBldmVudC55KTsKKyAgICBtX2hhdmVNb3VzZUNhcHR1cmUgPSB0cnVlOwogCiAgICAgLy8gSWYg YSB0ZXh0IGZpZWxkIHRoYXQgaGFzIGZvY3VzIGlzIGNsaWNrZWQgYWdhaW4sIHdlIHNob3VsZCBk aXNwbGF5IHRoZQogICAgIC8vIHN1Z2dlc3Rpb25zIHBvcHVwLgpAQCAtNDQxLDcgKzQ0Myw2IEBA IHZvaWQgV2ViVmlld0ltcGw6Om1vdXNlVXAoY29uc3QgV2ViTW91c2UKICAgICB9CiAjZW5kaWYK IAotICAgIG1vdXNlQ2FwdHVyZUxvc3QoKTsKICAgICBtYWluRnJhbWVJbXBsKCktPmZyYW1lKCkt PmV2ZW50SGFuZGxlcigpLT5oYW5kbGVNb3VzZVJlbGVhc2VFdmVudCgKICAgICAgICAgUGxhdGZv cm1Nb3VzZUV2ZW50QnVpbGRlcihtYWluRnJhbWVJbXBsKCktPmZyYW1lVmlldygpLCBldmVudCkp OwogCkBAIC04OTksNiArOTAwLDM0IEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUlucHV0RXZl bnQoY29uc3QKICAgICBpZiAobV9pZ25vcmVJbnB1dEV2ZW50cykKICAgICAgICAgcmV0dXJuIHRy dWU7CiAKKyAgICBpZiAobV9oYXZlTW91c2VDYXB0dXJlICYmIFdlYklucHV0RXZlbnQ6OmlzTW91 c2VFdmVudFR5cGUoaW5wdXRFdmVudC50eXBlKSkgeworICAgICAgICBOb2RlKiBub2RlID0gZm9j dXNlZFdlYkNvcmVOb2RlKCk7CisgICAgICAgIGlmIChub2RlICYmIG5vZGUtPnJlbmRlcmVyKCkg JiYgbm9kZS0+cmVuZGVyZXIoKS0+aXNFbWJlZGRlZE9iamVjdCgpKSB7CisgICAgICAgICAgQXRv bWljU3RyaW5nIGV2ZW50VHlwZTsKKyAgICAgICAgICAgIHN3aXRjaCAoaW5wdXRFdmVudC50eXBl KSB7CisgICAgICAgICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlTW92ZToKKyAgICAgICAg ICAgICAgICBldmVudFR5cGUgPSBldmVudE5hbWVzKCkubW91c2Vtb3ZlRXZlbnQ7CisgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Ok1vdXNlTGVh dmU6CisgICAgICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZlbnROYW1lcygpLm1vdXNlb3V0RXZl bnQ7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFdlYklucHV0RXZl bnQ6Ok1vdXNlRG93bjoKKyAgICAgICAgICAgICAgICBldmVudFR5cGUgPSBldmVudE5hbWVzKCku bW91c2Vkb3duRXZlbnQ7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNl IFdlYklucHV0RXZlbnQ6Ok1vdXNlVXA6CisgICAgICAgICAgICAgICAgZXZlbnRUeXBlID0gZXZl bnROYW1lcygpLm1vdXNldXBFdmVudDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAg ICAgICAgICB9CisKKyAgICAgICAgICAgIG5vZGUtPmRpc3BhdGNoTW91c2VFdmVudCgKKyAgICAg ICAgICAgICAgICAgIFBsYXRmb3JtTW91c2VFdmVudEJ1aWxkZXIobWFpbkZyYW1lSW1wbCgpLT5m cmFtZVZpZXcoKSwgKnN0YXRpY19jYXN0PGNvbnN0IFdlYk1vdXNlRXZlbnQqPigmaW5wdXRFdmVu dCkpLAorICAgICAgICAgICAgICAgICAgZXZlbnRUeXBlKTsKKyAgICAgICAgICAgIHJldHVybiB0 cnVlOworICAgICAgICB9CisgICAgfQorCiAgICAgLy8gRklYTUU6IFJlbW92ZSBtX2N1cnJlbnRJ bnB1dEV2ZW50LgogICAgIC8vIFRoaXMgb25seSBleGlzdHMgdG8gYWxsb3cgQ2hyb21lQ2xpZW50 OjpzaG93KCkgdG8ga25vdyB3aGljaCBtb3VzZSBidXR0b24KICAgICAvLyB0cmlnZ2VyZWQgYSB3 aW5kb3cub3BlbiBldmVudC4KQEAgLTk1NCw2ICs5ODMsNyBAQCBib29sIFdlYlZpZXdJbXBsOjpo YW5kbGVJbnB1dEV2ZW50KGNvbnN0CiAKIHZvaWQgV2ViVmlld0ltcGw6Om1vdXNlQ2FwdHVyZUxv c3QoKQogeworICAgIG1faGF2ZU1vdXNlQ2FwdHVyZSA9IGZhbHNlOwogfQogCiB2b2lkIFdlYlZp ZXdJbXBsOjpzZXRGb2N1cyhib29sIGVuYWJsZSkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmgJKHJldmlzaW9uIDU1NzAzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5oCSh3b3JraW5nIGNvcHkpCkBAIC00NDYsNiArNDQ2LDggQEAgcHJpdmF0ZToKICAgICBOb3Rp ZmljYXRpb25QcmVzZW50ZXJJbXBsIG1fbm90aWZpY2F0aW9uUHJlc2VudGVyOwogI2VuZGlmCiAK KyAgICBib29sIG1faGF2ZU1vdXNlQ2FwdHVyZTsKKwogICAgIHN0YXRpYyBjb25zdCBXZWJJbnB1 dEV2ZW50KiBtX2N1cnJlbnRJbnB1dEV2ZW50OwogfTsKIAo=