94839 2012-08-23 13:34:38 -0700 [BlackBerry] Obsolete the in-region scroll codepath prior to BB10's 2012-08-23 17:42:25 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94834 1 tonikitoo tonikitoo mifenton tonikitoo webkit.review.bot oldest_to_newest 703310 0 tonikitoo 2012-08-23 13:34:38 -0700 PR #197775 703317 1 160232 tonikitoo 2012-08-23 13:43:26 -0700 Created attachment 160232 patch 703353 2 160232 rwlbuis 2012-08-23 14:17:09 -0700 Comment on attachment 160232 patch View in context: https://bugs.webkit.org/attachment.cgi?id=160232&action=review LGTM. > Source/WebKit/blackberry/Api/WebPage.cpp:1474 > return true; The bool does not seem needed anymore. And in fact maybe WebPagePrivate::scrollBy can be removed, WebPage::scrollBy could just do the one-liner. 703596 3 tonikitoo 2012-08-23 17:42:25 -0700 https://trac.webkit.org/changeset/126514 160232 2012-08-23 13:43:26 -0700 2012-08-23 14:17:09 -0700 patch 0001-BlackBerry-Obsolete-the-in-region-scroll-codepath-pr.patch text/plain 13256 tonikitoo RnJvbSA4YTU5ZThkNjZmYmNhNWMyNDBjMTUxNGNmN2RmNDA4ZmI3OGUyYzQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog VGh1LCAyMyBBdWcgMjAxMiAxNjo0MjozMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBPYnNvbGV0ZSB0aGUgaW4tcmVnaW9uIHNjcm9sbCBjb2RlcGF0aCBwcmlvciB0bwogQkIx MCdzIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDgzOSBQUgogIzE5 Nzc3NQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuClBhdGNoIGJ5IEFudG9uaW8gR29tZXMg PGFnb21lc0ByaW0uY29tPgoKVGhpcyBjb2RlcGF0aCBpcyBub3QgbmVlZGVkIGFueW1vcmUsIHNv IGxldHMgbGV0IGl0IFJJUC4KClRoZSBvbmx5IGNvZGUgYWRkaXRpb24gaXMgZHVlIHRvIHNvbWUg Y29kZSBJJ3ZlIG1vdmVkIGZyb20gV2ViUGFnZVByaXZhdGU6OnNjcm9sbE5vZGVSZWN1cnNpdmVs eQphbmQgV2ViUGFnZVByaXZhdGU6OnNjcm9sbEJ5IHRvIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRl OjpzZXRMYXllclNjcm9sbFBvc2l0aW9uLgpSZXN0IGlzIGNvZGUgcmVtb3ZhbCAuLi4KCiogQXBp L0luUmVnaW9uU2Nyb2xsZXIuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9s bGVyUHJpdmF0ZTo6c2V0TGF5ZXJTY3JvbGxQb3NpdGlvbik6CiogQXBpL0luUmVnaW9uU2Nyb2xs ZXJfcC5oOgooSW5SZWdpb25TY3JvbGxlclByaXZhdGUpOgoqIEFwaS9XZWJQYWdlLmNwcDoKKEJs YWNrQmVycnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGU6OnNjcm9sbEJ5KToKKEJsYWNrQmVycnk6 OldlYktpdDo6V2ViUGFnZTo6c2Nyb2xsQnkpOgoqIEFwaS9XZWJQYWdlLmg6CiogQXBpL1dlYlBh Z2VfcC5oOgooV2ViUGFnZVByaXZhdGUpOgotLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvSW5SZWdpb25TY3JvbGxlci5jcHAgfCAgMTI5ICsrKystLS0tLS0tLS0tLS0tLS0tLQogU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyX3AuaCB8ICAgIDUgLQog U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcCAgICAgICAgICB8ICAgMjcg Ky0tLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oICAgICAgICAgICAg fCAgICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oICAgICAg ICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAgICAg ICAgICAgICB8ICAgMjUgKysrKwogNiBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCAx MzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9JblJlZ2lvblNjcm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5S ZWdpb25TY3JvbGxlci5jcHAKaW5kZXggZjIzODIxMi4uYWFmNDAxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCkBAIC0zMyw2ICsz Myw3IEBACiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXJCYWNraW5nLmgiCiAjaW5jbHVkZSAiUmVuZGVy T2JqZWN0LmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgorI2luY2x1ZGUgIlNlbGVjdGlvbkhh bmRsZXIuaCIKICNpbmNsdWRlICJXZWJQYWdlX3AuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7CkBAIC0xNDYsMTYgKzE0Nyw2IEBAIGJvb2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNl dFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkCiAgICAgcmV0 dXJuIHNldExheWVyU2Nyb2xsUG9zaXRpb24obGF5ZXIsIHNjcm9sbFBvc2l0aW9uKTsKIH0KIAot Ym9vbCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2Nyb2xsQnkoY29uc3QgUGxhdGZvcm06Oklu dFNpemUmIGRlbHRhKQotewotICAgIEFTU0VSVChQbGF0Zm9ybTo6d2Via2l0VGhyZWFkTWVzc2Fn ZUNsaWVudCgpLT5pc0N1cnJlbnRUaHJlYWQoKSk7Ci0KLSAgICBpZiAoIWNhblNjcm9sbCgpKQot ICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICByZXR1cm4gc2Nyb2xsTm9kZVJlY3Vyc2l2ZWx5 KG5vZGUoKSwgZGVsdGEpOwotfQotCiB2b2lkIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjYWxj dWxhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBwb2ludCkKIHsKICAgICBBU1NFUlQobV9hY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVh cy5lbXB0eSgpKTsKQEAgLTI1Miw4ICsyNDMsMjMgQEAgYm9vbCBJblJlZ2lvblNjcm9sbGVyUHJp dmF0ZTo6c2V0TGF5ZXJTY3JvbGxQb3NpdGlvbihSZW5kZXJMYXllciogbGF5ZXIsIGNvbnN0IEkK IAogICAgICAgICBGcmFtZSogZnJhbWUgPSB2aWV3LT5mcmFtZSgpOwogICAgICAgICBBU1NFUlRf VU5VU0VEKGZyYW1lLCBmcmFtZSk7CisgICAgICAgIEFTU0VSVChjYW5TY3JvbGxJbm5lckZyYW1l KGZyYW1lKSk7CisKKyAgICAgICAgdmlldy0+c2V0Q2FuQmxpdE9uU2Nyb2xsKGZhbHNlKTsKKwor ICAgICAgICBCYWNraW5nU3RvcmVDbGllbnQqIGJhY2tpbmdTdG9yZUNsaWVudCA9IG1fd2ViUGFn ZS0+YmFja2luZ1N0b3JlQ2xpZW50Rm9yRnJhbWUodmlldy0+ZnJhbWUoKSk7CisgICAgICAgIGlm IChiYWNraW5nU3RvcmVDbGllbnQpIHsKKyAgICAgICAgICAgIGJhY2tpbmdTdG9yZUNsaWVudC0+ c2V0SXNDbGllbnRHZW5lcmF0ZWRTY3JvbGwodHJ1ZSk7CisgICAgICAgICAgICBiYWNraW5nU3Rv cmVDbGllbnQtPnNldElzU2Nyb2xsTm90aWZpY2F0aW9uU3VwcHJlc3NlZCh0cnVlKTsKKyAgICAg ICAgfQogCiAgICAgICAgIHZpZXctPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbFBvc2l0aW9uKTsK KworICAgICAgICBpZiAoYmFja2luZ1N0b3JlQ2xpZW50KSB7CisgICAgICAgICAgICBiYWNraW5n U3RvcmVDbGllbnQtPnNldElzQ2xpZW50R2VuZXJhdGVkU2Nyb2xsKGZhbHNlKTsKKyAgICAgICAg ICAgIGJhY2tpbmdTdG9yZUNsaWVudC0+c2V0SXNTY3JvbGxOb3RpZmljYXRpb25TdXBwcmVzc2Vk KGZhbHNlKTsKKyAgICAgICAgfQorCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIApAQCAt MjYxLDEwNCArMjY3LDEzIEBAIGJvb2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldExheWVy U2Nyb2xsUG9zaXRpb24oUmVuZGVyTGF5ZXIqIGxheWVyLCBjb25zdCBJCiAgICAgbGF5ZXItPnNj cm9sbFRvT2Zmc2V0KHNjcm9sbFBvc2l0aW9uLngoKSwgc2Nyb2xsUG9zaXRpb24ueSgpKTsKICAg ICAvLyBGSVhNRV9hZ29tZXM6IFBsZWFzZSByZWNoZWNrIGlmIGl0IGlzIG5lZWRlZCBzdGlsbCEK ICAgICBsYXllci0+cmVuZGVyZXIoKS0+cmVwYWludCh0cnVlKTsKLSAgICByZXR1cm4gdHJ1ZTsK LX0KLQotYm9vbCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2Nyb2xsTm9kZVJlY3Vyc2l2ZWx5 KFdlYkNvcmU6Ok5vZGUqIG5vZGUsIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGRlbHRhKQotewot ICAgIGlmIChkZWx0YS5pc1plcm8oKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBpZiAo IW5vZGUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIFJlbmRlck9iamVjdCogcmVuZGVy ZXIgPSBub2RlLT5yZW5kZXJlcigpOwotICAgIGlmICghcmVuZGVyZXIpCi0gICAgICAgIHJldHVy biBmYWxzZTsKLQotICAgIEZyYW1lVmlldyogdmlldyA9IHJlbmRlcmVyLT52aWV3KCktPmZyYW1l VmlldygpOwotICAgIGlmICghdmlldykKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgLy8g VHJ5IHNjcm9sbGluZyB0aGUgcmVuZGVyZXIuCi0gICAgaWYgKHNjcm9sbFJlbmRlcmVyKHJlbmRl cmVyLCBkZWx0YSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgLy8gV2UndmUgaGl0IHRo ZSBwYWdlLCBkb24ndCBzY3JvbGwgaXQgYW5kIHJldHVybiBmYWxzZS4KLSAgICBpZiAodmlldyA9 PSBtX3dlYlBhZ2UtPm1fbWFpbkZyYW1lLT52aWV3KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsK LQotICAgIC8vIFRyeSBzY3JvbGxpbmcgdGhlIEZyYW1lVmlldy4KLSAgICBpZiAoY2FuU2Nyb2xs SW5uZXJGcmFtZSh2aWV3LT5mcmFtZSgpKSkgewotICAgICAgICBJbnRTaXplIHZpZXdEZWx0YSA9 IGRlbHRhOwotICAgICAgICBJbnRQb2ludCBuZXdWaWV3T2Zmc2V0ID0gdmlldy0+c2Nyb2xsUG9z aXRpb24oKTsKLSAgICAgICAgSW50UG9pbnQgbWF4Vmlld09mZnNldCA9IHZpZXctPm1heGltdW1T Y3JvbGxQb3NpdGlvbigpOwotICAgICAgICBhZGp1c3RTY3JvbGxEZWx0YShtYXhWaWV3T2Zmc2V0 LCBuZXdWaWV3T2Zmc2V0LCB2aWV3RGVsdGEpOwotCi0gICAgICAgIGlmICghdmlld0RlbHRhLmlz WmVybygpKSB7Ci0gICAgICAgICAgICB2aWV3LT5zZXRDYW5CbGl0T25TY3JvbGwoZmFsc2UpOwot Ci0gICAgICAgICAgICBCYWNraW5nU3RvcmVDbGllbnQqIGJhY2tpbmdTdG9yZUNsaWVudCA9IG1f d2ViUGFnZS0+YmFja2luZ1N0b3JlQ2xpZW50Rm9yRnJhbWUodmlldy0+ZnJhbWUoKSk7Ci0gICAg ICAgICAgICBpZiAoYmFja2luZ1N0b3JlQ2xpZW50KSB7Ci0gICAgICAgICAgICAgICAgYmFja2lu Z1N0b3JlQ2xpZW50LT5zZXRJc0NsaWVudEdlbmVyYXRlZFNjcm9sbCh0cnVlKTsKLSAgICAgICAg ICAgICAgICBiYWNraW5nU3RvcmVDbGllbnQtPnNldElzU2Nyb2xsTm90aWZpY2F0aW9uU3VwcHJl c3NlZCh0cnVlKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgc2V0Tm9kZSh2aWV3LT5m cmFtZSgpLT5kb2N1bWVudCgpKTsKLQotICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkodmlld0Rl bHRhKTsKLQotICAgICAgICAgICAgaWYgKGJhY2tpbmdTdG9yZUNsaWVudCkgewotICAgICAgICAg ICAgICAgIGJhY2tpbmdTdG9yZUNsaWVudC0+c2V0SXNDbGllbnRHZW5lcmF0ZWRTY3JvbGwoZmFs c2UpOwotICAgICAgICAgICAgICAgIGJhY2tpbmdTdG9yZUNsaWVudC0+c2V0SXNTY3JvbGxOb3Rp ZmljYXRpb25TdXBwcmVzc2VkKGZhbHNlKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICAvLyBUcnkgc2Nyb2xsaW5nIHRo ZSBub2RlIG9mIHRoZSBlbmNsb3NpbmcgZnJhbWUuCi0gICAgRnJhbWUqIGZyYW1lID0gbm9kZS0+ ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICBpZiAoZnJhbWUpIHsKLSAgICAgICAgTm9kZSogb3du ZXJOb2RlID0gZnJhbWUtPm93bmVyRWxlbWVudCgpOwotICAgICAgICBpZiAoc2Nyb2xsTm9kZVJl Y3Vyc2l2ZWx5KG93bmVyTm9kZSwgZGVsdGEpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1ib29sIEluUmVnaW9uU2Nyb2xsZXJQcml2 YXRlOjpzY3JvbGxSZW5kZXJlcihXZWJDb3JlOjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBjb25z dCBXZWJDb3JlOjpJbnRTaXplJiBkZWx0YSkKLXsKLSAgICBSZW5kZXJMYXllciogbGF5ZXIgPSBy ZW5kZXJlci0+ZW5jbG9zaW5nTGF5ZXIoKTsKLSAgICBpZiAoIWxheWVyKQotICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICAvLyBUcnkgdG8gc2Nyb2xsIGxheWVyLgotICAgIGJvb2wgcmVzdHJp Y3RlZEJ5TGluZUNsYW1wID0gZmFsc2U7Ci0gICAgaWYgKHJlbmRlcmVyLT5wYXJlbnQoKSkKLSAg ICAgICAgcmVzdHJpY3RlZEJ5TGluZUNsYW1wID0gIXJlbmRlcmVyLT5wYXJlbnQoKS0+c3R5bGUo KS0+bGluZUNsYW1wKCkuaXNOb25lKCk7Ci0KLSAgICBpZiAocmVuZGVyZXItPmhhc092ZXJmbG93 Q2xpcCgpICYmICFyZXN0cmljdGVkQnlMaW5lQ2xhbXApIHsKLSAgICAgICAgSW50U2l6ZSBsYXll ckRlbHRhID0gZGVsdGE7Ci0gICAgICAgIEludFBvaW50IG1heE9mZnNldChsYXllci0+c2Nyb2xs V2lkdGgoKSAtIGxheWVyLT5yZW5kZXJCb3goKS0+Y2xpZW50V2lkdGgoKSwgbGF5ZXItPnNjcm9s bEhlaWdodCgpIC0gbGF5ZXItPnJlbmRlckJveCgpLT5jbGllbnRIZWlnaHQoKSk7Ci0gICAgICAg IEludFBvaW50IGN1cnJlbnRPZmZzZXQobGF5ZXItPnNjcm9sbFhPZmZzZXQoKSwgbGF5ZXItPnNj cm9sbFlPZmZzZXQoKSk7Ci0gICAgICAgIGFkanVzdFNjcm9sbERlbHRhKG1heE9mZnNldCwgY3Vy cmVudE9mZnNldCwgbGF5ZXJEZWx0YSk7Ci0gICAgICAgIGlmICghbGF5ZXJEZWx0YS5pc1plcm8o KSkgewotICAgICAgICAgICAgc2V0Tm9kZShlbmNsb3NpbmdMYXllck5vZGUobGF5ZXIpKTsKLSAg ICAgICAgICAgIEludFBvaW50IG5ld09mZnNldCA9IGN1cnJlbnRPZmZzZXQgKyBsYXllckRlbHRh OwotICAgICAgICAgICAgbGF5ZXItPnNjcm9sbFRvT2Zmc2V0KEludFNpemUobmV3T2Zmc2V0Lngo KSwgbmV3T2Zmc2V0LnkoKSkpOwotICAgICAgICAgICAgcmVuZGVyZXItPnJlcGFpbnQodHJ1ZSk7 Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHdoaWxl IChsYXllciA9IGxheWVyLT5wYXJlbnQoKSkgewotICAgICAgICBpZiAoY2FuU2Nyb2xsUmVuZGVy Qm94KGxheWVyLT5yZW5kZXJCb3goKSkpCi0gICAgICAgICAgICByZXR1cm4gc2Nyb2xsUmVuZGVy ZXIobGF5ZXItPnJlbmRlckJveCgpLCBkZWx0YSk7Ci0gICAgfQotCi0gICAgcmV0dXJuIGZhbHNl OworICAgIG1fd2ViUGFnZS0+bV9zZWxlY3Rpb25IYW5kbGVyLT5zZWxlY3Rpb25Qb3NpdGlvbkNo YW5nZWQoKTsKKyAgICAvLyBGSVhNRTogV2UgaGF2ZSBjb2RlIGluIHBsYWNlIHRvIGhhbmRsZSBz Y3JvbGxpbmcgYW5kIGNsaXBwaW5nIHRhcCBoaWdobGlnaHQKKyAgICAvLyBvbiBpbi1yZWdpb24g c2Nyb2xsaW5nLiBBcyBzb29uIGFzIGl0IGlzIGZhc3QgZW5vdWdoIChpLmUuIHdlIGhhdmUgaXQg YmFja2VkIGJ5CisgICAgLy8gYSBiYWNraW5nIHN0b3JlKSwgd2UgY2FuIHJlbGlhYmx5IG1ha2Ug dXNlIG9mIGl0IGluIHRoZSByZWFsIHdvcmxkLgorICAgIC8vIG1fdG91Y2hFdmVudEhhbmRsZXIt PmRyYXdUYXBIaWdobGlnaHQoKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBJblJlZ2lv blNjcm9sbGVyUHJpdmF0ZTo6YWRqdXN0U2Nyb2xsRGVsdGEoY29uc3QgV2ViQ29yZTo6SW50UG9p bnQmIG1heE9mZnNldCwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGN1cnJlbnRPZmZzZXQsIFdl YkNvcmU6OkludFNpemUmIGRlbHRhKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyX3AuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlcl9wLmgKaW5kZXggZGY5YzZiMS4uZDllMGViYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyX3Au aAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5o CkBAIC00OSw4ICs0OSw2IEBAIHB1YmxpYzoKICAgICBib29sIGNhblNjcm9sbCgpIGNvbnN0Owog ICAgIGJvb2wgaGFzTm9kZSgpIGNvbnN0OwogCi0gICAgYm9vbCBzY3JvbGxCeShjb25zdCBQbGF0 Zm9ybTo6SW50U2l6ZSYgZGVsdGEpOwotCiAgICAgYm9vbCBzZXRTY3JvbGxQb3NpdGlvbkNvbXBv c2l0aW5nVGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JiBzY3JvbGxQb3NpdGlvbik7CiAgICAgYm9vbCBzZXRTY3JvbGxQb3NpdGlvbldlYktp dFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2lu dCYgc2Nyb2xsUG9zaXRpb24sIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZyk7CiAK QEAgLTY0LDkgKzYyLDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgcHVzaEJhY2tJblJlZ2lvblNj cm9sbGFibGUoSW5SZWdpb25TY3JvbGxhYmxlQXJlYSopOwogCi0gICAgLy8gT2Jzb2xldGUgY29k ZXBhdGguCi0gICAgYm9vbCBzY3JvbGxOb2RlUmVjdXJzaXZlbHkoV2ViQ29yZTo6Tm9kZSosIGNv bnN0IFdlYkNvcmU6OkludFNpemUmIGRlbHRhKTsKLSAgICBib29sIHNjcm9sbFJlbmRlcmVyKFdl YkNvcmU6OlJlbmRlck9iamVjdCosIGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGRlbHRhKTsKICAg ICB2b2lkIGFkanVzdFNjcm9sbERlbHRhKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtYXhPZmZz ZXQsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBjdXJyZW50T2Zmc2V0LCBXZWJDb3JlOjpJbnRT aXplJiBkZWx0YSkgY29uc3Q7CiAKICAgICBSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9pblJlZ2lv blNjcm9sbFN0YXJ0aW5nTm9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCmluZGV4IDNhMGNmNjIuLjgyNDZlZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcApAQCAtMTQ2NywzOCArMTQ2NywxNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRl OjpkZWZlcnJlZFRhc2tzVGltZXJGaXJlZChXZWJDb3JlOjpUaW1lcjxXZWJQYWdlUHJpdmF0ZT4q KQogICAgIHRhc2stPnBlcmZvcm0odGhpcyk7CiB9CiAKLWJvb2wgV2ViUGFnZVByaXZhdGU6OnNj cm9sbEJ5KGludCBkZWx0YVgsIGludCBkZWx0YVksIGJvb2wgc2Nyb2xsTWFpbkZyYW1lKQorYm9v bCBXZWJQYWdlUHJpdmF0ZTo6c2Nyb2xsQnkoaW50IGRlbHRhWCwgaW50IGRlbHRhWSkKIHsKICAg ICBJbnRTaXplIGRlbHRhKGRlbHRhWCwgZGVsdGFZKTsKLSAgICBpZiAoIXNjcm9sbE1haW5GcmFt ZSkgewotICAgICAgICAvLyBXZSBuZWVkIHRvIHdvcmsgYXJvdW5kIHRoZSBmYWN0IHRoYXQgOjpt YXB7VG8sRnJvbX1UcmFuc2Zvcm1lZCBkbyBub3QKLSAgICAgICAgLy8gd29yayB3ZWxsIHdpdGgg bmVnYXRpdmUgdmFsdWVzLCBsaWtlIGEgbmVnYXRpdmUgd2lkdGggb3IgaGVpZ2h0IG9mIGFuIElu dFNpemUuCi0gICAgICAgIEludFNpemUgY29waWVkRGVsdGEoSW50U2l6ZShhYnMoZGVsdGEud2lk dGgoKSksIGFicyhkZWx0YS5oZWlnaHQoKSkpKTsKLSAgICAgICAgSW50U2l6ZSB1bnRyYW5zZm9y bWVkQ29waWVkRGVsdGEgPSBtYXBGcm9tVHJhbnNmb3JtZWQoY29waWVkRGVsdGEpOwotICAgICAg ICBkZWx0YSA9IEludFNpemUoCi0gICAgICAgICAgICBkZWx0YS53aWR0aCgpIDwgMCA/IC11bnRy YW5zZm9ybWVkQ29waWVkRGVsdGEud2lkdGgoKSA6IHVudHJhbnNmb3JtZWRDb3BpZWREZWx0YS53 aWR0aCgpLAotICAgICAgICAgICAgZGVsdGEuaGVpZ2h0KCkgPCAwID8gLXVudHJhbnNmb3JtZWRD b3BpZWREZWx0YS5oZWlnaHQoKTogdW50cmFuc2Zvcm1lZENvcGllZERlbHRhLmhlaWdodCgpKTsK LQotICAgICAgICBpZiAobV9pblJlZ2lvblNjcm9sbGVyLT5kLT5zY3JvbGxCeShkZWx0YSkpIHsK LSAgICAgICAgICAgIG1fc2VsZWN0aW9uSGFuZGxlci0+c2VsZWN0aW9uUG9zaXRpb25DaGFuZ2Vk KCk7Ci0gICAgICAgICAgICAvLyBGSVhNRTogV2UgaGF2ZSBjb2RlIGluIHBsYWNlIHRvIGhhbmRs ZSBzY3JvbGxpbmcgYW5kIGNsaXBwaW5nIHRhcCBoaWdobGlnaHQKLSAgICAgICAgICAgIC8vIG9u IGluLXJlZ2lvbiBzY3JvbGxpbmcuIEFzIHNvb24gYXMgaXQgaXMgZmFzdCBlbm91Z2ggKGkuZS4g d2UgaGF2ZSBpdCBiYWNrZWQgYnkKLSAgICAgICAgICAgIC8vIGEgYmFja2luZyBzdG9yZSksIHdl IGNhbiByZWxpYWJseSBtYWtlIHVzZSBvZiBpdCBpbiB0aGUgcmVhbCB3b3JsZC4KLSAgICAgICAg ICAgIC8vIG1fdG91Y2hFdmVudEhhbmRsZXItPmRyYXdUYXBIaWdobGlnaHQoKTsKLSAgICAgICAg ICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0KLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg IH0KLQogICAgIHNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbFBvc2l0aW9uKCkgKyBkZWx0YSk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgV2ViUGFnZTo6c2Nyb2xsQnkoY29uc3QgUGxhdGZv cm06OkludFNpemUmIGRlbHRhLCBib29sIHNjcm9sbE1haW5GcmFtZSkKK2Jvb2wgV2ViUGFnZTo6 c2Nyb2xsQnkoY29uc3QgUGxhdGZvcm06OkludFNpemUmIGRlbHRhKQogewogICAgIGQtPm1fYmFj a2luZ1N0b3JlQ2xpZW50LT5zZXRJc0NsaWVudEdlbmVyYXRlZFNjcm9sbCh0cnVlKTsKLSAgICBi b29sIGIgPSBkLT5zY3JvbGxCeShkZWx0YS53aWR0aCgpLCBkZWx0YS5oZWlnaHQoKSwgc2Nyb2xs TWFpbkZyYW1lKTsKKyAgICBib29sIGIgPSBkLT5zY3JvbGxCeShkZWx0YS53aWR0aCgpLCBkZWx0 YS5oZWlnaHQoKSk7CiAgICAgZC0+bV9iYWNraW5nU3RvcmVDbGllbnQtPnNldElzQ2xpZW50R2Vu ZXJhdGVkU2Nyb2xsKGZhbHNlKTsKICAgICByZXR1cm4gYjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5oIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmgKaW5kZXggZGM0Y2YxNi4uMTY3MTVkMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlLmgKQEAgLTE3NSw3ICsxNzUsNyBAQCBwdWJsaWM6CiAgICAg UGxhdGZvcm06OkludFBvaW50IHNjcm9sbFBvc2l0aW9uKCkgY29uc3Q7CiAgICAgLy8gU2Nyb2xs IHBvc2l0aW9uIHByb3ZpZGVkIHNob3VsZCBiZSBpbiB0cmFuc2Zvcm1lZCBjb29yZGluYXRlcy4K ICAgICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYpOwot ICAgIGJvb2wgc2Nyb2xsQnkoY29uc3QgUGxhdGZvcm06OkludFNpemUmLCBib29sIHNjcm9sbE1h aW5GcmFtZSA9IHRydWUpOworICAgIGJvb2wgc2Nyb2xsQnkoY29uc3QgUGxhdGZvcm06OkludFNp emUmKTsKICAgICB2b2lkIG5vdGlmeUluUmVnaW9uU2Nyb2xsU3RvcHBlZCgpOwogICAgIHZvaWQg c2V0U2Nyb2xsT3JpZ2luUG9pbnQoY29uc3QgUGxhdGZvcm06OkludFBvaW50Jik7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmggYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VfcC5oCmluZGV4IDUzMTM3ODIuLjQ4MDY0ZTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZV9wLmgKKysr IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlX3AuaApAQCAtMTUwLDcgKzE1 MCw3IEBAIHB1YmxpYzoKICAgICBXZWJDb3JlOjpJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNv bnN0OwogICAgIFdlYkNvcmU6OkludFBvaW50IG1heGltdW1TY3JvbGxQb3NpdGlvbigpIGNvbnN0 OwogICAgIHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsK LSAgICBib29sIHNjcm9sbEJ5KGludCBkZWx0YVgsIGludCBkZWx0YVksIGJvb2wgc2Nyb2xsTWFp bkZyYW1lID0gdHJ1ZSk7CisgICAgYm9vbCBzY3JvbGxCeShpbnQgZGVsdGFYLCBpbnQgZGVsdGFZ KTsKIAogICAgIHZvaWQgZW5xdWV1ZVJlbmRlcmluZ09mQ2xpcHBlZENvbnRlbnRPZlNjcm9sbGFi bGVOb2RlQWZ0ZXJJblJlZ2lvblNjcm9sbGluZyhXZWJDb3JlOjpOb2RlKik7CiAgICAgdm9pZCBu b3RpZnlJblJlZ2lvblNjcm9sbFN0b3BwZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n CmluZGV4IDM5OGU5NmUuLjA1YTJhYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpA QCAtMSw1ICsxLDMwIEBACiAyMDEyLTA4LTIzICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5j b20+CiAKKyAgICAgICAgW0JsYWNrQmVycnldIE9ic29sZXRlIHRoZSBpbi1yZWdpb24gc2Nyb2xs IGNvZGVwYXRoIHByaW9yIHRvIEJCMTAncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4MzkKKyAgICAgICAgUFIgIzE5Nzc3NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY29kZXBhdGggaXMgbm90 IG5lZWRlZCBhbnltb3JlLCBzbyBsZXRzIGxldCBpdCBSSVAuCisKKyAgICAgICAgVGhlIG9ubHkg Y29kZSBhZGRpdGlvbiBpcyBkdWUgdG8gc29tZSBjb2RlIEkndmUgbW92ZWQgZnJvbSBXZWJQYWdl UHJpdmF0ZTo6c2Nyb2xsTm9kZVJlY3Vyc2l2ZWx5CisgICAgICAgIGFuZCBXZWJQYWdlUHJpdmF0 ZTo6c2Nyb2xsQnkgdG8gSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldExheWVyU2Nyb2xsUG9z aXRpb24uCisgICAgICAgIFJlc3QgaXMgY29kZSByZW1vdmFsIC4uLgorCisgICAgICAgICogQXBp L0luUmVnaW9uU2Nyb2xsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJl Z2lvblNjcm9sbGVyUHJpdmF0ZTo6c2V0TGF5ZXJTY3JvbGxQb3NpdGlvbik6CisgICAgICAgICog QXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oOgorICAgICAgICAoSW5SZWdpb25TY3JvbGxlclByaXZh dGUpOgorICAgICAgICAqIEFwaS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6V2ViUGFnZVByaXZhdGU6OnNjcm9sbEJ5KToKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6V2ViUGFnZTo6c2Nyb2xsQnkpOgorICAgICAgICAqIEFwaS9XZWJQYWdlLmg6CisgICAg ICAgICogQXBpL1dlYlBhZ2VfcC5oOgorICAgICAgICAoV2ViUGFnZVByaXZhdGUpOgorCisyMDEy LTA4LTIzICBBbnRvbmlvIEdvbWVzICA8YWdvbWVzQHJpbS5jb20+CisKICAgICAgICAgW0JsYWNr QmVycnldIFVuaWZ5IHNsb3cgYW5kIGZhc3QgaW4tcmVnaW9uIHNjcm9sbGluZyBjb2RlIHBhdGhz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDgzNAog ICAgICAgICBQUiAjMTk3NjYyCi0tIAoxLjcuNS40Cgo=