69417 2011-10-05 06:47:46 -0700 WTR needs an implementation for eventSender.continuousMouseScrollBy 2012-10-08 16:12:04 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED LayoutTestFailure P3 Normal --- 88070 1 kbalazs webkit-unassigned jdapena oldest_to_newest 478310 0 kbalazs 2011-10-05 06:47:46 -0700 Skip dependent tests until that. 478313 1 kbalazs 2011-10-05 06:53:54 -0700 Skipped a test in http://trac.webkit.org/changeset/96699 642442 2 146019 jdapena 2012-06-06 07:19:20 -0700 Created attachment 146019 Patch 642586 3 146019 kbalazs 2012-06-06 10:29:32 -0700 Comment on attachment 146019 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=146019&action=review Generally looks good, but there are some things to complain about. > Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:33 > + void continuousMouseScrollBy (in long x, in long y, in [Optional] boolean paged); Extra space after function name. > Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:395 > + gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(event->scroll.window)))); > + > + // For more than one tick in a scroll, we need smooth scroll event > +#if GTK_CHECK_VERSION(3, 3, 18) > + if ((horizontal && vertical) || horizontal > 1 || horizontal < -1 || vertical > 1 || vertical < -1) { > + event->scroll.direction = GDK_SCROLL_SMOOTH; > + event->scroll.delta_x = -horizontal; > + event->scroll.delta_y = -vertical; > + > + sendOrQueueEvent(event); > + return; > + } > +#endif Why did you have to change on this function? It was already there. Please describe it in the changelog. > Tools/WebKitTestRunner/mac/EventSenderProxy.mm:401 > +void EventSenderProxy::continuousScrollBy(int x, int y, bool paged) > +{ Why is it not continuousMouseScrollBy? Have you build it on Mac? 714539 4 jdapena 2012-09-07 08:17:33 -0700 Fix for #88070 already includes the changes for WebKitTestRunner. 737171 5 146019 eric 2012-10-08 16:12:04 -0700 Comment on attachment 146019 Patch Cleared review? from attachment 146019 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 146019 2012-06-06 07:19:20 -0700 2012-10-08 16:12:03 -0700 Patch bug-69417-20120606161919.patch text/plain 12579 jdapena U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NTgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk2ZmFhZmExM2I5M2IyY2M2NzlkOTFiNmZiNjFlYzAz NzU3NGEzYS4uMjkyOGY0Mjk2YTBhMDc2MzY1ZmRjMWZhNjA4NTdjNjYwZGYwYjdiMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3 IEBACiAyMDEyLTA2LTA2ICBKb3PDqSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgog CisgICAgICAgIFdUUiBuZWVkcyBhbiBpbXBsZW1lbnRhdGlvbiBmb3IgZXZlbnRTZW5kZXIuY29u dGludW91c01vdXNlU2Nyb2xsQnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY5NDE3CisKKyAgICAgICAgQWRkZWQgY29udGlub3VzTW91c2VTY3JvbGxC eSBzdXBwb3J0IGluIFdlYktpdFRlc3RSdW5uZXIsIGFuZCBhZGRlZAorICAgICAgICBpbXBsZW1l bnRhdGlvbiBmb3IgZ3RrIGFuZCBtYWMsIGFuZCBzdHViIGZvciBRdC4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvRXZl bnRTZW5kZXJQcm94eS5oOgorICAgICAgICAoRXZlbnRTZW5kZXJQcm94eSk6CisgICAgICAgICog V2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9FdmVudFNlbmRpbmdDb250 cm9sbGVyLmlkbDoKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0V2 ZW50U2VuZGluZ0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRpbmdDb250 cm9sbGVyOjptb3VzZVNjcm9sbEJ5KToKKyAgICAgICAgKFdUUik6CisgICAgICAgIChXVFI6OkV2 ZW50U2VuZGluZ0NvbnRyb2xsZXI6OmNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5KToKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIu aDoKKyAgICAgICAgKEV2ZW50U2VuZGluZ0NvbnRyb2xsZXIpOgorICAgICAgICAqIFdlYktpdFRl c3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxl cjo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisgICAg ICAgICogV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94eUd0ay5jcHA6CisgICAg ICAgIChXVFIpOgorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5 KToKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Y29udGludW91c01vdXNlU2Nyb2xs QnkpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW06 CisgICAgICAgIChXVFI6OkV2ZW50U2VuZGVyUHJveHk6OmNvbnRpbnVvdXNTY3JvbGxCeSk6Cisg ICAgICAgIChXVFIpOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQ cm94eVF0LmNwcDoKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6Y29udGludW91c01v dXNlU2Nyb2xsQnkpOgorICAgICAgICAoV1RSKToKKworMjAxMi0wNi0wNiAgSm9zw6kgRGFwZW5h IFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KKwogICAgICAgICBFbmhhbmNlIEdUSyBEUlQgaW1w bGVtZW50YXRpb24gdG8gc3VwcG9ydCBwbGF0Zm9ybSBzY3JvbGwgd2hlZWwgZXZlbnRzLgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYwMDMKIApkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9FdmVudFNlbmRlclByb3h5LmggYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHkuaAppbmRleCA4MTY4NTEzMTkwZjY5 NGFmNDVhZTBmN2I0NmNkNDlmMDdmN2YyOTM1Li5iMWVjMTVmYmRhNmZhMmQ0ZDEyNDFiYmUwMWNl OTlkYmRkMzk2ZGFhIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2Vu ZGVyUHJveHkuaAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0V2ZW50U2VuZGVyUHJveHku aApAQCAtNTEsNiArNTEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb3VzZVVwKHVuc2lnbmVkIGJ1 dHRvbiwgV0tFdmVudE1vZGlmaWVycyk7CiAgICAgdm9pZCBtb3VzZU1vdmVUbyhkb3VibGUgeCwg ZG91YmxlIHkpOwogICAgIHZvaWQgbW91c2VTY3JvbGxCeShpbnQgeCwgaW50IHkpOworICAgIHZv aWQgY29udGludW91c01vdXNlU2Nyb2xsQnkoaW50IHgsIGludCB5LCBib29sIHBhZ2VkKTsKIAog ICAgIHZvaWQgbGVhcEZvcndhcmQoaW50IG1pbGxpc2Vjb25kcyk7CiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvQmluZGluZ3MvRXZlbnRTZW5kaW5n Q29udHJvbGxlci5pZGwgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0Jp bmRpbmdzL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIuaWRsCmluZGV4IDkzNGJlNmQ1NzVmN2IyMjIw MzhiMzM3NjNmMGJjMGJjMWNiZDU2YWIuLjk5NjdkNzQ5OTc5NTE2MzMzMzNiYzIwYWY3NGQ3NTNj MDlmOWUzOWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5k bGUvQmluZGluZ3MvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5pZGwKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9CaW5kaW5ncy9FdmVudFNlbmRpbmdDb250cm9sbGVy LmlkbApAQCAtMzAsNiArMzAsNyBAQCBtb2R1bGUgV1RSIHsKICAgICAgICAgdm9pZCBtb3VzZVVw KGluIGxvbmcgYnV0dG9uTnVtYmVyLCBpbiBvYmplY3QgbW9kaWZpZXJBcnJheSk7CiAgICAgICAg IHZvaWQgbW91c2VNb3ZlVG8oaW4gbG9uZyB4LCBpbiBsb25nIHkpOwogICAgICAgICB2b2lkIG1v dXNlU2Nyb2xsQnkoaW4gbG9uZyB4LCBpbiBsb25nIHkpOworICAgICAgICB2b2lkIGNvbnRpbnVv dXNNb3VzZVNjcm9sbEJ5IChpbiBsb25nIHgsIGluIGxvbmcgeSwgaW4gW09wdGlvbmFsXSBib29s ZWFuIHBhZ2VkKTsKIAogICAgICAgICB2b2lkIGxlYXBGb3J3YXJkKGluIGxvbmcgbWlsbGlzZWNv bmRzKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5jcHAKaW5kZXggOTM0MzFlM2YxNDBl YzA5MzJhZDhhYjM1ZGI4YWFkYjE2OGNkY2FlMS4uMmVlZWI5ZDhjMTg0MTI0NTA5ZGRmZDk4N2I1 ZmNiNWU4M2RjNmI2YiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL0V2ZW50U2VuZGluZ0NvbnRyb2xsZXIuY3BwCkBAIC0yNjUs NiArMjY1LDMwIEBAIHZvaWQgRXZlbnRTZW5kaW5nQ29udHJvbGxlcjo6bW91c2VTY3JvbGxCeShp bnQgeCwgaW50IHkpCiAgICAgV0tCdW5kbGVQb3N0U3luY2hyb25vdXNNZXNzYWdlKEluamVjdGVk QnVuZGxlOjpzaGFyZWQoKS5idW5kbGUoKSwgRXZlbnRTZW5kZXJNZXNzYWdlTmFtZS5nZXQoKSwg RXZlbnRTZW5kZXJNZXNzYWdlQm9keS5nZXQoKSwgMCk7CiB9CiAKK3ZvaWQgRXZlbnRTZW5kaW5n Q29udHJvbGxlcjo6Y29udGludW91c01vdXNlU2Nyb2xsQnkoaW50IHgsIGludCB5LCBib29sIHBh Z2VkKQoreworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBFdmVudFNlbmRlck1lc3NhZ2VO YW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKCJFdmVudFNlbmRlciIp KTsKKyAgICBXS1JldGFpblB0cjxXS011dGFibGVEaWN0aW9uYXJ5UmVmPiBFdmVudFNlbmRlck1l c3NhZ2VCb2R5KEFkb3B0V0ssIFdLTXV0YWJsZURpY3Rpb25hcnlDcmVhdGUoKSk7CisKKyAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4gc3ViTWVzc2FnZUtleShBZG9wdFdLLCBXS1N0cmluZ0Ny ZWF0ZVdpdGhVVEY4Q1N0cmluZygiU3ViTWVzc2FnZSIpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0 cmluZ1JlZj4gc3ViTWVzc2FnZU5hbWUoQWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENT dHJpbmcoIkNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5IikpOworICAgIFdLRGljdGlvbmFyeUFkZEl0 ZW0oRXZlbnRTZW5kZXJNZXNzYWdlQm9keS5nZXQoKSwgc3ViTWVzc2FnZUtleS5nZXQoKSwgc3Vi TWVzc2FnZU5hbWUuZ2V0KCkpOworCisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHhLZXko QWRvcHRXSywgV0tTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoIlgiKSk7CisgICAgV0tSZXRh aW5QdHI8V0tEb3VibGVSZWY+IHhSZWYoQWRvcHRXSywgV0tEb3VibGVDcmVhdGUoeCkpOworICAg IFdLRGljdGlvbmFyeUFkZEl0ZW0oRXZlbnRTZW5kZXJNZXNzYWdlQm9keS5nZXQoKSwgeEtleS5n ZXQoKSwgeFJlZi5nZXQoKSk7CisKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4geUtleShB ZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiWSIpKTsKKyAgICBXS1JldGFp blB0cjxXS0RvdWJsZVJlZj4geVJlZihBZG9wdFdLLCBXS0RvdWJsZUNyZWF0ZSh5KSk7CisgICAg V0tEaWN0aW9uYXJ5QWRkSXRlbShFdmVudFNlbmRlck1lc3NhZ2VCb2R5LmdldCgpLCB5S2V5Lmdl dCgpLCB5UmVmLmdldCgpKTsKKworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBwYWdlZEtl eShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiUGFnZWQiKSk7CisgICAg V0tSZXRhaW5QdHI8V0tVSW50NjRSZWY+IHBhZ2VkUmVmKEFkb3B0V0ssIFdLVUludDY0Q3JlYXRl KHBhZ2VkKSk7CisgICAgV0tEaWN0aW9uYXJ5QWRkSXRlbShFdmVudFNlbmRlck1lc3NhZ2VCb2R5 LmdldCgpLCBwYWdlZEtleS5nZXQoKSwgcGFnZWRSZWYuZ2V0KCkpOworCisgICAgV0tCdW5kbGVQ b3N0U3luY2hyb25vdXNNZXNzYWdlKEluamVjdGVkQnVuZGxlOjpzaGFyZWQoKS5idW5kbGUoKSwg RXZlbnRTZW5kZXJNZXNzYWdlTmFtZS5nZXQoKSwgRXZlbnRTZW5kZXJNZXNzYWdlQm9keS5nZXQo KSwgMCk7Cit9CisKICNpZmRlZiBVU0VfV0VCUFJPQ0VTU19FVkVOVF9TSU1VTEFUSU9OCiB2b2lk IEV2ZW50U2VuZGluZ0NvbnRyb2xsZXI6OnVwZGF0ZUNsaWNrQ291bnQoV0tFdmVudE1vdXNlQnV0 dG9uIGJ1dHRvbikKIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0 ZWRCdW5kbGUvRXZlbnRTZW5kaW5nQ29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmgKaW5kZXggOGVhMmRiMDA5 YTYxOTkxNmZlZjQ4NmQyYTk0Y2Q3YmYzMzcwYThkMS4uZWEyZWNiYjNiYjEwYWU1NmUyY2E3ZjE2 YmNkYWZmMDcxMmJlMTU5YyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9FdmVudFNlbmRpbmdDb250cm9sbGVyLmgKQEAgLTUxLDYg KzUxLDcgQEAgcHVibGljOgogICAgIHZvaWQgbW91c2VVcChpbnQgYnV0dG9uLCBKU1ZhbHVlUmVm IG1vZGlmaWVyQXJyYXkpOwogICAgIHZvaWQgbW91c2VNb3ZlVG8oaW50IHgsIGludCB5KTsKICAg ICB2b2lkIG1vdXNlU2Nyb2xsQnkoaW50IHgsIGludCB5KTsKKyAgICB2b2lkIGNvbnRpbnVvdXNN b3VzZVNjcm9sbEJ5KGludCB4LCBpbnQgeSwgYm9vbCBwYWdlZCk7CiAgICAgdm9pZCBsZWFwRm9y d2FyZChpbnQgbWlsbGlzZWNvbmRzKTsKIAogICAgIHZvaWQga2V5RG93bihKU1N0cmluZ1JlZiBr ZXksIEpTVmFsdWVSZWYgbW9kaWZpZXJBcnJheSwgaW50IGxvY2F0aW9uKTsKZGlmZiAtLWdpdCBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKaW5kZXggZmZkYzJjYzY2ZWVkYzIzOGIyZGFk M2VkZmI4NzcyNGVkNDQ1ZGJiNS4uMmY2NDAxNTVlZjBmODUyZWViMTExMjA3NTQ1MDI0NmVhMzcz MjRmNSAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5j cHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTY2 NCw2ICs2NjQsMjMgQEAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBUZXN0Q29udHJvbGxlcjo6ZGlk UmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEIKICAgICAgICAgICAgIHJldHVy biAwOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJp bmcoc3ViTWVzc2FnZU5hbWUsICJDb250aW51b3VzTW91c2VTY3JvbGxCeSIpKSB7CisgICAgICAg ICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4geEtleSA9IGFkb3B0V0soV0tTdHJpbmdDcmVh dGVXaXRoVVRGOENTdHJpbmcoIlgiKSk7CisgICAgICAgICAgICBkb3VibGUgeCA9IFdLRG91Ymxl R2V0VmFsdWUoc3RhdGljX2Nhc3Q8V0tEb3VibGVSZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JL ZXkobWVzc2FnZUJvZHlEaWN0aW9uYXJ5LCB4S2V5LmdldCgpKSkpOworCisgICAgICAgICAgICBX S1JldGFpblB0cjxXS1N0cmluZ1JlZj4geUtleSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRo VVRGOENTdHJpbmcoIlkiKSk7CisgICAgICAgICAgICBkb3VibGUgeSA9IFdLRG91YmxlR2V0VmFs dWUoc3RhdGljX2Nhc3Q8V0tEb3VibGVSZWY+KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkobWVz c2FnZUJvZHlEaWN0aW9uYXJ5LCB5S2V5LmdldCgpKSkpOworCisgICAgICAgICAgICBXS1JldGFp blB0cjxXS1N0cmluZ1JlZj4gcGFnZWRLZXkgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aFVU RjhDU3RyaW5nKCJQYWdlZCIpKTsKKyAgICAgICAgICAgIGJvb2wgcGFnZWQgPSBzdGF0aWNfY2Fz dDxib29sPihXS1VJbnQ2NEdldFZhbHVlKHN0YXRpY19jYXN0PFdLVUludDY0UmVmPihXS0RpY3Rp b25hcnlHZXRJdGVtRm9yS2V5KG1lc3NhZ2VCb2R5RGljdGlvbmFyeSwgcGFnZWRLZXkuZ2V0KCkp KSkpOworCisgICAgICAgICAgICAvLyBGb3J3YXJkIHRvIFdlYlByb2Nlc3MKKyAgICAgICAgICAg IFdLUGFnZVNldFNob3VsZFNlbmRFdmVudHNTeW5jaHJvbm91c2x5KG1haW5XZWJWaWV3KCktPnBh Z2UoKSwgdHJ1ZSk7CisgICAgICAgICAgICBtX2V2ZW50U2VuZGVyUHJveHktPmNvbnRpbnVvdXNN b3VzZVNjcm9sbEJ5KHgsIHksIHBhZ2VkKTsKKyAgICAgICAgICAgIFdLUGFnZVNldFNob3VsZFNl bmRFdmVudHNTeW5jaHJvbm91c2x5KG1haW5XZWJWaWV3KCktPnBhZ2UoKSwgZmFsc2UpOworICAg ICAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIH0KKwogICAgICAgICBpZiAoV0tTdHJpbmdJc0Vx dWFsVG9VVEY4Q1N0cmluZyhzdWJNZXNzYWdlTmFtZSwgIkxlYXBGb3J3YXJkIikpIHsKICAgICAg ICAgICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB0aW1lS2V5ID0gYWRvcHRXSyhXS1N0cmlu Z0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiVGltZUluTWlsbGlzZWNvbmRzIikpOwogICAgICAgICAg ICAgdW5zaWduZWQgdGltZSA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihXS1VJbnQ2NEdldFZhbHVl KHN0YXRpY19jYXN0PFdLVUludDY0UmVmPihXS0RpY3Rpb25hcnlHZXRJdGVtRm9yS2V5KG1lc3Nh Z2VCb2R5RGljdGlvbmFyeSwgdGltZUtleS5nZXQoKSkpKSk7CmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvZ3RrL0V2ZW50U2VuZGVyUHJveHlHdGsuY3BwCmluZGV4IDUwYjllZTA2ZDdl ZjhkNjY3YjZmNGYzZWUxMDFkMDY0MDgzOTQwODAuLjFmMGYyOGMzMDIzZWJjMDlkMDhlZDhlNThk NzI2OWFhNjhhNDFlZWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2 ZW50U2VuZGVyUHJveHlHdGsuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvZ3RrL0V2 ZW50U2VuZGVyUHJveHlHdGsuY3BwCkBAIC00NCw2ICs0NCw5IEBACiAKIG5hbWVzcGFjZSBXVFIg ewogCisvLyBXZWJDb3JlIGFuZCBsYXlvdXQgdGVzdHMgYXNzdW1lIHRoaXMgdmFsdWUKK3N0YXRp YyBjb25zdCBmbG9hdCBwaXhlbHNQZXJTY3JvbGxUaWNrID0gNDAuMGY7CisKIC8vIEtleSBldmVu dCBsb2NhdGlvbiBjb2RlIGRlZmluZWQgaW4gRE9NIExldmVsIDMuCiBlbnVtIEtleUxvY2F0aW9u Q29kZSB7CiAgICAgRE9NS2V5TG9jYXRpb25TdGFuZGFyZCAgICAgID0gMHgwMCwKQEAgLTM3NSw4 ICszNzgsMjEgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5Ojptb3VzZVNjcm9sbEJ5KGludCBob3Jp em9udGFsLCBpbnQgdmVydGljYWwpCiAgICAgZXZlbnQtPnNjcm9sbC54ID0gbV9wb3NpdGlvbi54 OwogICAgIGV2ZW50LT5zY3JvbGwueSA9IG1fcG9zaXRpb24ueTsKICAgICBldmVudC0+c2Nyb2xs LnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOwotICAgIGV2ZW50LT5zY3JvbGwud2luZG93ID0gZ3Rr X3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQobV90ZXN0Q29udHJvbGxlci0+bWFpbldlYlZp ZXcoKS0+cGxhdGZvcm1XaW5kb3coKSkpOworICAgIGV2ZW50LT5zY3JvbGwud2luZG93ID0gZ3Rr X3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQobV90ZXN0Q29udHJvbGxlci0+bWFpbldlYlZp ZXcoKS0+cGxhdGZvcm1WaWV3KCkpKTsKICAgICBnX29iamVjdF9yZWYoZXZlbnQtPnNjcm9sbC53 aW5kb3cpOworICAgIGdka19ldmVudF9zZXRfZGV2aWNlKGV2ZW50LCBnZGtfZGV2aWNlX21hbmFn ZXJfZ2V0X2NsaWVudF9wb2ludGVyKGdka19kaXNwbGF5X2dldF9kZXZpY2VfbWFuYWdlcihnZGtf d2luZG93X2dldF9kaXNwbGF5KGV2ZW50LT5zY3JvbGwud2luZG93KSkpKTsKKworICAgIC8vIEZv ciBtb3JlIHRoYW4gb25lIHRpY2sgaW4gYSBzY3JvbGwsIHdlIG5lZWQgc21vb3RoIHNjcm9sbCBl dmVudAorI2lmIEdUS19DSEVDS19WRVJTSU9OKDMsIDMsIDE4KQorICAgIGlmICgoaG9yaXpvbnRh bCAmJiB2ZXJ0aWNhbCkgfHwgaG9yaXpvbnRhbCA+IDEgfHwgaG9yaXpvbnRhbCA8IC0xIHx8IHZl cnRpY2FsID4gMSB8fCB2ZXJ0aWNhbCA8IC0xKSB7CisgICAgICAgIGV2ZW50LT5zY3JvbGwuZGly ZWN0aW9uID0gR0RLX1NDUk9MTF9TTU9PVEg7CisgICAgICAgIGV2ZW50LT5zY3JvbGwuZGVsdGFf eCA9IC1ob3Jpem9udGFsOworICAgICAgICBldmVudC0+c2Nyb2xsLmRlbHRhX3kgPSAtdmVydGlj YWw7CisKKyAgICAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7CisgICAgICAgIHJldHVybjsK KyAgICB9CisjZW5kaWYKIAogICAgIGlmIChob3Jpem9udGFsIDwgMCkKICAgICAgICAgZXZlbnQt PnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX1JJR0hUOwpAQCAtMzkyLDYgKzQwOCwyOSBA QCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6Om1vdXNlU2Nyb2xsQnkoaW50IGhvcml6b250YWwsIGlu dCB2ZXJ0aWNhbCkKICAgICBzZW5kT3JRdWV1ZUV2ZW50KGV2ZW50KTsKIH0KIAordm9pZCBFdmVu dFNlbmRlclByb3h5Ojpjb250aW51b3VzTW91c2VTY3JvbGxCeShpbnQgaG9yaXpvbnRhbCwgaW50 IHZlcnRpY2FsLCBib29sIHBhZ2VkKQoreworICAgIC8vIFdlIG5lZWQgc21vb3RoIHNjcm9sbCBl dmVudHMgdG8gaW1wbGVtZW50IHRoaXMgaW4gR3RrKy4gSW4gYW55IGNhc2UKKyAgICAvLyB3ZSBk b24ndCBzdXBwb3J0IHBhZ2VkIHNjcm9sbCBldmVudHMuCisgICAgZ19yZXR1cm5faWZfZmFpbCgh cGFnZWQpOworCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMywgMTgpCisgICAgR2RrRXZlbnQq IGV2ZW50ID0gZ2RrX2V2ZW50X25ldyhHREtfU0NST0xMKTsKKyAgICBldmVudC0+c2Nyb2xsLngg PSBtX3Bvc2l0aW9uLng7CisgICAgZXZlbnQtPnNjcm9sbC55ID0gbV9wb3NpdGlvbi55OworICAg IGV2ZW50LT5zY3JvbGwudGltZSA9IEdES19DVVJSRU5UX1RJTUU7CisgICAgZXZlbnQtPnNjcm9s bC53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJREdFVChtX3Rlc3RDb250cm9s bGVyLT5tYWluV2ViVmlldygpLT5wbGF0Zm9ybVZpZXcoKSkpOworICAgIGdfb2JqZWN0X3JlZihl dmVudC0+c2Nyb2xsLndpbmRvdyk7CisgICAgZ2RrX2V2ZW50X3NldF9kZXZpY2UoZXZlbnQsIGdk a19kZXZpY2VfbWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2Rldmlj ZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0X2Rpc3BsYXkoZXZlbnQtPnNjcm9sbC53aW5kb3cpKSkp OworCisgICAgZXZlbnQtPnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX1NNT09USDsKKyAg ICBldmVudC0+c2Nyb2xsLmRlbHRhX3ggPSAtaG9yaXpvbnRhbCAvIHBpeGVsc1BlclNjcm9sbFRp Y2s7CisgICAgZXZlbnQtPnNjcm9sbC5kZWx0YV95ID0gLXZlcnRpY2FsIC8gcGl4ZWxzUGVyU2Ny b2xsVGljazsKKworICAgIHNlbmRPclF1ZXVlRXZlbnQoZXZlbnQpOworI2VuZGlmCit9CisKIHZv aWQgRXZlbnRTZW5kZXJQcm94eTo6bGVhcEZvcndhcmQoaW50IG1pbGxpc2Vjb25kcykKIHsKICAg ICBpZiAobV9ldmVudFF1ZXVlLmlzRW1wdHkoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHkubW0gYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L21hYy9FdmVudFNlbmRlclByb3h5Lm1tCmluZGV4IGJiMTUwYjM3MmFiMjYzZGNjNTE0ZWRkMThm M2EzZGUyNGM4MzhkZGQuLmY5Y2Q1OTA3N2RkNjUzNWI5M2YwMWJkZWEyNTliNzIyYTNlNjc1MzEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL0V2ZW50U2VuZGVyUHJveHku bW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvRXZlbnRTZW5kZXJQcm94eS5tbQpA QCAtMzk3LDQgKzM5NywyMSBAQCB2b2lkIEV2ZW50U2VuZGVyUHJveHk6Om1vdXNlU2Nyb2xsQnko aW50IHgsIGludCB5KQogICAgICAgICBbdGFyZ2V0VmlldyBzY3JvbGxXaGVlbDpldmVudF07CiB9 CiAKK3ZvaWQgRXZlbnRTZW5kZXJQcm94eTo6Y29udGludW91c1Njcm9sbEJ5KGludCB4LCBpbnQg eSwgYm9vbCBwYWdlZCkKK3sKKyAgICBSZXRhaW5QdHI8Q0dFdmVudFJlZj4gY2dTY3JvbGxFdmVu dChBZG9wdENGLCBDR0V2ZW50Q3JlYXRlU2Nyb2xsV2hlZWxFdmVudCgwLCBrQ0dTY3JvbGxFdmVu dFVuaXRQaXhlbCwgMiwgeSwgeCkpOworCisgICAgLy8gQ0dFdmVudCBsb2NhdGlvbnMgYXJlIGlu IGdsb2JhbCBkaXNwbGF5IGNvb3JkaW5hdGVzLgorICAgIENHUG9pbnQgbGFzdEdsb2JhbE1vdXNl UG9zaXRpb24gPSB7CisgICAgICAgIG1fcG9zaXRpb24ueCwKKyAgICAgICAgW1tOU1NjcmVlbiBt YWluU2NyZWVuXSBmcmFtZV0uc2l6ZS5oZWlnaHQgLSBtX3Bvc2l0aW9uLnkKKyAgICB9OworICAg IENHRXZlbnRTZXRMb2NhdGlvbihjZ1Njcm9sbEV2ZW50LmdldCgpLCBsYXN0R2xvYmFsTW91c2VQ b3NpdGlvbik7CisKKyAgICBOU0V2ZW50ICpldmVudCA9IFtOU0V2ZW50IGV2ZW50V2l0aENHRXZl bnQ6Y2dTY3JvbGxFdmVudC5nZXQoKV07CisgICAgTlNWaWV3ICp0YXJnZXRWaWV3ID0gW21fdGVz dENvbnRyb2xsZXItPm1haW5XZWJWaWV3KCktPnBsYXRmb3JtVmlldygpIGhpdFRlc3Q6W2V2ZW50 IGxvY2F0aW9uSW5XaW5kb3ddXTsKKyAgICBpZiAodGFyZ2V0VmlldykKKyAgICAgICAgW3Rhcmdl dFZpZXcgc2Nyb2xsV2hlZWw6ZXZlbnRdOworfQorCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAt LWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcCBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvcXQvRXZlbnRTZW5kZXJQcm94eVF0LmNwcAppbmRleCAw NWExY2RjZjg4MTBlNWE2NmNhMTAwY2ZjNjk4MTA1MWZiOTdiYjM3Li41MTViNWE1ZDlmZTA0ODY1 YzdmOTFlYzhkZjRjMDBiYzllYTNiZWVlIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL3F0L0V2ZW50U2VuZGVyUHJveHlRdC5jcHAKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9xdC9FdmVudFNlbmRlclByb3h5UXQuY3BwCkBAIC0zMDUsNiArMzA1LDExIEBAIHZvaWQgRXZl bnRTZW5kZXJQcm94eTo6bW91c2VTY3JvbGxCeShpbnQsIGludCkKICAgICAvLyBGSVhNRTogSW1w bGVtZW50IHRoaXMuCiB9CiAKK3ZvaWQgRXZlbnRTZW5kZXJQcm94eTo6Y29udGludW91c01vdXNl U2Nyb2xsQnkoaW50LCBpbnQsIGJvb2wpCit7CisgICAgLy8gRklYTUU6IEltcGxlbWVudCB0aGlz LgorfQorCiB2b2lkIEV2ZW50U2VuZGVyUHJveHk6OmxlYXBGb3J3YXJkKGludCBtcykKIHsKICAg ICBldmVudFF1ZXVlW2VuZE9mUXVldWVdLm1fZGVsYXkgPSBtczsK