69798 2011-10-10 16:04:20 -0700 Touch events should take page scale into account 2011-10-20 10:26:15 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68075 1 jknotten jknotten aroben fsamuel gmak rjkroege simon.fraser tonikitoo varunjain webkit.review.bot oldest_to_newest 481254 0 jknotten 2011-10-10 16:04:20 -0700 Event coordinates are in CSS pixels, so they should take the page scaling into account when converting from PlatformTouchEvent coordinates (which is in screen pixels). 481258 1 110429 jknotten 2011-10-10 16:07:52 -0700 Created attachment 110429 Patch 484925 2 110429 morrita 2011-10-16 22:31:58 -0700 Comment on attachment 110429 Patch Please include the expectation file of added test. 485468 3 111313 jknotten 2011-10-17 13:44:54 -0700 Created attachment 111313 Patch 485472 4 webkit.review.bot 2011-10-17 13:47:12 -0700 Attachment 111313 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit', '--chromium']" exit_code: 2 Updating OpenSource Current branch master is up to date. Updating chromium port dependencies using gclient... Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Re-trying 'depot_tools/gclient sync' Error: Can't switch the checkout to http://v8.googlecode.com/svn/branches/3.6@9637; UUID don't match and there is local changes in /mnt/git/webkit-style-queue/Source/WebKit/chromium/v8. Delete the directory and try again. Error: 'depot_tools/gclient sync' failed 3 tries and returned 256 at Tools/Scripts/update-webkit-chromium line 107. Re-trying 'depot_tools/gclient sync' No such file or directory at Tools/Scripts/update-webkit line 104. If any of these errors are false positives, please file a bug against check-webkit-style. 485479 5 jknotten 2011-10-17 13:50:45 -0700 Thanks for reviewing, Hajime. Expectations now included. I also changed the test to be more similar to the test it is derived from, bringing the coordinates of the gesture closer together so that they are recognised as a click (rather than say, a swipe). 487096 6 jknotten 2011-10-19 16:06:55 -0700 The style bot had a wobbly on this day - there weren't any style problems detected by webkit-patch upload. I'd really appreciate it if someone could review. Thanks. 487121 7 fsamuel 2011-10-19 16:31:27 -0700 (In reply to comment #6) > The style bot had a wobbly on this day - there weren't any style problems detected by webkit-patch upload. > > I'd really appreciate it if someone could review. > > Thanks. I spoke to John, I am able to repo the bug locally on http://www-cs-students.stanford.edu/~eparker/files/maps/visualize_touch_events.html. This looks like a good fix, IMHO. Simon, could you please take a look at this? Thanks. 487213 8 111313 abarth 2011-10-19 18:54:07 -0700 Comment on attachment 111313 Patch Looks reasonable. 487659 9 111313 webkit.review.bot 2011-10-20 09:49:04 -0700 Comment on attachment 111313 Patch Clearing flags on attachment: 111313 Committed r97988: <http://trac.webkit.org/changeset/97988> 487660 10 webkit.review.bot 2011-10-20 09:49:09 -0700 All reviewed patches have been landed. Closing bug. 110429 2011-10-10 16:07:52 -0700 2011-10-17 13:44:48 -0700 Patch bug-69798-20111011000751.patch text/plain 6710 jknotten U3VidmVyc2lvbiBSZXZpc2lvbjogOTcwODQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA3YmZjZWFjZTIxZGM1ODVjYjJlMTcx ZmE5NzMxNGNmNmY2MmIwMWM1Li4yYjBmYmM1OGNkM2U5MzI3ZmIzMzFhZjUyMmYxM2JjZDdjNzU5 OGM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMTAtMTAgIEpvaG4gS25vdHRlbmJlbHQg IDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVG91Y2ggZXZlbnRzIHNob3VsZCB0 YWtlIHBhZ2Ugc2NhbGUgaW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02OTc5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvcGFnZS1zY2FsZWQtdG91Y2gt Z2VzdHVyZS1jbGljay5odG1sOiBBZGRlZC4KKwogMjAxMS0xMC0xMCAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXRUZXN0UnVubmVyIG5lZWRz IGxheW91dFRlc3RDb250cm9sbGVyLnNldFdpbmRvd0lzS2V5CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9wYWdlLXNjYWxlZC10b3VjaC1nZXN0dXJlLWNsaWNrLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9wYWdlLXNjYWxlZC10b3VjaC1nZXN0 dXJlLWNsaWNrLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOGYzMTRlMmQwNDljZGRlZWE2ZmY2ZThjOWE0Mjdk MGRjNTI1Nzc1NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Rv dWNoL3BhZ2Utc2NhbGVkLXRvdWNoLWdlc3R1cmUtY2xpY2suaHRtbApAQCAtMCwwICsxLDEyMSBA QAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+ Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vanMvcmVzb3VyY2Vz L2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNlcy9q cy10ZXN0LXBvc3QtZnVuY3Rpb24uanMiPjwvc2NyaXB0PgorPHN0eWxlIHR5cGU9InRleHQvY3Nz Ij4KKyN0b3VjaHRhcmdldCB7CisgIHdpZHRoOiAxMDAwcHg7CisgIGhlaWdodDogMTAwMHB4Owor ICBiYWNrZ3JvdW5kOiBibHVlOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0i cnVuVGVzdCgpOyI+Cis8ZGl2IGlkPSJ0b3VjaHRhcmdldCI+CisKKzxwIGlkPSJkZXNjcmlwdGlv biI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+Cit2YXIgY2xpY2tF dmVudHNSZWNlaXZlZCA9IDA7Cit2YXIgZXhwZWN0ZWRNb3VzZUV2ZW50cyA9IDQ7Cit2YXIgdG91 Y2hFdmVudHNSZWNlaXZlZCA9IDA7Cit2YXIgbW91c2VFdmVudHNSZWNlaXZlZCA9IDA7Cit2YXIg ZXZlbnRUeXBlcyA9IFsgJ21vdXNlbW92ZScsICdtb3VzZWRvd24nLCAnbW91c2V1cCcsICdjbGlj aycgXTsKKworZnVuY3Rpb24gZ2VzdHVyZUV2ZW50Q2FsbGJhY2soZXZlbnQpCit7CisgICAgaWYg KHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2V2 ZW50LnR5cGUnLCBldmVudFR5cGVzW21vdXNlRXZlbnRzUmVjZWl2ZWRdKTsKKyAgICAgICAgc2hv dWxkQmUoJ2V2ZW50LmNsaWVudFgnLCAnMjAwJyk7CisgICAgICAgIHNob3VsZEJlKCdldmVudC5j bGllbnRZJywgJzI0MCcpOworICAgICAgICBzaG91bGRCZSgiZXZlbnQuc2hpZnRLZXkiLCAidHJ1 ZSIpOworICAgICAgICBzaG91bGRCZSgiZXZlbnQuYWx0S2V5IiwgInRydWUiKTsKKyAgICAgICAg c2hvdWxkQmUoImV2ZW50LmN0cmxLZXkiLCAiZmFsc2UiKTsKKyAgICAgICAgc2hvdWxkQmUoImV2 ZW50Lm1ldGFLZXkiLCAiZmFsc2UiKTsKKyAgICAgICAgbW91c2VFdmVudHNSZWNlaXZlZCsrOwor ICAgIH0gZWxzZSB7CisgICAgICAgIGRlYnVnKGV2ZW50LnR5cGUpOworICAgICAgICBkZWJ1Zyhl dmVudC5jbGllbnRYKTsKKyAgICAgICAgZGVidWcoZXZlbnQuY2xpZW50WSk7CisgICAgfQorfQor CisvLyBCZWNhdXNlIHdlIG1heSBub3QgaGF2ZSBhIGdlc3R1cmUgcmVjb2duaXplciwgd2Ugc2Vu ZCBhIGtleSBwcmVzcworLy8gZXZlbnQgdG8gZW5kIHRoZSB0ZXN0IHdpdGhvdXQgdGVtcG9yYWwg Zmxha2luZXNzLgorZnVuY3Rpb24gcXVpdEtleVRvRW5kVGVzdChldmVudCkgeworICAgIGVuZFRl c3QoKTsKK30KKworLy8gTG9nIHRoYXQgd2Ugc3RpbGwgZ290IHRoZSB0b3VjaCBldmVudHMuCitm dW5jdGlvbiB0b3VjaEV2ZW50Q2FsbGJhY2soZXZlbnQpIHsKKyAgICB0b3VjaEV2ZW50c1JlY2Vp dmVkKys7CisgICAgZGVidWcoJ2hhdmUgcmVjZWl2ZWQ6ICcgKyB0b3VjaEV2ZW50c1JlY2VpdmVk ICsgJyB0b3VjaCBldmVudHMnKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworZnVuY3Rpb24gc2lu Z2xlVG91Y2hTZXF1ZW5jZSgpCit7CisgICAgZXZlbnRTZW5kZXIuY2xlYXJUb3VjaFBvaW50cygp OworICAgIC8vIENvb3JkaW5hdGVzIHBhc3NlZCB0byBldmVudFNlbmRlci5hZGRUb3VjaFBvaW50 IGFyZSBpbiBzY3JlZW4gcGl4ZWxzLAorICAgIC8vIHJlbGF0aXZlIHRvIHRoZSB0b3AgbGVmdCBv ZiB0aGUgd2luZG93LgorICAgIGV2ZW50U2VuZGVyLmFkZFRvdWNoUG9pbnQoMTAwLCAxMjApOwor ICAgIGV2ZW50U2VuZGVyLnRvdWNoU3RhcnQoKTsKKworICAgIC8vIEluc2VydCBzb21lIGRlbGF5 LiBOQjogdGhpcyB2YWx1ZSBkZXBlbmRzIG9uIG1pbkNsaWNrRG93blRpbWUsCisgICAgLy8gbWF4 Q2xpY2tEb3duVGltZSBmcm9tIEdlc3R1cmVSZWNvZ25pemVyQ2hyb21pdW0uY3BwCisgICAgZXZl bnRTZW5kZXIubGVhcEZvcndhcmQoMjApOworICAgIGV2ZW50U2VuZGVyLnNldFRvdWNoTW9kaWZp ZXIoInNoaWZ0IiwgdHJ1ZSk7CisgICAgZXZlbnRTZW5kZXIuc2V0VG91Y2hNb2RpZmllcigiYWx0 IiwgdHJ1ZSk7CisKKyAgICBldmVudFNlbmRlci5yZWxlYXNlVG91Y2hQb2ludCgwKTsKKyAgICBl dmVudFNlbmRlci50b3VjaEVuZCgpOworfQorCitmdW5jdGlvbiBlbmRUZXN0KCkKK3sKKyAgICBp ZiAobW91c2VFdmVudHNSZWNlaXZlZCA8IGV4cGVjdGVkTW91c2VFdmVudHMpIHsKKyAgICAgICAg ZGVidWcoJ0dlc3R1cmUgbWFuYWdlciBub3QgaW1wbGVtZW50ZWQgb24gdGhpcyBwbGF0Zm9ybS4n KTsKKyAgICB9CisgICAgLy8gQmFpbC4KKyAgICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwor ICAgIGlzU3VjY2Vzc2Z1bGx5UGFyc2VkKCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90 aWZ5RG9uZSgpOworfQorCitmdW5jdGlvbiBydW5UZXN0KCkgeworICAgIGlmICh3aW5kb3cuZXZl bnRTZW5kZXIpIHsKKyAgICAgICAgZXZlbnRTZW5kZXIuc2NhbGVQYWdlQnkoMC41LCAwLCAwKTsK KyAgICB9CisKKyAgICB2YXIgZGl2ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3RvdWNodGFy Z2V0Jyk7CisgICAgZGl2LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIGdlc3R1cmVFdmVu dENhbGxiYWNrLCBmYWxzZSk7CisgICAgZGl2LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgZ2Vz dHVyZUV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsKKyAgICBkaXYuYWRkRXZlbnRMaXN0ZW5lcigibW91 c2V1cCIsIGdlc3R1cmVFdmVudENhbGxiYWNrLCBmYWxzZSk7CisgICAgZGl2LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlbW92ZSIsIGdlc3R1cmVFdmVudENhbGxiYWNrLCBmYWxzZSk7CisgICAgZG9j dW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHF1aXRLZXlUb0VuZFRlc3QsIGZhbHNl KTsKKyAgICBkaXYuYWRkRXZlbnRMaXN0ZW5lcigidG91Y2hzdGFydCIsIHRvdWNoRXZlbnRDYWxs YmFjaywgZmFsc2UpOworICAgIGRpdi5hZGRFdmVudExpc3RlbmVyKCJ0b3VjaG1vdmUiLCB0b3Vj aEV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsKKyAgICBkaXYuYWRkRXZlbnRMaXN0ZW5lcigidG91Y2hl bmQiLCB0b3VjaEV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsKKworICAgIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERv bmUoKTsKKworICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgZGVzY3JpcHRp b24oIlRoaXMgdGVzdHMgYmFzaWMgc2luZ2xlIHRvdWNoIGdlc3R1cmUgZ2VuZXJhdGlvbi4iKTsK KyAgICAgICAgaWYgKGV2ZW50U2VuZGVyLmNsZWFyVG91Y2hQb2ludHMpIHsKKyAgICAgICAgICAg IHNpbmdsZVRvdWNoU2VxdWVuY2UoKTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLmxlYXBGb3J3 YXJkKDEwKTsKKyAgICAgICAgICAgIGV2ZW50U2VuZGVyLmtleURvd24oJyAnKTsKKyAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSB7 CisgICAgICAgIGRlYnVnKCJUaGlzIHRlc3QgcmVxdWlyZXMgRHVtcFJlbmRlclRyZWUuICBUYXAg b24gdGhlIGJsdWUgcmVjdCB0byBsb2cuIikKKyAgICB9Cit9Cis8L3NjcmlwdD4KKzwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMjE4ODYyY2I1ZGU4ODAyNGYwY2M0YmQ1NjhmN2M4NWY0 NjJlMDQ4Li40NGFkNmI2MThiYWZiNjY4ZDBmNjliNDY4NTBmMzA2Yzc0OGEzYWU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTAgIEpvaG4gS25vdHRlbmJlbHQgIDxqa25v dHRlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVG91Y2ggZXZlbnRzIHNob3VsZCB0YWtlIHBh Z2Ugc2NhbGUgaW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTc5OAorCisgICAgICAgIEV2ZW50IGNvb3JkaW5hdGVzIGFyZSBpbiBD U1MgcGl4ZWxzLCBzbyB0aGV5IHNob3VsZCB0YWtlIHRoZSBwYWdlCisgICAgICAgIHNjYWxpbmcg aW50byBhY2NvdW50IHdoZW4gY29udmVydGluZyBmcm9tIFBsYXRmb3JtVG91Y2hFdmVudAorICAg ICAgICBjb29yZGluYXRlcyAod2hpY2ggaXMgaW4gc2NyZWVuIHBpeGVscykuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9ldmVudHMv dG91Y2gvcGFnZS1zY2FsZWQtdG91Y2gtZ2VzdHVyZS1jbGljay5odG1sCisKKyAgICAgICAgKiBw YWdlL0V2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6Omhh bmRsZVRvdWNoRXZlbnQpOgorCiAyMDExLTEwLTEwICBOYXlhbiBLdW1hciBLICA8bmF5YW5ra0Bt b3Rvcm9sYS5jb20+CiAKICAgICAgICAgQWRkIG1pc3NpbmcgaWZkZWYgZm9yIEpBVkFTQ1JJUFRf REVCVUdHRVIgZmVhdHVyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCBj NjNmYWVlODQ4OTQ4Nzc3YmQ1NjdjYzFmOTM2ZDY2MGE5YWQ1MzNhLi5jMWQ0Y2I3ZGY0ZGQ1MDA3 ZjFjOTk3MTg0ZmJkM2U5MTJmNTZjMTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC0zMjI4LDggKzMyMjgsMTAgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNo RXZlbnQoY29uc3QgUGxhdGZvcm1Ub3VjaEV2ZW50JiBldmVudCkKICAgICAgICAgICAgIHBhZ2VQ b2ludCA9IGRvY3VtZW50UG9pbnRGb3JXaW5kb3dQb2ludChkb2MtPmZyYW1lKCksIHBvaW50LnBv cygpKTsKICAgICAgICAgfQogCi0gICAgICAgIGludCBhZGp1c3RlZFBhZ2VYID0gbHJvdW5kZihw YWdlUG9pbnQueCgpIC8gbV9mcmFtZS0+cGFnZVpvb21GYWN0b3IoKSk7Ci0gICAgICAgIGludCBh ZGp1c3RlZFBhZ2VZID0gbHJvdW5kZihwYWdlUG9pbnQueSgpIC8gbV9mcmFtZS0+cGFnZVpvb21G YWN0b3IoKSk7CisgICAgICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gbV9mcmFtZS0+cGFnZVpvb21G YWN0b3IoKSAqIG1fZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKTsKKworICAgICAgICBpbnQgYWRq dXN0ZWRQYWdlWCA9IGxyb3VuZGYocGFnZVBvaW50LngoKSAvIHNjYWxlRmFjdG9yKTsKKyAgICAg ICAgaW50IGFkanVzdGVkUGFnZVkgPSBscm91bmRmKHBhZ2VQb2ludC55KCkgLyBzY2FsZUZhY3Rv cik7CiAKICAgICAgICAgLy8gSW5jcmVtZW50IHRoZSBwbGF0Zm9ybSB0b3VjaCBpZCBieSAxIHRv IGF2b2lkIHN0b3JpbmcgYSBrZXkgb2YgMCBpbiB0aGUgaGFzaG1hcC4KICAgICAgICAgdW5zaWdu ZWQgdG91Y2hQb2ludFRhcmdldEtleSA9IHBvaW50LmlkKCkgKyAxOwo= 111313 2011-10-17 13:44:54 -0700 2011-10-20 09:49:04 -0700 Patch bug-69798-20111017214452.patch text/plain 8032 jknotten U3VidmVyc2lvbiBSZXZpc2lvbjogOTc0MjUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4NDE3N2Y2YWYzMGI2YjljZWRmNDM5 MjY4YzY4M2FkM2U3MmUwZjY4Li40ZTllMmVkYzFlYzU5OGE3NTY4ZjQwNGRmZGFlZDg5YmQ2ZDli ODBiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMTcgIEpvaG4gS25vdHRlbmJlbHQg IDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVG91Y2ggZXZlbnRzIHNob3VsZCB0 YWtlIHBhZ2Ugc2NhbGUgaW50byBhY2NvdW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02OTc5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvcGFnZS1zY2FsZWQtdG91Y2gt Z2VzdHVyZS1jbGljay1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZlbnRz L3RvdWNoL3BhZ2Utc2NhbGVkLXRvdWNoLWdlc3R1cmUtY2xpY2suaHRtbDogQWRkZWQuCisKIDIw MTEtMTAtMTMgIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IEltcGxlbWVudCBhIEJlZm9yZUxvYWRFdmVudCBjb25zdHJ1Y3RvciBmb3IgVjgKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3BhZ2Utc2NhbGVkLXRvdWNoLWdlc3R1 cmUtY2xpY2stZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvcGFn ZS1zY2FsZWQtdG91Y2gtZ2VzdHVyZS1jbGljay1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTJi YjY1ODYzMDc0ZDljY2I3MjQ5YjQxNWQxYmFiZWMzOTcwY2YyMwotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3BhZ2Utc2NhbGVkLXRvdWNoLWdlc3R1cmUt Y2xpY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzkgQEAKK1RoaXMgdGVzdHMgYmFzaWMgc2lu Z2xlIHRvdWNoIGdlc3R1cmUgZ2VuZXJhdGlvbi4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2Vl IGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUi LgorCisKK2hhdmUgcmVjZWl2ZWQ6IDEgdG91Y2ggZXZlbnRzCitoYXZlIHJlY2VpdmVkOiAyIHRv dWNoIGV2ZW50cworUEFTUyBldmVudC50eXBlIGlzICJtb3VzZW1vdmUiCitQQVNTIGV2ZW50LmNs aWVudFggaXMgMjAKK1BBU1MgZXZlbnQuY2xpZW50WSBpcyAyNAorUEFTUyBldmVudC5zaGlmdEtl eSBpcyB0cnVlCitQQVNTIGV2ZW50LmFsdEtleSBpcyB0cnVlCitQQVNTIGV2ZW50LmN0cmxLZXkg aXMgZmFsc2UKK1BBU1MgZXZlbnQubWV0YUtleSBpcyBmYWxzZQorUEFTUyBldmVudC50eXBlIGlz ICJtb3VzZWRvd24iCitQQVNTIGV2ZW50LmNsaWVudFggaXMgMjAKK1BBU1MgZXZlbnQuY2xpZW50 WSBpcyAyNAorUEFTUyBldmVudC5zaGlmdEtleSBpcyB0cnVlCitQQVNTIGV2ZW50LmFsdEtleSBp cyB0cnVlCitQQVNTIGV2ZW50LmN0cmxLZXkgaXMgZmFsc2UKK1BBU1MgZXZlbnQubWV0YUtleSBp cyBmYWxzZQorUEFTUyBldmVudC50eXBlIGlzICJtb3VzZXVwIgorUEFTUyBldmVudC5jbGllbnRY IGlzIDIwCitQQVNTIGV2ZW50LmNsaWVudFkgaXMgMjQKK1BBU1MgZXZlbnQuc2hpZnRLZXkgaXMg dHJ1ZQorUEFTUyBldmVudC5hbHRLZXkgaXMgdHJ1ZQorUEFTUyBldmVudC5jdHJsS2V5IGlzIGZh bHNlCitQQVNTIGV2ZW50Lm1ldGFLZXkgaXMgZmFsc2UKK1BBU1MgZXZlbnQudHlwZSBpcyAiY2xp Y2siCitQQVNTIGV2ZW50LmNsaWVudFggaXMgMjAKK1BBU1MgZXZlbnQuY2xpZW50WSBpcyAyNAor UEFTUyBldmVudC5zaGlmdEtleSBpcyB0cnVlCitQQVNTIGV2ZW50LmFsdEtleSBpcyB0cnVlCitQ QVNTIGV2ZW50LmN0cmxLZXkgaXMgZmFsc2UKK1BBU1MgZXZlbnQubWV0YUtleSBpcyBmYWxzZQor UEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3BhZ2Utc2NhbGVkLXRvdWNoLWdl c3R1cmUtY2xpY2suaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL3BhZ2Utc2Nh bGVkLXRvdWNoLWdlc3R1cmUtY2xpY2suaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iMjA3NTljODkwMmI4NTcx YjU4ZjEyZTU3ZmE5MTJlNDNiMDM1YjUwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvdG91Y2gvcGFnZS1zY2FsZWQtdG91Y2gtZ2VzdHVyZS1jbGljay5odG1sCkBA IC0wLDAgKzEsMTIxIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1M Ly9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8u Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4v anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC1mdW5jdGlvbi5qcyI+PC9zY3JpcHQ+Cis8c3R5bGUg dHlwZT0idGV4dC9jc3MiPgorI3RvdWNodGFyZ2V0IHsKKyAgd2lkdGg6IDEwMHB4OworICBoZWln aHQ6IDEwMHB4OworICBiYWNrZ3JvdW5kOiBibHVlOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxi b2R5IG9ubG9hZD0icnVuVGVzdCgpOyI+Cis8ZGl2IGlkPSJ0b3VjaHRhcmdldCI+CisKKzxwIGlk PSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+CisKKzxzY3JpcHQ+ Cit2YXIgY2xpY2tFdmVudHNSZWNlaXZlZCA9IDA7Cit2YXIgZXhwZWN0ZWRNb3VzZUV2ZW50cyA9 IDQ7Cit2YXIgdG91Y2hFdmVudHNSZWNlaXZlZCA9IDA7Cit2YXIgbW91c2VFdmVudHNSZWNlaXZl ZCA9IDA7Cit2YXIgZXZlbnRUeXBlcyA9IFsgJ21vdXNlbW92ZScsICdtb3VzZWRvd24nLCAnbW91 c2V1cCcsICdjbGljaycgXTsKKworZnVuY3Rpb24gZ2VzdHVyZUV2ZW50Q2FsbGJhY2soZXZlbnQp Cit7CisgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICBzaG91bGRCZUVxdWFs VG9TdHJpbmcoJ2V2ZW50LnR5cGUnLCBldmVudFR5cGVzW21vdXNlRXZlbnRzUmVjZWl2ZWRdKTsK KyAgICAgICAgc2hvdWxkQmUoJ2V2ZW50LmNsaWVudFgnLCAnMjAnKTsKKyAgICAgICAgc2hvdWxk QmUoJ2V2ZW50LmNsaWVudFknLCAnMjQnKTsKKyAgICAgICAgc2hvdWxkQmUoImV2ZW50LnNoaWZ0 S2V5IiwgInRydWUiKTsKKyAgICAgICAgc2hvdWxkQmUoImV2ZW50LmFsdEtleSIsICJ0cnVlIik7 CisgICAgICAgIHNob3VsZEJlKCJldmVudC5jdHJsS2V5IiwgImZhbHNlIik7CisgICAgICAgIHNo b3VsZEJlKCJldmVudC5tZXRhS2V5IiwgImZhbHNlIik7CisgICAgICAgIG1vdXNlRXZlbnRzUmVj ZWl2ZWQrKzsKKyAgICB9IGVsc2UgeworICAgICAgICBkZWJ1ZyhldmVudC50eXBlKTsKKyAgICAg ICAgZGVidWcoZXZlbnQuY2xpZW50WCk7CisgICAgICAgIGRlYnVnKGV2ZW50LmNsaWVudFkpOwor ICAgIH0KK30KKworLy8gQmVjYXVzZSB3ZSBtYXkgbm90IGhhdmUgYSBnZXN0dXJlIHJlY29nbml6 ZXIsIHdlIHNlbmQgYSBrZXkgcHJlc3MKKy8vIGV2ZW50IHRvIGVuZCB0aGUgdGVzdCB3aXRob3V0 IHRlbXBvcmFsIGZsYWtpbmVzcy4KK2Z1bmN0aW9uIHF1aXRLZXlUb0VuZFRlc3QoZXZlbnQpIHsK KyAgICBlbmRUZXN0KCk7Cit9CisKKy8vIExvZyB0aGF0IHdlIHN0aWxsIGdvdCB0aGUgdG91Y2gg ZXZlbnRzLgorZnVuY3Rpb24gdG91Y2hFdmVudENhbGxiYWNrKGV2ZW50KSB7CisgICAgdG91Y2hF dmVudHNSZWNlaXZlZCsrOworICAgIGRlYnVnKCdoYXZlIHJlY2VpdmVkOiAnICsgdG91Y2hFdmVu dHNSZWNlaXZlZCArICcgdG91Y2ggZXZlbnRzJyk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKK2Z1 bmN0aW9uIHNpbmdsZVRvdWNoU2VxdWVuY2UoKQoreworICAgIGV2ZW50U2VuZGVyLmNsZWFyVG91 Y2hQb2ludHMoKTsKKyAgICAvLyBDb29yZGluYXRlcyBwYXNzZWQgdG8gZXZlbnRTZW5kZXIuYWRk VG91Y2hQb2ludCBhcmUgaW4gc2NyZWVuIHBpeGVscywKKyAgICAvLyByZWxhdGl2ZSB0byB0aGUg dG9wIGxlZnQgb2YgdGhlIHdpbmRvdy4KKyAgICBldmVudFNlbmRlci5hZGRUb3VjaFBvaW50KDEw LCAxMik7CisgICAgZXZlbnRTZW5kZXIudG91Y2hTdGFydCgpOworCisgICAgLy8gSW5zZXJ0IHNv bWUgZGVsYXkuIE5COiB0aGlzIHZhbHVlIGRlcGVuZHMgb24gbWluQ2xpY2tEb3duVGltZSwKKyAg ICAvLyBtYXhDbGlja0Rvd25UaW1lIGZyb20gR2VzdHVyZVJlY29nbml6ZXJDaHJvbWl1bS5jcHAK KyAgICBldmVudFNlbmRlci5sZWFwRm9yd2FyZCgyMCk7CisgICAgZXZlbnRTZW5kZXIuc2V0VG91 Y2hNb2RpZmllcigic2hpZnQiLCB0cnVlKTsKKyAgICBldmVudFNlbmRlci5zZXRUb3VjaE1vZGlm aWVyKCJhbHQiLCB0cnVlKTsKKworICAgIGV2ZW50U2VuZGVyLnJlbGVhc2VUb3VjaFBvaW50KDAp OworICAgIGV2ZW50U2VuZGVyLnRvdWNoRW5kKCk7Cit9CisKK2Z1bmN0aW9uIGVuZFRlc3QoKQor eworICAgIGlmIChtb3VzZUV2ZW50c1JlY2VpdmVkIDwgZXhwZWN0ZWRNb3VzZUV2ZW50cykgewor ICAgICAgICBkZWJ1ZygnR2VzdHVyZSBtYW5hZ2VyIG5vdCBpbXBsZW1lbnRlZCBvbiB0aGlzIHBs YXRmb3JtLicpOworICAgIH0KKyAgICAvLyBCYWlsLgorICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9 IHRydWU7CisgICAgaXNTdWNjZXNzZnVsbHlQYXJzZWQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5ub3RpZnlEb25lKCk7Cit9CisKK2Z1bmN0aW9uIHJ1blRlc3QoKSB7CisgICAgaWYgKHdp bmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICBldmVudFNlbmRlci5zY2FsZVBhZ2VCeSgwLjUs IDAsIDApOworICAgIH0KKworICAgIHZhciBkaXYgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn dG91Y2h0YXJnZXQnKTsKKyAgICBkaXYuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgZ2Vz dHVyZUV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsKKyAgICBkaXYuYWRkRXZlbnRMaXN0ZW5lcigiY2xp Y2siLCBnZXN0dXJlRXZlbnRDYWxsYmFjaywgZmFsc2UpOworICAgIGRpdi5hZGRFdmVudExpc3Rl bmVyKCJtb3VzZXVwIiwgZ2VzdHVyZUV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsKKyAgICBkaXYuYWRk RXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgZ2VzdHVyZUV2ZW50Q2FsbGJhY2ssIGZhbHNlKTsK KyAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgcXVpdEtleVRvRW5kVGVz dCwgZmFsc2UpOworICAgIGRpdi5hZGRFdmVudExpc3RlbmVyKCJ0b3VjaHN0YXJ0IiwgdG91Y2hF dmVudENhbGxiYWNrLCBmYWxzZSk7CisgICAgZGl2LmFkZEV2ZW50TGlzdGVuZXIoInRvdWNobW92 ZSIsIHRvdWNoRXZlbnRDYWxsYmFjaywgZmFsc2UpOworICAgIGRpdi5hZGRFdmVudExpc3RlbmVy KCJ0b3VjaGVuZCIsIHRvdWNoRXZlbnRDYWxsYmFjaywgZmFsc2UpOworCisgICAgaWYgKHdpbmRv dy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2Fp dFVudGlsRG9uZSgpOworCisgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICBk ZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyBiYXNpYyBzaW5nbGUgdG91Y2ggZ2VzdHVyZSBnZW5lcmF0 aW9uLiIpOworICAgICAgICBpZiAoZXZlbnRTZW5kZXIuY2xlYXJUb3VjaFBvaW50cykgeworICAg ICAgICAgICAgc2luZ2xlVG91Y2hTZXF1ZW5jZSgpOworICAgICAgICAgICAgZXZlbnRTZW5kZXIu bGVhcEZvcndhcmQoMTApOworICAgICAgICAgICAgZXZlbnRTZW5kZXIua2V5RG93bignICcpOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICB9CisgICAg fSBlbHNlIHsKKyAgICAgICAgZGVidWcoIlRoaXMgdGVzdCByZXF1aXJlcyBEdW1wUmVuZGVyVHJl ZS4gIFRhcCBvbiB0aGUgYmx1ZSByZWN0IHRvIGxvZy4iKQorICAgIH0KK30KKzwvc2NyaXB0Pgor PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY1OTU0NDZmMmY2ZGQxYzk0YmFmMTRmNzkx NzI5MzQyMWI1NjgwMjUuLmM1MzcxZTQxODE1MWUwNmU4NjE0NGMzYWExYzY4ZDkxOWQ5MTEwMjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0xMC0xNyAgSm9obiBLbm90dGVuYmVs dCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBUb3VjaCBldmVudHMgc2hvdWxk IHRha2UgcGFnZSBzY2FsZSBpbnRvIGFjY291bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY5Nzk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGVzdDogZmFzdC9ldmVudHMvdG91Y2gvcGFnZS1zY2FsZWQt dG91Y2gtZ2VzdHVyZS1jbGljay5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmhhbmRsZVRvdWNoRXZlbnQpOgor CiAyMDExLTEwLTEzICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZWdhcmRpbmcgY29uc3RydWN0b3IsIHJlcGxhY2UgW0NvbnN0cnVjdG9yV2l0aD0uLi5d IElETCB3aXRoIFtDYWxsV2l0aD0uLi5dIElETApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCmluZGV4IGM2M2ZhZWU4NDg5NDg3NzdiZDU2N2NjMWY5MzZkNjYwYTlhZDUzM2EuLmMxZDRj YjdkZjRkZDUwMDdmMWM5OTcxODRmYmQzZTkxMmY1NmMxMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKQEAgLTMyMjgsOCArMzIyOCwxMCBAQCBib29sIEV2ZW50SGFuZGxlcjo6 aGFuZGxlVG91Y2hFdmVudChjb25zdCBQbGF0Zm9ybVRvdWNoRXZlbnQmIGV2ZW50KQogICAgICAg ICAgICAgcGFnZVBvaW50ID0gZG9jdW1lbnRQb2ludEZvcldpbmRvd1BvaW50KGRvYy0+ZnJhbWUo KSwgcG9pbnQucG9zKCkpOwogICAgICAgICB9CiAKLSAgICAgICAgaW50IGFkanVzdGVkUGFnZVgg PSBscm91bmRmKHBhZ2VQb2ludC54KCkgLyBtX2ZyYW1lLT5wYWdlWm9vbUZhY3RvcigpKTsKLSAg ICAgICAgaW50IGFkanVzdGVkUGFnZVkgPSBscm91bmRmKHBhZ2VQb2ludC55KCkgLyBtX2ZyYW1l LT5wYWdlWm9vbUZhY3RvcigpKTsKKyAgICAgICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBtX2ZyYW1l LT5wYWdlWm9vbUZhY3RvcigpICogbV9mcmFtZS0+ZnJhbWVTY2FsZUZhY3RvcigpOworCisgICAg ICAgIGludCBhZGp1c3RlZFBhZ2VYID0gbHJvdW5kZihwYWdlUG9pbnQueCgpIC8gc2NhbGVGYWN0 b3IpOworICAgICAgICBpbnQgYWRqdXN0ZWRQYWdlWSA9IGxyb3VuZGYocGFnZVBvaW50LnkoKSAv IHNjYWxlRmFjdG9yKTsKIAogICAgICAgICAvLyBJbmNyZW1lbnQgdGhlIHBsYXRmb3JtIHRvdWNo IGlkIGJ5IDEgdG8gYXZvaWQgc3RvcmluZyBhIGtleSBvZiAwIGluIHRoZSBoYXNobWFwLgogICAg ICAgICB1bnNpZ25lZCB0b3VjaFBvaW50VGFyZ2V0S2V5ID0gcG9pbnQuaWQoKSArIDE7Cg==