105664 2012-12-21 15:01:58 -0800 [chromium] Use top level field for gesture event source 2013-01-02 12:18:17 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rjkroege rjkroege abarth rjkroege webkit.review.bot oldest_to_newest 796487 0 rjkroege 2012-12-21 15:01:58 -0800 WebGestureEvent events of subtype GestureFlingStart had a field deviceSource to specify which device was the origin of the fling request. It is useful to have this field for other WebGestureEvent subtypes (in particular GestureScrollStart, GestureScrollEnd). Previously, a single top-level field was added to WebGestureEvent. Now that Chromium populates this field, use it in the Chromium WebKit layer. 796497 1 180563 rjkroege 2012-12-21 15:16:23 -0800 Created attachment 180563 Patch 796501 2 180563 rjkroege 2012-12-21 15:19:23 -0800 Comment on attachment 180563 Patch nb: patch won't pass tests until Chromium deps are rolled into WebKit. 798758 3 rjkroege 2013-01-02 11:30:26 -0800 As indicated by EWS results, the necessary DEPS roll has taken place. 798778 4 180563 abarth 2013-01-02 12:10:15 -0800 Comment on attachment 180563 Patch ok 798783 5 180563 webkit.review.bot 2013-01-02 12:18:14 -0800 Comment on attachment 180563 Patch Clearing flags on attachment: 180563 Committed r138629: <http://trac.webkit.org/changeset/138629> 798784 6 webkit.review.bot 2013-01-02 12:18:17 -0800 All reviewed patches have been landed. Closing bug. 180563 2012-12-21 15:16:23 -0800 2013-01-02 12:18:14 -0800 Patch bug-105664-20121221181338.patch text/plain 12215 rjkroege U3VidmVyc2lvbiBSZXZpc2lvbjogMTM4MzY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRmMmYwZGNlYjgxMmE0ZjhmYzhkMmRkNWFiNTdlNjdlMmI5NzliNGYuLjg3OTRkNzBkNTZlNTc4 MmNiMmEwOTlkODExMmRhYjA5Y2VhZjk2NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTItMTItMjEgIFJvYmVydCBLcm9lZ2VyICA8cmprcm9lZ2VAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gVXNlIHRvcCBsZXZlbCBmaWVsZCBmb3Ig Z2VzdHVyZSBldmVudCBzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNTY2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFByZXZpb3VzbHksIG9ubHkgR2VzdHVyZUZsaW5nU3RhcnQgc3VidHlwZXMg b2YgV2ViR2VzdHVyZUV2ZW50CisgICAgICAgIGhhZCBhIGRldmljZVNvdXJjZSBmbGFnLiBBIHBy ZXZpb3VzIENMIGFkZGVkIGEgdG9wLWxldmVsCisgICAgICAgIGRldmljZVNvdXJjZSBmaWVsZCBm b3IgYWxsIFdlYkdlc3R1cmVFdmVudC4gTm93IHRoYXQgdGhpcyBmaWVsZAorICAgICAgICBpcyBw b3B1bGF0ZWQgaW4gQ2hyb21pdW0sIHVzZSBpdCBhcyBuZWNlc3NhcnkgaW4gdGhlIENocm9taXVt CisgICAgICAgIFdlYktpdCBsYXllci4KKworICAgICAgICBObyBuZXcgdGVzdHM6IGNvdmVyZWQg YnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBzcmMvV2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVy SW1wbDo6aGFuZGxlR2VzdHVyZUZsaW5nKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KToKKyAg ICAgICAgKiB0ZXN0cy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwOgorICAg ICAgICAoV2ViS2l0OjpURVNUX0YpOgorCiAyMDEyLTEyLTIwICBOb2VsIEdvcmRvbiAgPG5vZWwu Z29yZG9uQGdtYWlsLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIERpc2FibGUgY29sb3IgcHJv ZmlsZSBzdXBwb3J0IGZvciBXZWJJbWFnZVNraWEgdXNlcnMgCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbC5j cHAKaW5kZXggZjUwZmU1MjA0MDdhYjkwOTgwMjczM2VjZGY2MWRhNjkzZTQyNzM1My4uMTA2ODAz MjFiYWM1NjkxNzBiMTBmNTk3MGRlYzcxYWY2NjA0MjJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGwuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBs LmNwcApAQCAtMjE5LDE1ICsyMTksMTUgQEAgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6 OkV2ZW50RGlzcG9zaXRpb24gV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmgKICAgICBX ZWJJbnB1dEhhbmRsZXJDbGllbnQ6OlNjcm9sbFN0YXR1cyBzY3JvbGxTdGF0dXMgPSBtX2lucHV0 SGFuZGxlckNsaWVudC0+c2Nyb2xsQmVnaW4oV2ViUG9pbnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1 cmVFdmVudC55KSwgV2ViSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxJbnB1dFR5cGVHZXN0dXJl KTsKICAgICBzd2l0Y2ggKHNjcm9sbFN0YXR1cykgewogICAgIGNhc2UgV2ViSW5wdXRIYW5kbGVy Q2xpZW50OjpTY3JvbGxTdGF0dXNTdGFydGVkOiB7Ci0gICAgICAgIGlmIChnZXN0dXJlRXZlbnQu ZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmljZSA9PSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFk KQorICAgICAgICBpZiAoZ2VzdHVyZUV2ZW50LnNvdXJjZURldmljZSA9PSBXZWJHZXN0dXJlRXZl bnQ6OlRvdWNocGFkKQogICAgICAgICAgICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEVu ZCgpOwotICAgICAgICBtX2ZsaW5nQ3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVudCgp LT5jcmVhdGVGbGluZ0FuaW1hdGlvbkN1cnZlKGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQu c291cmNlRGV2aWNlLCBXZWJGbG9hdFBvaW50KGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQu dmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSksIFdlYlNp emUoKSkpOworICAgICAgICBtX2ZsaW5nQ3VydmUgPSBhZG9wdFB0cihQbGF0Zm9ybTo6Y3VycmVu dCgpLT5jcmVhdGVGbGluZ0FuaW1hdGlvbkN1cnZlKGdlc3R1cmVFdmVudC5zb3VyY2VEZXZpY2Us IFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGdl c3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKSwgV2ViU2l6ZSgpKSk7CiAgICAg ICAgIFRSQUNFX0VWRU5UX0FTWU5DX0JFR0lOMCgid2Via2l0IiwgIldlYkNvbXBvc2l0b3JJbnB1 dEhhbmRsZXJJbXBsOjpoYW5kbGVHZXN0dXJlRmxpbmc6OnN0YXJ0ZWQiLCB0aGlzKTsKICAgICAg ICAgbV9mbGluZ1BhcmFtZXRlcnMuZGVsdGEgPSBXZWJGbG9hdFBvaW50KGdlc3R1cmVFdmVudC5k YXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZl bG9jaXR5WSk7CiAgICAgICAgIG1fZmxpbmdQYXJhbWV0ZXJzLnBvaW50ID0gV2ViUG9pbnQoZ2Vz dHVyZUV2ZW50LngsIGdlc3R1cmVFdmVudC55KTsKICAgICAgICAgbV9mbGluZ1BhcmFtZXRlcnMu Z2xvYmFsUG9pbnQgPSBXZWJQb2ludChnZXN0dXJlRXZlbnQuZ2xvYmFsWCwgZ2VzdHVyZUV2ZW50 Lmdsb2JhbFkpOwogICAgICAgICBtX2ZsaW5nUGFyYW1ldGVycy5tb2RpZmllcnMgPSBnZXN0dXJl RXZlbnQubW9kaWZpZXJzOwotICAgICAgICBtX2ZsaW5nUGFyYW1ldGVycy5zb3VyY2VEZXZpY2Ug PSBnZXN0dXJlRXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmljZTsKKyAgICAgICAgbV9m bGluZ1BhcmFtZXRlcnMuc291cmNlRGV2aWNlID0gZ2VzdHVyZUV2ZW50LnNvdXJjZURldmljZTsK ICAgICAgICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjaGVkdWxlQW5pbWF0aW9uKCk7CiAgICAg ICAgIHJldHVybiBEaWRIYW5kbGU7CiAgICAgfQpAQCAtMjM4LDcgKzIzOCw3IEBAIFdlYkNvbXBv c2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNvbXBvc2l0b3JJbnB1 dEhhbmRsZXJJbXBsOjpoCiAgICAgfQogICAgIGNhc2UgV2ViSW5wdXRIYW5kbGVyQ2xpZW50OjpT Y3JvbGxTdGF0dXNJZ25vcmVkOiB7CiAgICAgICAgIFRSQUNFX0VWRU5UX0lOU1RBTlQwKCJ3ZWJr aXQiLCAiV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUdlc3R1cmVGbGluZzo6 aWdub3JlZCIpOwotICAgICAgICBpZiAoZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFydC5zb3Vy Y2VEZXZpY2UgPT0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZCkgeworICAgICAgICBpZiAoZ2Vz dHVyZUV2ZW50LnNvdXJjZURldmljZSA9PSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkKSB7CiAg ICAgICAgICAgICAvLyBXZSBzdGlsbCBwYXNzIHRoZSBjdXJ2ZSB0byB0aGUgbWFpbiB0aHJlYWQg aWYgdGhlcmUncyBub3RoaW5nIHNjcm9sbGFibGUsIGluIGNhc2Ugc29tZXRoaW5nCiAgICAgICAg ICAgICAvLyByZWdpc3RlcnMgYSBoYW5kbGVyIGJlZm9yZSB0aGUgY3VydmUgaXMgb3Zlci4KICAg ICAgICAgICAgIHJldHVybiBEaWROb3RIYW5kbGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggOTZmMjkwMGVlNTQ1NThhZWY4Njc1NWEwZTJlZTNiODM0 NzRmMTllNy4uYTA1YzJmMDI0ZjQ1Nzk3YzZhN2EwNmY5OTVjZWY1OWI2NTRlOWI2MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtNzAyLDcgKzcwMiw3 IEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudChjb25zdCBXZWJHZXN0dXJl RXZlbnQmIGV2ZW50KQogICAgICAgICBtX2xhc3RXaGVlbFBvc2l0aW9uID0gV2ViUG9pbnQoZXZl bnQueCwgZXZlbnQueSk7CiAgICAgICAgIG1fbGFzdFdoZWVsR2xvYmFsUG9zaXRpb24gPSBXZWJQ b2ludChldmVudC5nbG9iYWxYLCBldmVudC5nbG9iYWxZKTsKICAgICAgICAgbV9mbGluZ01vZGlm aWVyID0gZXZlbnQubW9kaWZpZXJzOwotICAgICAgICBPd25QdHI8V2ViR2VzdHVyZUN1cnZlPiBm bGluZ0N1cnZlID0gYWRvcHRQdHIoUGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlRmxpbmdBbmlt YXRpb25DdXJ2ZShldmVudC5kYXRhLmZsaW5nU3RhcnQuc291cmNlRGV2aWNlLCBXZWJGbG9hdFBv aW50KGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGV2ZW50LmRhdGEuZmxpbmdTdGFy dC52ZWxvY2l0eVkpLCBXZWJTaXplKCkpKTsKKyAgICAgICAgT3duUHRyPFdlYkdlc3R1cmVDdXJ2 ZT4gZmxpbmdDdXJ2ZSA9IGFkb3B0UHRyKFBsYXRmb3JtOjpjdXJyZW50KCktPmNyZWF0ZUZsaW5n QW5pbWF0aW9uQ3VydmUoZXZlbnQuc291cmNlRGV2aWNlLCBXZWJGbG9hdFBvaW50KGV2ZW50LmRh dGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkp LCBXZWJTaXplKCkpKTsKICAgICAgICAgbV9nZXN0dXJlQW5pbWF0aW9uID0gV2ViQWN0aXZlR2Vz dHVyZUFuaW1hdGlvbjo6Y3JlYXRlQXRBbmltYXRpb25TdGFydChmbGluZ0N1cnZlLnJlbGVhc2Uo KSwgdGhpcyk7CiAgICAgICAgIHNjaGVkdWxlQW5pbWF0aW9uKCk7CiAgICAgICAgIGV2ZW50U3dh bGxvd2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNwcAppbmRleCA1 MGY5NTJlMGQyMjA2NDFjMGEzZjFkODE4YjJiZjZjOWJiMTNjNGRhLi41ODIxYzkxODA2OTA2MTk5 ODI4OWMzZThlNjZlODI5MTg3YTQwMTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRl c3QuY3BwCkBAIC0zNDUsMTQgKzM0NSwxNCBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdTdGFydGVkVG91Y2hwYWQpCiAKICAgICBnZXN0dXJl LnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdTdGFydDsKICAgICBnZXN0dXJlLmRh dGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSAxMDsKLSAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFy dC5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOworICAgIGdlc3R1cmUu c291cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsKICAgICBtX2lucHV0SGFu ZGxlci0+aGFuZGxlSW5wdXRFdmVudChnZXN0dXJlKTsKIAogICAgIFZFUklGWV9BTkRfUkVTRVRf TU9DS1MoKTsKIAogICAgIC8vIFZlcmlmeSB0aGF0IGEgR2VzdHVyZUZsaW5nQ2FuY2VsIGR1cmlu ZyBhbiBhbmltYXRpb24gY2FuY2VscyBpdC4KICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJbnB1dEV2 ZW50OjpHZXN0dXJlRmxpbmdDYW5jZWw7Ci0gICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQuc291 cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsKKyAgICBnZXN0dXJlLnNvdXJj ZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hwYWQ7CiAgICAgbV9pbnB1dEhhbmRsZXIt PmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiB9CiAKQEAgLTM2NiwxNCArMzY2LDE0IEBAIFRF U1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ09uTWFp blRocmVhZFRvdWNocGFkKQogICAgICAgICAuV2lsbE9uY2UodGVzdGluZzo6UmV0dXJuKFdlYklu cHV0SGFuZGxlckNsaWVudDo6U2Nyb2xsU3RhdHVzT25NYWluVGhyZWFkKSk7CiAKICAgICBnZXN0 dXJlLnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdTdGFydDsKLSAgICBnZXN0dXJl LmRhdGEuZmxpbmdTdGFydC5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFk OworICAgIGdlc3R1cmUuc291cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsK ICAgICBtX2lucHV0SGFuZGxlci0+aGFuZGxlSW5wdXRFdmVudChnZXN0dXJlKTsKIAogICAgIFZF UklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIC8vIEV2ZW4gaWYgd2UgZGlkbid0IHN0YXJ0 IGEgZmxpbmcgb3Vyc2VsdmVzLCB3ZSBzdGlsbCBuZWVkIHRvIHNlbmQgdGhlIGNhbmNlbCBldmVu dCB0byB0aGUgd2lkZ2V0LgogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1 cmVGbGluZ0NhbmNlbDsKLSAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC5zb3VyY2VEZXZpY2Ug PSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOworICAgIGdlc3R1cmUuc291cmNlRGV2aWNlID0g V2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsKICAgICBtX2lucHV0SGFuZGxlci0+aGFuZGxlSW5w dXRFdmVudChnZXN0dXJlKTsKIH0KIApAQCAtMzg2LDcgKzM4Niw3IEBAIFRFU1RfRihXZWJDb21w b3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ0lnbm9yZWRUb3VjaHBhZCkK ICAgICAgICAgLldpbGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJJbnB1dEhhbmRsZXJDbGllbnQ6 OlNjcm9sbFN0YXR1c0lnbm9yZWQpKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZl bnQ6Okdlc3R1cmVGbGluZ1N0YXJ0OwotICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNvdXJj ZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hwYWQ7CisgICAgZ2VzdHVyZS5zb3VyY2VE ZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOwogICAgIG1faW5wdXRIYW5kbGVyLT5o YW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgbV9leHBlY3RlZERpc3Bvc2l0aW9uID0g RHJvcEV2ZW50OwpAQCAtMzk0LDcgKzM5NCw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRI YW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ0lnbm9yZWRUb3VjaHBhZCkKIAogICAgIC8vIFNp bmNlIHRoZSBwcmV2aW91cyBmbGluZyB3YXMgaWdub3JlZCwgd2Ugc2hvdWxkIGFsc28gYmUgZHJv cHBpbmcgdGhlIG5leHQgZmxpbmdDYW5jZWwuCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRF dmVudDo6R2VzdHVyZUZsaW5nQ2FuY2VsOwotICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNv dXJjZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hwYWQ7CisgICAgZ2VzdHVyZS5zb3Vy Y2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOwogICAgIG1faW5wdXRIYW5kbGVy LT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogfQogCkBAIC00MTMsNyArNDEzLDcgQEAgVEVT VF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nQW5pbWF0 ZXNUb3VjaHBhZCkKICAgICBpbnQgbW9kaWZpZXJzID0gNzsKICAgICBnZXN0dXJlLmRhdGEuZmxp bmdTdGFydC52ZWxvY2l0eVggPSBmbGluZ0RlbHRhLng7CiAgICAgZ2VzdHVyZS5kYXRhLmZsaW5n U3RhcnQudmVsb2NpdHlZID0gZmxpbmdEZWx0YS55OwotICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0 YXJ0LnNvdXJjZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hwYWQ7CisgICAgZ2VzdHVy ZS5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOwogICAgIGdlc3R1cmUu eCA9IGZsaW5nUG9pbnQueDsKICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50Lnk7CiAgICAgZ2Vz dHVyZS5nbG9iYWxYID0gZmxpbmdHbG9iYWxQb2ludC54OwpAQCAtNDk5LDcgKzQ5OSw3IEBAIFRF U1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ1RyYW5z ZmVyUmVzZXRzVG91Y2hwYWQpCiAgICAgaW50IG1vZGlmaWVycyA9IDE7CiAgICAgZ2VzdHVyZS5k YXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYID0gZmxpbmdEZWx0YS54OwogICAgIGdlc3R1cmUuZGF0 YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSA9IGZsaW5nRGVsdGEueTsKLSAgICBnZXN0dXJlLmRhdGEu ZmxpbmdTdGFydC5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOworICAg IGdlc3R1cmUuc291cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsKICAgICBn ZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAgICAgZ2VzdHVyZS55ID0gZmxpbmdQb2ludC55Owog ICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5nR2xvYmFsUG9pbnQueDsKQEAgLTU4Miw3ICs1ODIs NyBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxp bmdUcmFuc2ZlclJlc2V0c1RvdWNocGFkKQogICAgIG1vZGlmaWVycyA9IDI7CiAgICAgZ2VzdHVy ZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYID0gZmxpbmdEZWx0YS54OwogICAgIGdlc3R1cmUu ZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSA9IGZsaW5nRGVsdGEueTsKLSAgICBnZXN0dXJlLmRh dGEuZmxpbmdTdGFydC5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNocGFkOwor ICAgIGdlc3R1cmUuc291cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZDsKICAg ICBnZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAgICAgZ2VzdHVyZS55ID0gZmxpbmdQb2ludC55 OwogICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5nR2xvYmFsUG9pbnQueDsKQEAgLTY0NSw3ICs2 NDUsNyBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJl RmxpbmdTdGFydGVkVG91Y2hzY3JlZW4pCiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJbnB1dEV2 ZW50OjpHZXN0dXJlRmxpbmdTdGFydDsKICAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxv Y2l0eVggPSAxMDsKLSAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC5zb3VyY2VEZXZpY2UgPSBX ZWJHZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOworICAgIGdlc3R1cmUuc291cmNlRGV2aWNlID0g V2ViR2VzdHVyZUV2ZW50OjpUb3VjaHNjcmVlbjsKICAgICBtX2lucHV0SGFuZGxlci0+aGFuZGxl SW5wdXRFdmVudChnZXN0dXJlKTsKIAogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKQEAg LTY1NCw3ICs2NTQsNyBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0 LCBnZXN0dXJlRmxpbmdTdGFydGVkVG91Y2hzY3JlZW4pCiAKICAgICAvLyBWZXJpZnkgdGhhdCBh IEdlc3R1cmVGbGluZ0NhbmNlbCBkdXJpbmcgYW4gYW5pbWF0aW9uIGNhbmNlbHMgaXQuCiAgICAg Z2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZUZsaW5nQ2FuY2VsOwotICAgIGdl c3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91 Y2hzY3JlZW47CisgICAgZ2VzdHVyZS5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRv dWNoc2NyZWVuOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUp OwogfQogCkBAIC02NjgsMTQgKzY2OCwxNCBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdPbk1haW5UaHJlYWRUb3VjaHNjcmVlbikKICAgICAg ICAgLldpbGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJJbnB1dEhhbmRsZXJDbGllbnQ6OlNjcm9s bFN0YXR1c09uTWFpblRocmVhZCkpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVu dDo6R2VzdHVyZUZsaW5nU3RhcnQ7Ci0gICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQuc291cmNl RGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHNjcmVlbjsKKyAgICBnZXN0dXJlLnNvdXJj ZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hzY3JlZW47CiAgICAgbV9pbnB1dEhhbmRs ZXItPmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiAKICAgICBWRVJJRllfQU5EX1JFU0VUX01P Q0tTKCk7CiAKICAgICAvLyBFdmVuIGlmIHdlIGRpZG4ndCBzdGFydCBhIGZsaW5nIG91cnNlbHZl cywgd2Ugc3RpbGwgbmVlZCB0byBzZW5kIHRoZSBjYW5jZWwgZXZlbnQgdG8gdGhlIHdpZGdldC4K ICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdDYW5jZWw7Ci0g ICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQuc291cmNlRGV2aWNlID0gV2ViR2VzdHVyZUV2ZW50 OjpUb3VjaHNjcmVlbjsKKyAgICBnZXN0dXJlLnNvdXJjZURldmljZSA9IFdlYkdlc3R1cmVFdmVu dDo6VG91Y2hzY3JlZW47CiAgICAgbV9pbnB1dEhhbmRsZXItPmhhbmRsZUlucHV0RXZlbnQoZ2Vz dHVyZSk7CiB9CiAKQEAgLTY4OCwxNCArNjg4LDE0IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5w dXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ0lnbm9yZWRUb3VjaHNjcmVlbikKICAgICAg ICAgLldpbGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJJbnB1dEhhbmRsZXJDbGllbnQ6OlNjcm9s bFN0YXR1c0lnbm9yZWQpKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdl c3R1cmVGbGluZ1N0YXJ0OwotICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmlj ZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91Y2hzY3JlZW47CisgICAgZ2VzdHVyZS5zb3VyY2VEZXZp Y2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOwogICAgIG1faW5wdXRIYW5kbGVyLT5o YW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZX0FORF9SRVNFVF9NT0NLUygp OwogCiAgICAgLy8gRXZlbiBpZiB3ZSBkaWRuJ3Qgc3RhcnQgYSBmbGluZyBvdXJzZWx2ZXMsIHdl IHN0aWxsIG5lZWQgdG8gc2VuZCB0aGUgY2FuY2VsIGV2ZW50IHRvIHRoZSB3aWRnZXQuCiAgICAg Z2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZUZsaW5nQ2FuY2VsOwotICAgIGdl c3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmljZSA9IFdlYkdlc3R1cmVFdmVudDo6VG91 Y2hzY3JlZW47CisgICAgZ2VzdHVyZS5zb3VyY2VEZXZpY2UgPSBXZWJHZXN0dXJlRXZlbnQ6OlRv dWNoc2NyZWVuOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUp OwogfQogCkBAIC03MTQsNyArNzE0LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nQW5pbWF0ZXNUb3VjaHNjcmVlbikKICAgICBpbnQgbW9k aWZpZXJzID0gNzsKICAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBmbGlu Z0RlbHRhLng7CiAgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZID0gZmxpbmdE ZWx0YS55OwotICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnNvdXJjZURldmljZSA9IFdlYkdl c3R1cmVFdmVudDo6VG91Y2hzY3JlZW47CisgICAgZ2VzdHVyZS5zb3VyY2VEZXZpY2UgPSBXZWJH ZXN0dXJlRXZlbnQ6OlRvdWNoc2NyZWVuOwogICAgIGdlc3R1cmUueCA9IGZsaW5nUG9pbnQueDsK ICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50Lnk7CiAgICAgZ2VzdHVyZS5nbG9iYWxYID0gZmxp bmdHbG9iYWxQb2ludC54Owo=