35952 2010-03-09 18:12:23 -0800 [chromium] Mouse wheel events don't get propagated to plugins 2010-03-10 14:03:15 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jam jam fishd webkit.review.bot oldest_to_newest 197853 0 jam 2010-03-09 18:12:23 -0800 WebPluginContainerImpl::handleEvent only handles keyboard and mouse events. We'll need to pass in mouse wheel events as well for Pepper. 197919 1 50378 jam 2010-03-10 00:46:44 -0800 Created attachment 50378 Proposed patch 197920 2 webkit.review.bot 2010-03-10 00:48:35 -0800 Attachment 50378 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/chromium/src/WebPluginContainerImpl.cpp:386: cursor_info is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 197930 3 50380 jam 2010-03-10 01:18:49 -0800 Created attachment 50380 Updated patch 198209 4 50380 fishd 2010-03-10 10:48:10 -0800 Comment on attachment 50380 Updated patch > Index: WebKit/chromium/src/WebInputEventConversion.cpp > +WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const WebCore::ScrollView* view, const WebCore::WheelEvent& event) ... > + scrollByPage = event.granularity() == WebCore::WheelEvent::Page; ^^^ no need for WebCore:: prefix since there is a 'using namespace WebCore' up above. 198333 5 jam 2010-03-10 14:03:15 -0800 Committed r55805: <http://trac.webkit.org/changeset/55805> 50378 2010-03-10 00:46:44 -0800 2010-03-10 01:18:49 -0800 Proposed patch mousewheel.txt text/plain 7109 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3NjkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMTAgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzU5NTIKKyAgICAgICAgUHJvcGFnYXRlIG1vdXNlIHdoZWVsIGV2ZW50cyB0byBQ ZXBwZXIgcGx1Z2lucy4KKworICAgICAgICAqIHNyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXI6OldlYk1vdXNl V2hlZWxFdmVudEJ1aWxkZXIpOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lv bi5oOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlRXZlbnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlV2hlZWxFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OmhhbmRsZUtleWJvYXJkRXZl bnQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAtMDMt MTAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRD b252ZXJzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24gNTU3MDMpCisrKyBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiAr NDAsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlNjcm9s bFZpZXcuaCIKICNpbmNsdWRlICJXZWJJbnB1dEV2ZW50LmgiCisjaW5jbHVkZSAiV2hlZWxFdmVu dC5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAg LTI4OSw2ICsyOTAsMjcgQEAgV2ViTW91c2VFdmVudEJ1aWxkZXI6OldlYk1vdXNlRXZlbnRCdWls ZAogICAgIGNsaWNrQ291bnQgPSBldmVudC5kZXRhaWwoKTsKIH0KIAorV2ViTW91c2VXaGVlbEV2 ZW50QnVpbGRlcjo6V2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcihjb25zdCBXZWJDb3JlOjpTY3Jv bGxWaWV3KiB2aWV3LCBjb25zdCBXZWJDb3JlOjpXaGVlbEV2ZW50JiBldmVudCkKK3sKKyAgICBp ZiAoZXZlbnQudHlwZSgpICE9IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCisgICAgICAg IHJldHVybjsKKyAgICB0eXBlID0gV2ViSW5wdXRFdmVudDo6TW91c2VXaGVlbDsKKyAgICB0aW1l U3RhbXBTZWNvbmRzID0gZXZlbnQudGltZVN0YW1wKCkgKiAxLjBlLTM7CisgICAgbW9kaWZpZXJz ID0gZ2V0V2ViSW5wdXRNb2RpZmllcnMoZXZlbnQpOworICAgIEludFBvaW50IHAgPSB2aWV3LT5j b250ZW50c1RvV2luZG93KEludFBvaW50KGV2ZW50LnBhZ2VYKCksIGV2ZW50LnBhZ2VZKCkpKTsK KyAgICBnbG9iYWxYID0gZXZlbnQuc2NyZWVuWCgpOworICAgIGdsb2JhbFkgPSBldmVudC5zY3Jl ZW5ZKCk7CisgICAgd2luZG93WCA9IHAueCgpOworICAgIHdpbmRvd1kgPSBwLnkoKTsKKyAgICB4 ID0gZXZlbnQub2Zmc2V0WCgpOworICAgIHkgPSBldmVudC5vZmZzZXRZKCk7CisgICAgZGVsdGFY ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGV2ZW50LndoZWVsRGVsdGFYKCkpOworICAgIGRlbHRhWSA9 IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC53aGVlbERlbHRhWSgpKTsKKyAgICB3aGVlbFRpY2tz WCA9IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC5yYXdEZWx0YVgoKSk7CisgICAgd2hlZWxUaWNr c1kgPSBzdGF0aWNfY2FzdDxmbG9hdD4oZXZlbnQucmF3RGVsdGFZKCkpOworICAgIHNjcm9sbEJ5 UGFnZSA9IGV2ZW50LmdyYW51bGFyaXR5KCkgPT0gV2ViQ29yZTo6V2hlZWxFdmVudDo6UGFnZTsK K30KKwogV2ViS2V5Ym9hcmRFdmVudEJ1aWxkZXI6OldlYktleWJvYXJkRXZlbnRCdWlsZGVyKGNv bnN0IEtleWJvYXJkRXZlbnQmIGV2ZW50KQogewogICAgIGlmIChldmVudC50eXBlKCkgPT0gZXZl bnROYW1lcygpLmtleWRvd25FdmVudCkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5w dXRFdmVudENvbnZlcnNpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YklucHV0RXZlbnRDb252ZXJzaW9uLmgJKHJldmlzaW9uIDU1NzAzKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2 ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEtleWJvYXJkRXZlbnQ7CiBjbGFz cyBNb3VzZUV2ZW50OwogY2xhc3MgU2Nyb2xsVmlldzsKK2NsYXNzIFdoZWVsRXZlbnQ7CiBjbGFz cyBXaWRnZXQ7CiB9CiAKQEAgLTg2LDcgKzg3LDcgQEAgcHVibGljOgogI2VuZGlmCiAKIC8vIENv bnZlcnRzIGEgV2ViQ29yZTo6TW91c2VFdmVudCB0byBhIGNvcnJlc3BvbmRpbmcgV2ViTW91c2VF dmVudC4gdmlldyBpcwotLy8gdGhlIFNjcm9sbFZpZXcgY29ycmVzcG9uZGluZyB0byB0aGUgZXZl bnQuICBSZXR1cm5zIHRydWUgaWYgc3VjY2Vzc2Z1bC4KKy8vIHRoZSBTY3JvbGxWaWV3IGNvcnJl c3BvbmRpbmcgdG8gdGhlIGV2ZW50LgogLy8gTk9URTogVGhpcyBpcyBvbmx5IGltcGxlbWVudGVk IGZvciBtb3VzZW1vdmUsIG1vdXNlb3ZlciwgbW91c2VvdXQsCiAvLyBtb3VzZWRvd24gYW5kIG1v dXNldXAuICBJZiB0aGUgZXZlbnQgbWFwcGluZyBmYWlscywgdGhlIGV2ZW50IHR5cGUgd2lsbAog Ly8gYmUgc2V0IHRvIFVuZGVmaW5lZC4KQEAgLTk1LDEwICs5NiwxNiBAQCBwdWJsaWM6CiAgICAg V2ViTW91c2VFdmVudEJ1aWxkZXIoY29uc3QgV2ViQ29yZTo6U2Nyb2xsVmlldyosIGNvbnN0IFdl YkNvcmU6Ok1vdXNlRXZlbnQmKTsKIH07CiAKKy8vIENvbnZlcnRzIGEgV2ViQ29yZTo6V2hlZWxF dmVudCB0byBhIGNvcnJlc3BvbmRpbmcgV2ViTW91c2VXaGVlbEV2ZW50LgorLy8gSWYgdGhlIGV2 ZW50IG1hcHBpbmcgZmFpbHMsIHRoZSBldmVudCB0eXBlIHdpbGwgYmUgc2V0IHRvIFVuZGVmaW5l ZC4KK2NsYXNzIFdlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIgOiBwdWJsaWMgV2ViTW91c2VXaGVl bEV2ZW50IHsKK3B1YmxpYzoKKyAgICBXZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVyKGNvbnN0IFdl YkNvcmU6OlNjcm9sbFZpZXcqLCBjb25zdCBXZWJDb3JlOjpXaGVlbEV2ZW50Jik7Cit9OworCiAv LyBDb252ZXJ0cyBhIFdlYkNvcmU6OktleWJvYXJkRXZlbnQgdG8gYSBjb3JyZXNwb25kaW5nIFdl YktleWJvYXJkRXZlbnQuCi0vLyBSZXR1cm5zIHRydWUgaWYgc3VjY2Vzc2Z1bC4gIE5PVEU6IFRo aXMgaXMgb25seSBpbXBsZW1lbnRlZCBmb3Iga2V5ZG93bgotLy8gYW5kIGtleXVwLiAgSWYgdGhl IGV2ZW50IG1hcHBpbmcgZmFpbHMsIHRoZSBldmVudCB0eXBlIHdpbGwgYmUgc2V0IHRvCi0vLyBV bmRlZmluZWQuCisvLyBOT1RFOiBUaGlzIGlzIG9ubHkgaW1wbGVtZW50ZWQgZm9yIGtleWRvd24g YW5kIGtleXVwLiAgSWYgdGhlIGV2ZW50IG1hcHBpbmcKKy8vIGZhaWxzLCB0aGUgZXZlbnQgdHlw ZSB3aWxsIGJlIHNldCB0byBVbmRlZmluZWQuCiBjbGFzcyBXZWJLZXlib2FyZEV2ZW50QnVpbGRl ciA6IHB1YmxpYyBXZWJLZXlib2FyZEV2ZW50IHsKIHB1YmxpYzoKICAgICBXZWJLZXlib2FyZEV2 ZW50QnVpbGRlcihjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50Jik7CkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHJldmlzaW9uIDU1 NzAzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQAogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgorI2luY2x1ZGUgIldo ZWVsRXZlbnQuaCIKIAogI2lmIFdFQktJVF9VU0lOR19TS0lBCiAjaW5jbHVkZSAiUGxhdGZvcm1D b250ZXh0U2tpYS5oIgpAQCAtMTYwLDYgKzE2MSw4IEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6aGFuZGxlRXZlbnQKICAgICAvLyB3aGVyZSBtb3ppbGxhIGJlaGF2ZXMgZGlmZmVyZW50 bHkgdGhhbiB0aGUgc3BlYy4KICAgICBpZiAoZXZlbnQtPmlzTW91c2VFdmVudCgpKQogICAgICAg ICBoYW5kbGVNb3VzZUV2ZW50KHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCkpOworICAg IGVsc2UgaWYgKGV2ZW50LT5pc1doZWVsRXZlbnQoKSkKKyAgICAgICAgaGFuZGxlV2hlZWxFdmVu dChzdGF0aWNfY2FzdDxXaGVlbEV2ZW50Kj4oZXZlbnQpKTsKICAgICBlbHNlIGlmIChldmVudC0+ aXNLZXlib2FyZEV2ZW50KCkpCiAgICAgICAgIGhhbmRsZUtleWJvYXJkRXZlbnQoc3RhdGljX2Nh c3Q8S2V5Ym9hcmRFdmVudCo+KGV2ZW50KSk7CiB9CkBAIC0zNTksOCArMzYyLDcgQEAgdm9pZCBX ZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZQogICAgIH0KIAogICAgIFdlYkN1cnNv ckluZm8gY3Vyc29ySW5mbzsKLSAgICBib29sIGhhbmRsZWQgPSBtX3dlYlBsdWdpbi0+aGFuZGxl SW5wdXRFdmVudCh3ZWJFdmVudCwgY3Vyc29ySW5mbyk7Ci0gICAgaWYgKGhhbmRsZWQpCisgICAg aWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50KHdlYkV2ZW50LCBjdXJzb3JJbmZvKSkK ICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiAKICAgICAvLyBBIHdpbmRvd2xl c3MgcGx1Z2luIGNhbiBjaGFuZ2UgdGhlIGN1cnNvciBpbiByZXNwb25zZSB0byBhIG1vdXNlIG1v dmUKQEAgLTM3NCw2ICszNzYsMTggQEAgdm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5k bGVNb3VzZQogICAgIGNocm9tZUNsaWVudC0+c2V0Q3Vyc29yRm9yUGx1Z2luKGN1cnNvckluZm8p OwogfQogCit2b2lkIFdlYlBsdWdpbkNvbnRhaW5lckltcGw6OmhhbmRsZVdoZWVsRXZlbnQoV2hl ZWxFdmVudCogZXZlbnQpCit7CisgICAgRnJhbWVWaWV3KiBwYXJlbnRWaWV3ID0gc3RhdGljX2Nh c3Q8RnJhbWVWaWV3Kj4ocGFyZW50KCkpOworICAgIFdlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIg d2ViRXZlbnQocGFyZW50VmlldywgKmV2ZW50KTsKKyAgICBpZiAod2ViRXZlbnQudHlwZSA9PSBX ZWJJbnB1dEV2ZW50OjpVbmRlZmluZWQpCisgICAgICAgIHJldHVybjsKKworICAgIFdlYkN1cnNv ckluZm8gY3Vyc29yX2luZm87CisgICAgaWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50 KHdlYkV2ZW50LCBjdXJzb3JfaW5mbykpCisgICAgICAgIGV2ZW50LT5zZXREZWZhdWx0SGFuZGxl ZCgpOworfQorCiB2b2lkIFdlYlBsdWdpbkNvbnRhaW5lckltcGw6OmhhbmRsZUtleWJvYXJkRXZl bnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CiAgICAgV2ViS2V5Ym9hcmRFdmVudEJ1aWxkZXIg d2ViRXZlbnQoKmV2ZW50KTsKQEAgLTM4MSw4ICszOTUsNyBAQCB2b2lkIFdlYlBsdWdpbkNvbnRh aW5lckltcGw6OmhhbmRsZUtleWJvCiAgICAgICAgIHJldHVybjsKIAogICAgIFdlYkN1cnNvcklu Zm8gY3Vyc29yX2luZm87Ci0gICAgYm9vbCBoYW5kbGVkID0gbV93ZWJQbHVnaW4tPmhhbmRsZUlu cHV0RXZlbnQod2ViRXZlbnQsIGN1cnNvcl9pbmZvKTsKLSAgICBpZiAoaGFuZGxlZCkKKyAgICBp ZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0RXZlbnQod2ViRXZlbnQsIGN1cnNvcl9pbmZvKSkK ICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiB9CiAKSW5kZXg6IFdlYktpdC9j aHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCShyZXZpc2lvbiA1NTcwMykK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5oCSh3b3JraW5n IGNvcHkpCkBAIC00OCw2ICs0OCw3IEBAIGNsYXNzIEtleWJvYXJkRXZlbnQ7CiBjbGFzcyBNb3Vz ZUV2ZW50OwogY2xhc3MgUmVzb3VyY2VFcnJvcjsKIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7Citj bGFzcyBXaGVlbEV2ZW50OwogfQogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTEwNCw2ICsxMDUs NyBAQCBwcml2YXRlOgogICAgIH5XZWJQbHVnaW5Db250YWluZXJJbXBsKCk7CiAKICAgICB2b2lk IGhhbmRsZU1vdXNlRXZlbnQoV2ViQ29yZTo6TW91c2VFdmVudCopOworICAgIHZvaWQgaGFuZGxl V2hlZWxFdmVudChXZWJDb3JlOjpXaGVlbEV2ZW50Kik7CiAgICAgdm9pZCBoYW5kbGVLZXlib2Fy ZEV2ZW50KFdlYkNvcmU6OktleWJvYXJkRXZlbnQqKTsKIAogICAgIHZvaWQgY2FsY3VsYXRlR2Vv bWV0cnkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZnJhbWVSZWN0LAo= 50380 2010-03-10 01:18:49 -0800 2010-03-10 10:48:10 -0800 Updated patch mousewheel2.txt text/plain 7129 jam SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTU3NjkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMTAgIEpvaG4g QWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MzU5NTIKKyAgICAgICAgUHJvcGFnYXRlIG1vdXNlIHdoZWVsIGV2ZW50cyB0byBQ ZXBwZXIgcGx1Z2lucy4KKworICAgICAgICAqIHNyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXI6OldlYk1vdXNl V2hlZWxFdmVudEJ1aWxkZXIpOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lv bi5oOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlRXZlbnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlV2hlZWxFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBsdWdpbkNvbnRhaW5lckltcGw6OmhhbmRsZUtleWJvYXJkRXZl bnQpOgorICAgICAgICAqIHNyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmg6CisKIDIwMTAtMDMt MTAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRD b252ZXJzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcAkocmV2aXNpb24gNTU3MDMpCisrKyBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiAr NDAsNyBAQAogI2luY2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlNjcm9s bFZpZXcuaCIKICNpbmNsdWRlICJXZWJJbnB1dEV2ZW50LmgiCisjaW5jbHVkZSAiV2hlZWxFdmVu dC5oIgogI2luY2x1ZGUgIldpZGdldC5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAg LTI4OSw2ICsyOTAsMjcgQEAgV2ViTW91c2VFdmVudEJ1aWxkZXI6OldlYk1vdXNlRXZlbnRCdWls ZAogICAgIGNsaWNrQ291bnQgPSBldmVudC5kZXRhaWwoKTsKIH0KIAorV2ViTW91c2VXaGVlbEV2 ZW50QnVpbGRlcjo6V2ViTW91c2VXaGVlbEV2ZW50QnVpbGRlcihjb25zdCBXZWJDb3JlOjpTY3Jv bGxWaWV3KiB2aWV3LCBjb25zdCBXZWJDb3JlOjpXaGVlbEV2ZW50JiBldmVudCkKK3sKKyAgICBp ZiAoZXZlbnQudHlwZSgpICE9IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCisgICAgICAg IHJldHVybjsKKyAgICB0eXBlID0gV2ViSW5wdXRFdmVudDo6TW91c2VXaGVlbDsKKyAgICB0aW1l U3RhbXBTZWNvbmRzID0gZXZlbnQudGltZVN0YW1wKCkgKiAxLjBlLTM7CisgICAgbW9kaWZpZXJz ID0gZ2V0V2ViSW5wdXRNb2RpZmllcnMoZXZlbnQpOworICAgIEludFBvaW50IHAgPSB2aWV3LT5j b250ZW50c1RvV2luZG93KEludFBvaW50KGV2ZW50LnBhZ2VYKCksIGV2ZW50LnBhZ2VZKCkpKTsK KyAgICBnbG9iYWxYID0gZXZlbnQuc2NyZWVuWCgpOworICAgIGdsb2JhbFkgPSBldmVudC5zY3Jl ZW5ZKCk7CisgICAgd2luZG93WCA9IHAueCgpOworICAgIHdpbmRvd1kgPSBwLnkoKTsKKyAgICB4 ID0gZXZlbnQub2Zmc2V0WCgpOworICAgIHkgPSBldmVudC5vZmZzZXRZKCk7CisgICAgZGVsdGFY ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGV2ZW50LndoZWVsRGVsdGFYKCkpOworICAgIGRlbHRhWSA9 IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC53aGVlbERlbHRhWSgpKTsKKyAgICB3aGVlbFRpY2tz WCA9IHN0YXRpY19jYXN0PGZsb2F0PihldmVudC5yYXdEZWx0YVgoKSk7CisgICAgd2hlZWxUaWNr c1kgPSBzdGF0aWNfY2FzdDxmbG9hdD4oZXZlbnQucmF3RGVsdGFZKCkpOworICAgIHNjcm9sbEJ5 UGFnZSA9IGV2ZW50LmdyYW51bGFyaXR5KCkgPT0gV2ViQ29yZTo6V2hlZWxFdmVudDo6UGFnZTsK K30KKwogV2ViS2V5Ym9hcmRFdmVudEJ1aWxkZXI6OldlYktleWJvYXJkRXZlbnRCdWlsZGVyKGNv bnN0IEtleWJvYXJkRXZlbnQmIGV2ZW50KQogewogICAgIGlmIChldmVudC50eXBlKCkgPT0gZXZl bnROYW1lcygpLmtleWRvd25FdmVudCkKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5w dXRFdmVudENvbnZlcnNpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dl YklucHV0RXZlbnRDb252ZXJzaW9uLmgJKHJldmlzaW9uIDU1NzAzKQorKysgV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw2 ICs0NCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEtleWJvYXJkRXZlbnQ7CiBjbGFz cyBNb3VzZUV2ZW50OwogY2xhc3MgU2Nyb2xsVmlldzsKK2NsYXNzIFdoZWVsRXZlbnQ7CiBjbGFz cyBXaWRnZXQ7CiB9CiAKQEAgLTg2LDcgKzg3LDcgQEAgcHVibGljOgogI2VuZGlmCiAKIC8vIENv bnZlcnRzIGEgV2ViQ29yZTo6TW91c2VFdmVudCB0byBhIGNvcnJlc3BvbmRpbmcgV2ViTW91c2VF dmVudC4gdmlldyBpcwotLy8gdGhlIFNjcm9sbFZpZXcgY29ycmVzcG9uZGluZyB0byB0aGUgZXZl bnQuICBSZXR1cm5zIHRydWUgaWYgc3VjY2Vzc2Z1bC4KKy8vIHRoZSBTY3JvbGxWaWV3IGNvcnJl c3BvbmRpbmcgdG8gdGhlIGV2ZW50LgogLy8gTk9URTogVGhpcyBpcyBvbmx5IGltcGxlbWVudGVk IGZvciBtb3VzZW1vdmUsIG1vdXNlb3ZlciwgbW91c2VvdXQsCiAvLyBtb3VzZWRvd24gYW5kIG1v dXNldXAuICBJZiB0aGUgZXZlbnQgbWFwcGluZyBmYWlscywgdGhlIGV2ZW50IHR5cGUgd2lsbAog Ly8gYmUgc2V0IHRvIFVuZGVmaW5lZC4KQEAgLTk1LDEwICs5NiwxNiBAQCBwdWJsaWM6CiAgICAg V2ViTW91c2VFdmVudEJ1aWxkZXIoY29uc3QgV2ViQ29yZTo6U2Nyb2xsVmlldyosIGNvbnN0IFdl YkNvcmU6Ok1vdXNlRXZlbnQmKTsKIH07CiAKKy8vIENvbnZlcnRzIGEgV2ViQ29yZTo6V2hlZWxF dmVudCB0byBhIGNvcnJlc3BvbmRpbmcgV2ViTW91c2VXaGVlbEV2ZW50LgorLy8gSWYgdGhlIGV2 ZW50IG1hcHBpbmcgZmFpbHMsIHRoZSBldmVudCB0eXBlIHdpbGwgYmUgc2V0IHRvIFVuZGVmaW5l ZC4KK2NsYXNzIFdlYk1vdXNlV2hlZWxFdmVudEJ1aWxkZXIgOiBwdWJsaWMgV2ViTW91c2VXaGVl bEV2ZW50IHsKK3B1YmxpYzoKKyAgICBXZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVyKGNvbnN0IFdl YkNvcmU6OlNjcm9sbFZpZXcqLCBjb25zdCBXZWJDb3JlOjpXaGVlbEV2ZW50Jik7Cit9OworCiAv LyBDb252ZXJ0cyBhIFdlYkNvcmU6OktleWJvYXJkRXZlbnQgdG8gYSBjb3JyZXNwb25kaW5nIFdl YktleWJvYXJkRXZlbnQuCi0vLyBSZXR1cm5zIHRydWUgaWYgc3VjY2Vzc2Z1bC4gIE5PVEU6IFRo aXMgaXMgb25seSBpbXBsZW1lbnRlZCBmb3Iga2V5ZG93bgotLy8gYW5kIGtleXVwLiAgSWYgdGhl IGV2ZW50IG1hcHBpbmcgZmFpbHMsIHRoZSBldmVudCB0eXBlIHdpbGwgYmUgc2V0IHRvCi0vLyBV bmRlZmluZWQuCisvLyBOT1RFOiBUaGlzIGlzIG9ubHkgaW1wbGVtZW50ZWQgZm9yIGtleWRvd24g YW5kIGtleXVwLiAgSWYgdGhlIGV2ZW50IG1hcHBpbmcKKy8vIGZhaWxzLCB0aGUgZXZlbnQgdHlw ZSB3aWxsIGJlIHNldCB0byBVbmRlZmluZWQuCiBjbGFzcyBXZWJLZXlib2FyZEV2ZW50QnVpbGRl ciA6IHB1YmxpYyBXZWJLZXlib2FyZEV2ZW50IHsKIHB1YmxpYzoKICAgICBXZWJLZXlib2FyZEV2 ZW50QnVpbGRlcihjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50Jik7CkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlBsdWdpbkNvbnRhaW5lckltcGwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9jaHJvbWl1bS9zcmMvV2ViUGx1Z2luQ29udGFpbmVySW1wbC5jcHAJKHJldmlzaW9uIDU1 NzAzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQAogI2luY2x1ZGUgIk1vdXNlRXZlbnQuaCIK ICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgorI2luY2x1ZGUgIldo ZWVsRXZlbnQuaCIKIAogI2lmIFdFQktJVF9VU0lOR19TS0lBCiAjaW5jbHVkZSAiUGxhdGZvcm1D b250ZXh0U2tpYS5oIgpAQCAtMTYwLDYgKzE2MSw4IEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVy SW1wbDo6aGFuZGxlRXZlbnQKICAgICAvLyB3aGVyZSBtb3ppbGxhIGJlaGF2ZXMgZGlmZmVyZW50 bHkgdGhhbiB0aGUgc3BlYy4KICAgICBpZiAoZXZlbnQtPmlzTW91c2VFdmVudCgpKQogICAgICAg ICBoYW5kbGVNb3VzZUV2ZW50KHN0YXRpY19jYXN0PE1vdXNlRXZlbnQqPihldmVudCkpOworICAg IGVsc2UgaWYgKGV2ZW50LT5pc1doZWVsRXZlbnQoKSkKKyAgICAgICAgaGFuZGxlV2hlZWxFdmVu dChzdGF0aWNfY2FzdDxXaGVlbEV2ZW50Kj4oZXZlbnQpKTsKICAgICBlbHNlIGlmIChldmVudC0+ aXNLZXlib2FyZEV2ZW50KCkpCiAgICAgICAgIGhhbmRsZUtleWJvYXJkRXZlbnQoc3RhdGljX2Nh c3Q8S2V5Ym9hcmRFdmVudCo+KGV2ZW50KSk7CiB9CkBAIC0zNTksOCArMzYyLDcgQEAgdm9pZCBX ZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVNb3VzZQogICAgIH0KIAogICAgIFdlYkN1cnNv ckluZm8gY3Vyc29ySW5mbzsKLSAgICBib29sIGhhbmRsZWQgPSBtX3dlYlBsdWdpbi0+aGFuZGxl SW5wdXRFdmVudCh3ZWJFdmVudCwgY3Vyc29ySW5mbyk7Ci0gICAgaWYgKGhhbmRsZWQpCisgICAg aWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50KHdlYkV2ZW50LCBjdXJzb3JJbmZvKSkK ICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7CiAKICAgICAvLyBBIHdpbmRvd2xl c3MgcGx1Z2luIGNhbiBjaGFuZ2UgdGhlIGN1cnNvciBpbiByZXNwb25zZSB0byBhIG1vdXNlIG1v dmUKQEAgLTM3NCwxNSArMzc2LDI2IEBAIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFu ZGxlTW91c2UKICAgICBjaHJvbWVDbGllbnQtPnNldEN1cnNvckZvclBsdWdpbihjdXJzb3JJbmZv KTsKIH0KIAordm9pZCBXZWJQbHVnaW5Db250YWluZXJJbXBsOjpoYW5kbGVXaGVlbEV2ZW50KFdo ZWVsRXZlbnQqIGV2ZW50KQoreworICAgIEZyYW1lVmlldyogcGFyZW50VmlldyA9IHN0YXRpY19j YXN0PEZyYW1lVmlldyo+KHBhcmVudCgpKTsKKyAgICBXZWJNb3VzZVdoZWVsRXZlbnRCdWlsZGVy IHdlYkV2ZW50KHBhcmVudFZpZXcsICpldmVudCk7CisgICAgaWYgKHdlYkV2ZW50LnR5cGUgPT0g V2ViSW5wdXRFdmVudDo6VW5kZWZpbmVkKQorICAgICAgICByZXR1cm47CisKKyAgICBXZWJDdXJz b3JJbmZvIGN1cnNvckluZm87CisgICAgaWYgKG1fd2ViUGx1Z2luLT5oYW5kbGVJbnB1dEV2ZW50 KHdlYkV2ZW50LCBjdXJzb3JJbmZvKSkKKyAgICAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVk KCk7Cit9CisKIHZvaWQgV2ViUGx1Z2luQ29udGFpbmVySW1wbDo6aGFuZGxlS2V5Ym9hcmRFdmVu dChLZXlib2FyZEV2ZW50KiBldmVudCkKIHsKICAgICBXZWJLZXlib2FyZEV2ZW50QnVpbGRlciB3 ZWJFdmVudCgqZXZlbnQpOwogICAgIGlmICh3ZWJFdmVudC50eXBlID09IFdlYklucHV0RXZlbnQ6 OlVuZGVmaW5lZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV2ViQ3Vyc29ySW5mbyBjdXJzb3Jf aW5mbzsKLSAgICBib29sIGhhbmRsZWQgPSBtX3dlYlBsdWdpbi0+aGFuZGxlSW5wdXRFdmVudCh3 ZWJFdmVudCwgY3Vyc29yX2luZm8pOwotICAgIGlmIChoYW5kbGVkKQorICAgIFdlYkN1cnNvcklu Zm8gY3Vyc29ySW5mbzsKKyAgICBpZiAobV93ZWJQbHVnaW4tPmhhbmRsZUlucHV0RXZlbnQod2Vi RXZlbnQsIGN1cnNvckluZm8pKQogICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsK IH0KIApJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250YWluZXJJbXBs LmgJKHJldmlzaW9uIDU1NzAzKQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJQbHVnaW5Db250 YWluZXJJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDcgQEAgY2xhc3MgS2V5Ym9h cmRFdmVudDsKIGNsYXNzIE1vdXNlRXZlbnQ7CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3Mg UmVzb3VyY2VSZXNwb25zZTsKK2NsYXNzIFdoZWVsRXZlbnQ7CiB9CiAKIG5hbWVzcGFjZSBXZWJL aXQgewpAQCAtMTA0LDYgKzEwNSw3IEBAIHByaXZhdGU6CiAgICAgfldlYlBsdWdpbkNvbnRhaW5l ckltcGwoKTsKIAogICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChXZWJDb3JlOjpNb3VzZUV2ZW50 Kik7CisgICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50KFdlYkNvcmU6OldoZWVsRXZlbnQqKTsKICAg ICB2b2lkIGhhbmRsZUtleWJvYXJkRXZlbnQoV2ViQ29yZTo6S2V5Ym9hcmRFdmVudCopOwogCiAg ICAgdm9pZCBjYWxjdWxhdGVHZW9tZXRyeShjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBmcmFtZVJl Y3QsCg==