101510 2012-11-07 14:11:56 -0800 [BlackBerry] Verify touched element using the rootEditableElement 2012-11-08 08:24:39 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nima.ghanavatian nima.ghanavatian allan.jensen mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 761041 0 nima.ghanavatian 2012-11-07 14:11:56 -0800 When tapping on a misspelled word, look at the rootEditableElement to verify if it is the element under focus. 761045 1 172870 nima.ghanavatian 2012-11-07 14:18:10 -0800 Created attachment 172870 Patch 761047 2 webkit.review.bot 2012-11-07 14:19:47 -0800 Attachment 172870 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/blackberry/ChangeLog', u'Sou..." exit_code: 1 Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp:242: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 761053 3 172870 rwlbuis 2012-11-07 14:25:36 -0800 Comment on attachment 172870 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172870&action=review Some stuff to fix, have a look at the style problem too and that the patch applies generally (guess we need to watch the bots). > Source/WebKit/blackberry/WebKitSupport/FatFingers.h:170 > + WebCore::Node* parentNode; You only need this in the while loop. > Source/WebKit/blackberry/WebKitSupport/FatFingers.h:174 > + break; Can you use parentElement here as well? > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:713 > + Element* parentElement; You only need this in the while loop. 761127 4 172886 nima.ghanavatian 2012-11-07 15:57:48 -0800 Created attachment 172886 Patch 761128 5 webkit.review.bot 2012-11-07 16:00:53 -0800 Attachment 172886 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/blackberry/ChangeLog', u'Sou..." exit_code: 1 Source/WebKit/blackberry/WebKitSupport/TouchEventHandler.cpp:242: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 761138 6 172886 rwlbuis 2012-11-07 16:10:35 -0800 Comment on attachment 172886 Patch LGTM. 761821 7 172886 webkit.review.bot 2012-11-08 08:24:35 -0800 Comment on attachment 172886 Patch Clearing flags on attachment: 172886 Committed r133902: <http://trac.webkit.org/changeset/133902> 761822 8 webkit.review.bot 2012-11-08 08:24:39 -0800 All reviewed patches have been landed. Closing bug. 172870 2012-11-07 14:18:10 -0800 2012-11-07 15:57:45 -0800 Patch bug-101510-20121107171113.patch text/plain 5995 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxYzYxYWMxNzAzMTQxYmYyZjJhNTZmODJkMWRjZGUzMTZjNTY2NjFmLi5mMzNjMDU5OGJj MmJmOWQ4Y2FhN2MxOGY5ZTQ4OTk2MDUzMGEwZGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMS0wNiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBWZXJpZnkgdG91Y2hl ZCBlbGVtZW50IHVzaW5nIHRoZSByb290RWRpdGFibGVFbGVtZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE1MTAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBpbnRlcm5hbGx5IGJ5IE1p a2UgRmVudG9uLgorCisgICAgICAgIE1vdmUgdXAgdGhlIHRyZWUgdW50aWwgd2UgZmluZCB0aGUg cm9vdEVkaXRhYmxlRWxlbWVudCBhbmQgdXNlCisgICAgICAgIHRoYXQgdG8gY29tcGFyZSB3aXRo IHRoZSB0b3VjaGVkIGVsZW1lbnQuCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdl cnMuaDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyc1Jlc3VsdDo6bm9k ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnNSZXN1bHQ6Om5vZGVB c0VsZW1lbnRJZkFwcGxpY2FibGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5k bGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzaG91 bGRSZXF1ZXN0U3BlbGxDaGVja2luZ09wdGlvbnNGb3JQb2ludCk6CisgICAgICAgICogV2ViS2l0 U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OlRvdWNoRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KToKKwogMjAxMi0xMS0wNiAg R2VuZXZpZXZlIE1hayAgPGdtYWtAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQ3Jh c2ggaW4gSW5SZWdpb25TY3JvbGxlclByaXZhdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmggYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmgKaW5kZXggM2UzYzZmYzNhMjQ2ZmY0 YjA1OWE4OTA5NGRiOGJiNTgxMWIxYzc0ZS4uNzRiYTUwZjEwZGQ5MmQ0ZjQzMmY5NjAxOTFjMTli MTU5Mjc2ZTU3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvRmF0RmluZ2Vycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0ZhdEZpbmdlcnMuaApAQCAtMTQ5LDcgKzE0OSw3IEBAIHB1YmxpYzoKIAogICAgIGVu dW0gQ29udGVudFR5cGUgeyBTaGFkb3dDb250ZW50QWxsb3dlZCwgU2hhZG93Q29udGVudE5vdEFs bG93ZWQgfTsKIAotICAgIFdlYkNvcmU6Ok5vZGUqIG5vZGUoQ29udGVudFR5cGUgdHlwZSA9IFNo YWRvd0NvbnRlbnRBbGxvd2VkKSBjb25zdAorICAgIFdlYkNvcmU6Ok5vZGUqIG5vZGUoQ29udGVu dFR5cGUgdHlwZSA9IFNoYWRvd0NvbnRlbnRBbGxvd2VkLCBib29sIHNob3VsZFVzZVJvb3RFZGl0 YWJsZUVsZW1lbnQgPSBmYWxzZSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmICghbV9ub2RlVW5k ZXJGYXRGaW5nZXIgfHwgIW1fbm9kZVVuZGVyRmF0RmluZ2VyLT5pbkRvY3VtZW50KCkpCiAgICAg ICAgICAgICByZXR1cm4gMDsKQEAgLTE2MywxMiArMTYzLDI0IEBAIHB1YmxpYzoKICAgICAgICAg d2hpbGUgKHJlc3VsdC0+aXNJblNoYWRvd1RyZWUoKSkKICAgICAgICAgICAgIHJlc3VsdCA9IHRv RWxlbWVudChyZXN1bHQtPnNoYWRvd0FuY2VzdG9yTm9kZSgpKTsKIAorICAgICAgICBpZiAoIXNo b3VsZFVzZVJvb3RFZGl0YWJsZUVsZW1lbnQpCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0Owor CisgICAgICAgIC8vIFJldHJpZXZlIHRoZSB0b3AgbGV2ZWwgZWRpdGFibGUgbm9kZQorICAgICAg ICBXZWJDb3JlOjpOb2RlKiBwYXJlbnROb2RlOworICAgICAgICB3aGlsZSAoIXJlc3VsdC0+aXNS b290RWRpdGFibGVFbGVtZW50KCkpIHsKKyAgICAgICAgICAgIHBhcmVudE5vZGUgPSByZXN1bHQt PnBhcmVudE5vZGUoKTsKKyAgICAgICAgICAgIGlmICghcGFyZW50Tm9kZSB8fCAhcGFyZW50Tm9k ZS0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAg cmVzdWx0ID0gcGFyZW50Tm9kZTsKKyAgICAgICAgfQorCiAgICAgICAgIHJldHVybiByZXN1bHQ7 CiAgICAgfQogCi0gICAgV2ViQ29yZTo6RWxlbWVudCogbm9kZUFzRWxlbWVudElmQXBwbGljYWJs ZShDb250ZW50VHlwZSB0eXBlID0gU2hhZG93Q29udGVudEFsbG93ZWQpIGNvbnN0CisgICAgV2Vi Q29yZTo6RWxlbWVudCogbm9kZUFzRWxlbWVudElmQXBwbGljYWJsZShDb250ZW50VHlwZSB0eXBl ID0gU2hhZG93Q29udGVudEFsbG93ZWQsIGJvb2wgc2hvdWxkVXNlUm9vdEVkaXRhYmxlRWxlbWVu dCA9IGZhbHNlKSBjb25zdAogICAgIHsKLSAgICAgICAgV2ViQ29yZTo6Tm9kZSogcmVzdWx0ID0g bm9kZSh0eXBlKTsKKyAgICAgICAgV2ViQ29yZTo6Tm9kZSogcmVzdWx0ID0gbm9kZSh0eXBlLCBz aG91bGRVc2VSb290RWRpdGFibGVFbGVtZW50KTsKICAgICAgICAgaWYgKCFyZXN1bHQgfHwgIXJl c3VsdC0+aXNFbGVtZW50Tm9kZSgpKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5j cHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIu Y3BwCmluZGV4IGMzOGEwNDUxZjkwNTQyY2QzMTk1ZTVlYzA4YTlhNmU1YzkwNzkzODIuLjZhMGRk NDg1MzIwMDVkMTcxMWY3NGIwMjBmMDg1NjNkOTdlNWQyZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcApAQCAt NzAzLDEzICs3MDMsMjggQEAgU3BlbGxDaGVja2VyKiBJbnB1dEhhbmRsZXI6OmdldFNwZWxsQ2hl Y2tlcigpCiAKIGJvb2wgSW5wdXRIYW5kbGVyOjpzaG91bGRSZXF1ZXN0U3BlbGxDaGVja2luZ09w dGlvbnNGb3JQb2ludChQbGF0Zm9ybTo6SW50UG9pbnQmIHBvaW50LCBjb25zdCBFbGVtZW50KiB0 b3VjaGVkRWxlbWVudCwgaW1mX3NwX3RleHRfdCYgc3BlbGxDaGVja2luZ09wdGlvblJlcXVlc3Qp CiB7Ci0gICAgaWYgKCFpc0FjdGl2ZVRleHRFZGl0KCkgfHwgdG91Y2hlZEVsZW1lbnQgIT0gbV9j dXJyZW50Rm9jdXNFbGVtZW50KQorICAgIGlmICghaXNBY3RpdmVUZXh0RWRpdCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKKyAgICBFbGVtZW50KiBjdXJyZW50Rm9jdXNFbGVtZW50ID0gbV9j dXJyZW50Rm9jdXNFbGVtZW50LmdldCgpOworICAgIGlmICghY3VycmVudEZvY3VzRWxlbWVudCB8 fCAhY3VycmVudEZvY3VzRWxlbWVudC0+aXNFbGVtZW50Tm9kZSgpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBFbGVtZW50KiBwYXJlbnRFbGVtZW50OworICAgIHdoaWxlICghY3VycmVu dEZvY3VzRWxlbWVudC0+aXNSb290RWRpdGFibGVFbGVtZW50KCkpIHsKKyAgICAgICAgcGFyZW50 RWxlbWVudCA9IGN1cnJlbnRGb2N1c0VsZW1lbnQtPnBhcmVudEVsZW1lbnQoKTsKKyAgICAgICAg aWYgKCFwYXJlbnRFbGVtZW50KQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGN1cnJlbnRG b2N1c0VsZW1lbnQgPSBwYXJlbnRFbGVtZW50OworICAgIH0KKworICAgIGlmICh0b3VjaGVkRWxl bWVudCAhPSBjdXJyZW50Rm9jdXNFbGVtZW50KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBMYXlvdXRQb2ludCBjb250ZW50UG9zKG1fd2ViUGFnZS0+bWFwRnJvbVZpZXdwb3J0VG9Db250 ZW50cyhwb2ludCkpOwogICAgIGNvbnRlbnRQb3MgPSBET01TdXBwb3J0Ojpjb252ZXJ0UG9pbnRU b0ZyYW1lKG1fd2ViUGFnZS0+bWFpbkZyYW1lKCksIG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZy YW1lKCksIHJvdW5kZWRJbnRQb2ludChjb250ZW50UG9zKSk7CiAKLSAgICBEb2N1bWVudCogZG9j dW1lbnQgPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCk7CisgICAgRG9jdW1lbnQq IGRvY3VtZW50ID0gY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKTsKICAgICBBU1NFUlQo ZG9jdW1lbnQpOwogCiAgICAgUmVuZGVyZWREb2N1bWVudE1hcmtlciogbWFya2VyID0gZG9jdW1l bnQtPm1hcmtlcnMoKS0+cmVuZGVyZWRNYXJrZXJDb250YWluaW5nUG9pbnQoY29udGVudFBvcywg RG9jdW1lbnRNYXJrZXI6OlNwZWxsaW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcAppbmRleCBi N2EzNzJjZTQyNTk5NmVhMDY4Yjk2Zjk0ZmUwMzVjZWE0ZTBjZjgzLi43MzlhNjI2ZDI3MGM2NDk0 MzYzMmU3YzZkYjM0MDdlMGMwYWEyMGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91Y2hFdmVudEhhbmRsZXIuY3BwCkBAIC0y NDEsNyArMjQxLDcgQEAgYm9vbCBUb3VjaEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hQb2ludChQ bGF0Zm9ybTo6VG91Y2hQb2ludCYgcG9pbnQsIGJvb2wgdXNlRmEKIAogICAgICAgICAgICAgaWYg KG1fbGFzdEZhdEZpbmdlcnNSZXN1bHQuaXNUZXh0SW5wdXQoKSkKICAgICAgICAgICAgICAgICBz aG91bGRSZXF1ZXN0U3BlbGxDaGVja09wdGlvbnMgPSBtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVy LT5zaG91bGRSZXF1ZXN0U3BlbGxDaGVja2luZ09wdGlvbnNGb3JQb2ludChwb2ludC5tX3Bvcwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICwgbV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC5ub2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKEZh dEZpbmdlcnNSZXN1bHQ6OlNoYWRvd0NvbnRlbnROb3RBbGxvd2VkKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICwgbV9sYXN0RmF0 RmluZ2Vyc1Jlc3VsdC5ub2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKEZhdEZpbmdlcnNSZXN1bHQ6 OlNoYWRvd0NvbnRlbnROb3RBbGxvd2VkLCB0cnVlIC8qIHNob3VsZFVzZVJvb3RFZGl0YWJsZUVs ZW1lbnQgKi8pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgLCBzcGVsbENoZWNrT3B0aW9uUmVxdWVzdCk7CiAKICAgICAgICAgICAg IC8vIEFwcGx5IGFueSBzdXBwcmVzc2VkIGNoYW5nZXMuIFRoaXMgZG9lcyBub3QgZWxpbWluYXRl IHRoZSBuZWVkCg== 172886 2012-11-07 15:57:48 -0800 2012-11-08 08:24:35 -0800 Patch bug-101510-20121107185050.patch text/plain 5965 nima.ghanavatian U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpp bmRleCAxYzYxYWMxNzAzMTQxYmYyZjJhNTZmODJkMWRjZGUzMTZjNTY2NjFmLi5mMzNjMDU5OGJj MmJmOWQ4Y2FhN2MxOGY5ZTQ4OTk2MDUzMGEwZGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0xMS0wNiAgTmltYSBHaGFuYXZhdGlhbiAgPG5n aGFuYXZhdGlhbkByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBWZXJpZnkgdG91Y2hl ZCBlbGVtZW50IHVzaW5nIHRoZSByb290RWRpdGFibGVFbGVtZW50CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE1MTAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBpbnRlcm5hbGx5IGJ5IE1p a2UgRmVudG9uLgorCisgICAgICAgIE1vdmUgdXAgdGhlIHRyZWUgdW50aWwgd2UgZmluZCB0aGUg cm9vdEVkaXRhYmxlRWxlbWVudCBhbmQgdXNlCisgICAgICAgIHRoYXQgdG8gY29tcGFyZSB3aXRo IHRoZSB0b3VjaGVkIGVsZW1lbnQuCisKKyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZhdEZpbmdl cnMuaDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RmF0RmluZ2Vyc1Jlc3VsdDo6bm9k ZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkZhdEZpbmdlcnNSZXN1bHQ6Om5vZGVB c0VsZW1lbnRJZkFwcGxpY2FibGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5k bGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzaG91 bGRSZXF1ZXN0U3BlbGxDaGVja2luZ09wdGlvbnNGb3JQb2ludCk6CisgICAgICAgICogV2ViS2l0 U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OlRvdWNoRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KToKKwogMjAxMi0xMS0wNiAg R2VuZXZpZXZlIE1hayAgPGdtYWtAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gQ3Jh c2ggaW4gSW5SZWdpb25TY3JvbGxlclByaXZhdGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmggYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9GYXRGaW5nZXJzLmgKaW5kZXggM2UzYzZmYzNhMjQ2ZmY0 YjA1OWE4OTA5NGRiOGJiNTgxMWIxYzc0ZS4uNWVkZDAzZWQzMjhhOWFkNmJkMWFlYTgzM2JkZjg1 MzgyNGNhMWI2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvRmF0RmluZ2Vycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0ZhdEZpbmdlcnMuaApAQCAtMTQ5LDcgKzE0OSw3IEBAIHB1YmxpYzoKIAogICAgIGVu dW0gQ29udGVudFR5cGUgeyBTaGFkb3dDb250ZW50QWxsb3dlZCwgU2hhZG93Q29udGVudE5vdEFs bG93ZWQgfTsKIAotICAgIFdlYkNvcmU6Ok5vZGUqIG5vZGUoQ29udGVudFR5cGUgdHlwZSA9IFNo YWRvd0NvbnRlbnRBbGxvd2VkKSBjb25zdAorICAgIFdlYkNvcmU6Ok5vZGUqIG5vZGUoQ29udGVu dFR5cGUgdHlwZSA9IFNoYWRvd0NvbnRlbnRBbGxvd2VkLCBib29sIHNob3VsZFVzZVJvb3RFZGl0 YWJsZUVsZW1lbnQgPSBmYWxzZSkgY29uc3QKICAgICB7CiAgICAgICAgIGlmICghbV9ub2RlVW5k ZXJGYXRGaW5nZXIgfHwgIW1fbm9kZVVuZGVyRmF0RmluZ2VyLT5pbkRvY3VtZW50KCkpCiAgICAg ICAgICAgICByZXR1cm4gMDsKQEAgLTE2MywxMiArMTYzLDIzIEBAIHB1YmxpYzoKICAgICAgICAg d2hpbGUgKHJlc3VsdC0+aXNJblNoYWRvd1RyZWUoKSkKICAgICAgICAgICAgIHJlc3VsdCA9IHRv RWxlbWVudChyZXN1bHQtPnNoYWRvd0FuY2VzdG9yTm9kZSgpKTsKIAorICAgICAgICBpZiAoIXNo b3VsZFVzZVJvb3RFZGl0YWJsZUVsZW1lbnQgfHwgIXJlc3VsdC0+aXNFbGVtZW50Tm9kZSgpKQor ICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKworICAgICAgICAvLyBSZXRyaWV2ZSB0aGUgdG9w IGxldmVsIGVkaXRhYmxlIG5vZGUKKyAgICAgICAgd2hpbGUgKCFyZXN1bHQtPmlzUm9vdEVkaXRh YmxlRWxlbWVudCgpKSB7CisgICAgICAgICAgICBXZWJDb3JlOjpFbGVtZW50KiBwYXJlbnRFbGVt ZW50ID0gcmVzdWx0LT5wYXJlbnRFbGVtZW50KCk7CisgICAgICAgICAgICBpZiAoIXBhcmVudEVs ZW1lbnQpCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICByZXN1bHQgPSBwYXJl bnRFbGVtZW50OworICAgICAgICB9CisKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAK LSAgICBXZWJDb3JlOjpFbGVtZW50KiBub2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKENvbnRlbnRU eXBlIHR5cGUgPSBTaGFkb3dDb250ZW50QWxsb3dlZCkgY29uc3QKKyAgICBXZWJDb3JlOjpFbGVt ZW50KiBub2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKENvbnRlbnRUeXBlIHR5cGUgPSBTaGFkb3dD b250ZW50QWxsb3dlZCwgYm9vbCBzaG91bGRVc2VSb290RWRpdGFibGVFbGVtZW50ID0gZmFsc2Up IGNvbnN0CiAgICAgewotICAgICAgICBXZWJDb3JlOjpOb2RlKiByZXN1bHQgPSBub2RlKHR5cGUp OworICAgICAgICBXZWJDb3JlOjpOb2RlKiByZXN1bHQgPSBub2RlKHR5cGUsIHNob3VsZFVzZVJv b3RFZGl0YWJsZUVsZW1lbnQpOwogICAgICAgICBpZiAoIXJlc3VsdCB8fCAhcmVzdWx0LT5pc0Vs ZW1lbnROb2RlKCkpCiAgICAgICAgICAgICByZXR1cm4gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKaW5kZXgg YzM4YTA0NTFmOTA1NDJjZDMxOTVlNWVjMDhhOWE2ZTVjOTA3OTM4Mi4uZjM0NjAxMmZiZTMyYjQx MzQxYjE3MTdkNWZkODU0Njc5ODY2OGQ1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCkBAIC03MDMsMTMgKzcw MywyNyBAQCBTcGVsbENoZWNrZXIqIElucHV0SGFuZGxlcjo6Z2V0U3BlbGxDaGVja2VyKCkKIAog Ym9vbCBJbnB1dEhhbmRsZXI6OnNob3VsZFJlcXVlc3RTcGVsbENoZWNraW5nT3B0aW9uc0ZvclBv aW50KFBsYXRmb3JtOjpJbnRQb2ludCYgcG9pbnQsIGNvbnN0IEVsZW1lbnQqIHRvdWNoZWRFbGVt ZW50LCBpbWZfc3BfdGV4dF90JiBzcGVsbENoZWNraW5nT3B0aW9uUmVxdWVzdCkKIHsKLSAgICBp ZiAoIWlzQWN0aXZlVGV4dEVkaXQoKSB8fCB0b3VjaGVkRWxlbWVudCAhPSBtX2N1cnJlbnRGb2N1 c0VsZW1lbnQpCisgICAgaWYgKCFpc0FjdGl2ZVRleHRFZGl0KCkpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIEVsZW1lbnQqIGN1cnJlbnRGb2N1c0VsZW1lbnQgPSBtX2N1cnJlbnRGb2N1 c0VsZW1lbnQuZ2V0KCk7CisgICAgaWYgKCFjdXJyZW50Rm9jdXNFbGVtZW50IHx8ICFjdXJyZW50 Rm9jdXNFbGVtZW50LT5pc0VsZW1lbnROb2RlKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwor ICAgIHdoaWxlICghY3VycmVudEZvY3VzRWxlbWVudC0+aXNSb290RWRpdGFibGVFbGVtZW50KCkp IHsKKyAgICAgICAgRWxlbWVudCogcGFyZW50RWxlbWVudCA9IGN1cnJlbnRGb2N1c0VsZW1lbnQt PnBhcmVudEVsZW1lbnQoKTsKKyAgICAgICAgaWYgKCFwYXJlbnRFbGVtZW50KQorICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGN1cnJlbnRGb2N1c0VsZW1lbnQgPSBwYXJlbnRFbGVtZW50Owor ICAgIH0KKworICAgIGlmICh0b3VjaGVkRWxlbWVudCAhPSBjdXJyZW50Rm9jdXNFbGVtZW50KQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBMYXlvdXRQb2ludCBjb250ZW50UG9zKG1fd2Vi UGFnZS0+bWFwRnJvbVZpZXdwb3J0VG9Db250ZW50cyhwb2ludCkpOwogICAgIGNvbnRlbnRQb3Mg PSBET01TdXBwb3J0Ojpjb252ZXJ0UG9pbnRUb0ZyYW1lKG1fd2ViUGFnZS0+bWFpbkZyYW1lKCks IG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCksIHJvdW5kZWRJbnRQb2ludChjb250ZW50 UG9zKSk7CiAKLSAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2N1cnJlbnRGb2N1c0VsZW1lbnQt PmRvY3VtZW50KCk7CisgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gY3VycmVudEZvY3VzRWxlbWVu dC0+ZG9jdW1lbnQoKTsKICAgICBBU1NFUlQoZG9jdW1lbnQpOwogCiAgICAgUmVuZGVyZWREb2N1 bWVudE1hcmtlciogbWFya2VyID0gZG9jdW1lbnQtPm1hcmtlcnMoKS0+cmVuZGVyZWRNYXJrZXJD b250YWluaW5nUG9pbnQoY29udGVudFBvcywgRG9jdW1lbnRNYXJrZXI6OlNwZWxsaW5nKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZl bnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1Rv dWNoRXZlbnRIYW5kbGVyLmNwcAppbmRleCBiN2EzNzJjZTQyNTk5NmVhMDY4Yjk2Zjk0ZmUwMzVj ZWE0ZTBjZjgzLi43MzlhNjI2ZDI3MGM2NDk0MzYzMmU3YzZkYjM0MDdlMGMwYWEyMGJhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50 SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv VG91Y2hFdmVudEhhbmRsZXIuY3BwCkBAIC0yNDEsNyArMjQxLDcgQEAgYm9vbCBUb3VjaEV2ZW50 SGFuZGxlcjo6aGFuZGxlVG91Y2hQb2ludChQbGF0Zm9ybTo6VG91Y2hQb2ludCYgcG9pbnQsIGJv b2wgdXNlRmEKIAogICAgICAgICAgICAgaWYgKG1fbGFzdEZhdEZpbmdlcnNSZXN1bHQuaXNUZXh0 SW5wdXQoKSkKICAgICAgICAgICAgICAgICBzaG91bGRSZXF1ZXN0U3BlbGxDaGVja09wdGlvbnMg PSBtX3dlYlBhZ2UtPm1faW5wdXRIYW5kbGVyLT5zaG91bGRSZXF1ZXN0U3BlbGxDaGVja2luZ09w dGlvbnNGb3JQb2ludChwb2ludC5tX3BvcwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICwgbV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC5u b2RlQXNFbGVtZW50SWZBcHBsaWNhYmxlKEZhdEZpbmdlcnNSZXN1bHQ6OlNoYWRvd0NvbnRlbnRO b3RBbGxvd2VkKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICwgbV9sYXN0RmF0RmluZ2Vyc1Jlc3VsdC5ub2RlQXNFbGVtZW50SWZB cHBsaWNhYmxlKEZhdEZpbmdlcnNSZXN1bHQ6OlNoYWRvd0NvbnRlbnROb3RBbGxvd2VkLCB0cnVl IC8qIHNob3VsZFVzZVJvb3RFZGl0YWJsZUVsZW1lbnQgKi8pCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLCBzcGVsbENoZWNrT3B0 aW9uUmVxdWVzdCk7CiAKICAgICAgICAgICAgIC8vIEFwcGx5IGFueSBzdXBwcmVzc2VkIGNoYW5n ZXMuIFRoaXMgZG9lcyBub3QgZWxpbWluYXRlIHRoZSBuZWVkCg==