94834 2012-08-23 12:40:33 -0700 [BlackBerry] Unify slow and fast in-region scrolling code paths 2012-08-23 13:44:34 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 94839 1 tonikitoo tonikitoo mifenton tonikitoo webkit.review.bot oldest_to_newest 703258 0 tonikitoo 2012-08-23 12:40:33 -0700 PR #197662 703281 1 160221 tonikitoo 2012-08-23 13:02:52 -0700 Created attachment 160221 patch 703296 2 160221 rwlbuis 2012-08-23 13:21:25 -0700 Comment on attachment 160221 patch View in context: https://bugs.webkit.org/attachment.cgi?id=160221&action=review Looks good, can be improved a bit. > Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp:108 > + ASSERT(!m_cachedCompositedScrollableLayer || !m_cachedNonCompositedScrollableNode); Please make the assert more clear, this is not strict enough for what you want. > Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp:141 > +} Better put this up instead of the forward declaration. 703301 3 160230 tonikitoo 2012-08-23 13:25:39 -0700 Created attachment 160230 patch - addressed rob's comments 703304 4 160230 rwlbuis 2012-08-23 13:28:27 -0700 Comment on attachment 160230 patch - addressed rob's comments LGTM. 703319 5 tonikitoo 2012-08-23 13:44:34 -0700 https://trac.webkit.org/changeset/126474 160221 2012-08-23 13:02:52 -0700 2012-08-23 13:25:39 -0700 patch 0001-BlackBerry-Unify-slow-and-fast-in-region-scrolling-c.patch text/plain 11071 tonikitoo RnJvbSBlNDVkNzk1MmQ0Mzc0OWViNzBhYmE2MTE5ZjIwNTNhNjcwM2EzNWIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog VGh1LCAyMyBBdWcgMjAxMiAxNjowMjowNSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBVbmlmeSBzbG93IGFuZCBmYXN0IGluLXJlZ2lvbiBzY3JvbGxpbmcgY29kZQogcGF0aHMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODM0IFBSCiAjMTk3NjYy CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUGF0Y2ggYnkgQW50b25pbyBHb21lcyA8YWdv bWVzQHJpbS5jb20+CkludGVybmFsbHkgcmV2aWV3ZWQgYnkgQXJ2aWQgTmlsc3Nvbi4KCkluIG9y ZGVyIHRvIGJlIGFibGUgdG8gcmVtb3ZlIGEgYnVuY2ggb2Ygb2Jzb2xldGUgY29kZSBmcm9tCklu UmVnaW9uU2Nyb2xsZXIuY3BwLCB3ZSBuZWVkIHRvIHVuaWZ5IHRoZSBjb2RlcGF0aHMgZm9yIHNs b3cKYW5kIGZhc3QgaW4tcmVnaW9uIHNjcm9sbGluZy4KClRoaXMgcGF0Y2ggY2FjaGVzIHRoZSBy b290IHNjcm9sbGFibGUgbm9kZSBvZiBlYWNoIHNjcm9sbGFibGUgYmxvY2sKaW4gSW5SZWdpb25T Y3JvbGxhYmxlQXJlYSBhbHNvIGZvciB0aGUgbm9uLWNvbXBvc2l0ZWQtc2Nyb2xsaW5nIGNhc2Ug bm93IHRvbwooYW5hbG9nbHkgdG8gdGhlIHdheSB3ZSBjYWNoZSBMYXllcldlYktpdFRocmVhZCBm b3IgdGhlIGNvbXBvc2l0ZWQgc2Nyb2xsaW5nIGNhc2UpLgoKTm93IHRoZSBjbGllbnQgKGxpYndl YnZpZXcpIGNhbiBkaXNwYXRjaCBhbiBpbi1yZWdpb24gc2Nyb2xsaW5nIHdpdGggb25lIHNpbmds ZSBjb2RlIHBhdGgsCm1ha2luZyB1c2Ugb2YgYSBib29sZWFuIChhcmdoISkgdG8gaW5mb3JtIGlm IHRoZSBzY3JvbGwgb2YgdGhlIGdpdmVuCmxheWVyIHN1cHBvcnRzIGNvbXBvc2l0aW5nIG9yIG5v dC4gTGF0ZXIgb24sIHRoaXMgYm9vbGVhbiBpcyB1c2VkIHRvIGNhc3RpbmcgdGhlIHByb3BlciBl bGVtZW50LgoKKiBBcGkvSW5SZWdpb25TY3JvbGxlci5jcHA6CihCbGFja0JlcnJ5OjpXZWJLaXQ6 OkluUmVnaW9uU2Nyb2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKToKKEJsYWNr QmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0aW9u V2ViS2l0VGhyZWFkKToKKiBBcGkvSW5SZWdpb25TY3JvbGxlci5oOgoqIEFwaS9JblJlZ2lvblNj cm9sbGVyX3AuaDoKKEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKToKKiBXZWJLaXRTdXBwb3J0L0lu UmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwOgooV2ViS2l0KToKKEJsYWNrQmVycnk6OldlYktpdDo6 SW5SZWdpb25TY3JvbGxhYmxlQXJlYTo6SW5SZWdpb25TY3JvbGxhYmxlQXJlYSk6CihCbGFja0Jl cnJ5OjpXZWJLaXQ6OmVuY2xvc2luZ0xheWVyTm9kZSk6CiogV2ViS2l0U3VwcG9ydC9JblJlZ2lv blNjcm9sbGFibGVBcmVhLmg6CihXZWJDb3JlKToKKEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEpOgot LS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAgIHwg ICAyNyArKysrKysrKysrLS0tLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdp b25TY3JvbGxlci5oICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9J blJlZ2lvblNjcm9sbGVyX3AuaCAgfCAgICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICB8ICAgMzYgKysrKysrKysrKysrKysrKysrKysKIC4u Li9XZWJLaXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwICAgICAgIHwgICAxOSAr KysrKysrKysrCiAuLi4vV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmggICAg ICAgICB8ICAgIDQgKysKIDYgZmlsZXMgY2hhbmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgMTEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJl Z2lvblNjcm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25T Y3JvbGxlci5jcHAKaW5kZXggMjA1ZWY4OS4uZjIzODIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCkBAIC02NSwxMiArNjUsMTIg QEAgYm9vbCBJblJlZ2lvblNjcm9sbGVyOjpzZXRTY3JvbGxQb3NpdGlvbkNvbXBvc2l0aW5nVGhy ZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGEKICAgICByZXR1cm4gZC0+c2V0U2Nyb2xsUG9zaXRp b25Db21wb3NpdGluZ1RocmVhZChjYW1vdWZsYWdlZExheWVyLCBkLT5tX3dlYlBhZ2UtPm1hcEZy b21UcmFuc2Zvcm1lZChzY3JvbGxQb3NpdGlvbikpOwogfQogCi1ib29sIEluUmVnaW9uU2Nyb2xs ZXI6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5 ZXIsIGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pCitib29sIEluUmVn aW9uU2Nyb2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91 ZmxhZ2VkTGF5ZXIsIGNvbnN0IFBsYXRmb3JtOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24sIGJv b2wgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZykKIHsKICAgICBBU1NFUlQoUGxhdGZvcm06 OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+aXNDdXJyZW50VGhyZWFkKCkpOwogCiAgICAg Ly8gRklYTUU6IE5lZ2F0aXZlIHZhbHVlcyB3b24ndCB3b3JrIHdpdGggbWFwe1RvLEZyb219VHJh bnNmb3JtIG1ldGhvZHMuCi0gICAgcmV0dXJuIGQtPnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhy ZWFkKGNhbW91ZmxhZ2VkTGF5ZXIsIGQtPm1fd2ViUGFnZS0+bWFwRnJvbVRyYW5zZm9ybWVkKHNj cm9sbFBvc2l0aW9uKSk7CisgICAgcmV0dXJuIGQtPnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhy ZWFkKGNhbW91ZmxhZ2VkTGF5ZXIsIGQtPm1fd2ViUGFnZS0+bWFwRnJvbVRyYW5zZm9ybWVkKHNj cm9sbFBvc2l0aW9uKSwgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZyk7CiB9CiAKIEluUmVn aW9uU2Nyb2xsZXJQcml2YXRlOjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZShXZWJQYWdlUHJpdmF0 ZSogd2ViUGFnZVByaXZhdGUpCkBAIC0xMTgsMTYgKzExOCwyNSBAQCBib29sIEluUmVnaW9uU2Ny b2xsZXJQcml2YXRlOjpzZXRTY3JvbGxQb3NpdGlvbkNvbXBvc2l0aW5nVGhyZWFkKHVuc2lnbmVk IGNhbW91ZgogICAgIHJldHVybiB0cnVlOwogfQogCi1ib29sIEluUmVnaW9uU2Nyb2xsZXJQcml2 YXRlOjpzZXRTY3JvbGxQb3NpdGlvbldlYktpdFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExh eWVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pCitib29sIEluUmVn aW9uU2Nyb2xsZXJQcml2YXRlOjpzZXRTY3JvbGxQb3NpdGlvbldlYktpdFRocmVhZCh1bnNpZ25l ZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRp b24sIGJvb2wgc3VwcG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZykKIHsKICAgICBSZW5kZXJMYXll ciogbGF5ZXIgPSAwOwogCi0gICAgTGF5ZXJXZWJLaXRUaHJlYWQqIGxheWVyV2ViS2l0VGhyZWFk ID0gcmVpbnRlcnByZXRfY2FzdDxMYXllcldlYktpdFRocmVhZCo+KGNhbW91ZmxhZ2VkTGF5ZXIp OwotICAgIEFTU0VSVChsYXllcldlYktpdFRocmVhZCk7Ci0gICAgaWYgKGxheWVyV2ViS2l0VGhy ZWFkLT5vd25lcigpKSB7Ci0gICAgICAgIEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIgPSBs YXllcldlYktpdFRocmVhZC0+b3duZXIoKTsKLSAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBi YWNraW5nID0gc3RhdGljX2Nhc3Q8UmVuZGVyTGF5ZXJCYWNraW5nKj4oZ3JhcGhpY3NMYXllci0+ Y2xpZW50KCkpOwotICAgICAgICBsYXllciA9IGJhY2tpbmctPm93bmluZ0xheWVyKCk7CisgICAg aWYgKHN1cHBvcnRzQWNjZWxlcmF0ZWRTY3JvbGxpbmcpIHsKKyAgICAgICAgTGF5ZXJXZWJLaXRU aHJlYWQqIGxheWVyV2ViS2l0VGhyZWFkID0gcmVpbnRlcnByZXRfY2FzdDxMYXllcldlYktpdFRo cmVhZCo+KGNhbW91ZmxhZ2VkTGF5ZXIpOworICAgICAgICBBU1NFUlQobGF5ZXJXZWJLaXRUaHJl YWQpOworICAgICAgICBpZiAobGF5ZXJXZWJLaXRUaHJlYWQtPm93bmVyKCkpIHsKKyAgICAgICAg ICAgIEdyYXBoaWNzTGF5ZXIqIGdyYXBoaWNzTGF5ZXIgPSBsYXllcldlYktpdFRocmVhZC0+b3du ZXIoKTsKKyAgICAgICAgICAgIFJlbmRlckxheWVyQmFja2luZyogYmFja2luZyA9IHN0YXRpY19j YXN0PFJlbmRlckxheWVyQmFja2luZyo+KGdyYXBoaWNzTGF5ZXItPmNsaWVudCgpKTsKKyAgICAg ICAgICAgIGxheWVyID0gYmFja2luZy0+b3duaW5nTGF5ZXIoKTsKKyAgICAgICAgfQorICAgIH0g ZWxzZSB7CisgICAgICAgIE5vZGUqIG5vZGUgPSByZWludGVycHJldF9jYXN0PE5vZGUqPihjYW1v dWZsYWdlZExheWVyKTsKKyAgICAgICAgQVNTRVJUKG5vZGUpOworICAgICAgICBpZiAoIW5vZGUt PnJlbmRlcmVyKCkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgbGF5ZXIg PSBub2RlLT5yZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpOwogICAgIH0KIAogICAgIGlmICgh bGF5ZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9u U2Nyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxl ci5oCmluZGV4IGJiZGQ5NGYuLjMyOTFmOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oCkBAIC0zNiw3ICszNiw3IEBAIHB1YmxpYzoKICAg ICB+SW5SZWdpb25TY3JvbGxlcigpOwogCiAgICAgYm9vbCBzZXRTY3JvbGxQb3NpdGlvbkNvbXBv c2l0aW5nVGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFBsYXRmb3JtOjpJ bnRQb2ludCYgLypzY3JvbGxQb3NpdGlvbiovKTsKLSAgICBib29sIHNldFNjcm9sbFBvc2l0aW9u V2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFBsYXRmb3JtOjpJ bnRQb2ludCYgLypzY3JvbGxQb3NpdGlvbiovKTsKKyAgICBib29sIHNldFNjcm9sbFBvc2l0aW9u V2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFBsYXRmb3JtOjpJ bnRQb2ludCYgLypzY3JvbGxQb3NpdGlvbiovLCBib29sIGFjY2VsZXJhdGVkU2Nyb2xsaW5nKTsK IAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgV2ViUGFnZVByaXZhdGU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyX3AuaAppbmRleCAwODA3 NjZhLi5kZjljNmIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0lu UmVnaW9uU2Nyb2xsZXJfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5S ZWdpb25TY3JvbGxlcl9wLmgKQEAgLTUyLDcgKzUyLDcgQEAgcHVibGljOgogICAgIGJvb2wgc2Ny b2xsQnkoY29uc3QgUGxhdGZvcm06OkludFNpemUmIGRlbHRhKTsKIAogICAgIGJvb2wgc2V0U2Ny b2xsUG9zaXRpb25Db21wb3NpdGluZ1RocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pOwotICAgIGJvb2wgc2V0U2Ny b2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKTsKKyAgICBib29sIHNldFNjcm9sbFBv c2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFdlYkNv cmU6OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBzdXBwb3J0c0FjY2VsZXJhdGVkU2Ny b2xsaW5nKTsKIAogICAgIHZvaWQgY2FsY3VsYXRlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXNGb3JQ b2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIGNvbnN0IHN0ZDo6dmVjdG9yPFBs YXRmb3JtOjpTY3JvbGxWaWV3QmFzZSo+JiBhY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcygp IGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggMTA1OTE4MS4uMDc2ZDZk NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTIt MDgtMjMgIEFudG9uaW8gR29tZXMgIDxhZ29tZXNAcmltLmNvbT4KKworICAgICAgICBbQmxhY2tC ZXJyeV0gVW5pZnkgc2xvdyBhbmQgZmFzdCBpbi1yZWdpb24gc2Nyb2xsaW5nIGNvZGUgcGF0aHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODM0Cisg ICAgICAgIFBSICMxOTc2NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbnRlcm5hbGx5IHJldmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAg ICAgSW4gb3JkZXIgdG8gYmUgYWJsZSB0byByZW1vdmUgYSBidW5jaCBvZiBvYnNvbGV0ZSBjb2Rl IGZyb20KKyAgICAgICAgSW5SZWdpb25TY3JvbGxlci5jcHAsIHdlIG5lZWQgdG8gdW5pZnkgdGhl IGNvZGVwYXRocyBmb3Igc2xvdworICAgICAgICBhbmQgZmFzdCBpbi1yZWdpb24gc2Nyb2xsaW5n LgorCisgICAgICAgIFRoaXMgcGF0Y2ggY2FjaGVzIHRoZSByb290IHNjcm9sbGFibGUgbm9kZSBv ZiBlYWNoIHNjcm9sbGFibGUgYmxvY2sKKyAgICAgICAgaW4gSW5SZWdpb25TY3JvbGxhYmxlQXJl YSBhbHNvIGZvciB0aGUgbm9uLWNvbXBvc2l0ZWQtc2Nyb2xsaW5nIGNhc2Ugbm93IHRvbworICAg ICAgICAoYW5hbG9nbHkgdG8gdGhlIHdheSB3ZSBjYWNoZSBMYXllcldlYktpdFRocmVhZCBmb3Ig dGhlIGNvbXBvc2l0ZWQgc2Nyb2xsaW5nIGNhc2UpLgorCisgICAgICAgIE5vdyB0aGUgY2xpZW50 IChsaWJ3ZWJ2aWV3KSBjYW4gZGlzcGF0Y2ggYW4gaW4tcmVnaW9uIHNjcm9sbGluZyB3aXRoIG9u ZSBzaW5nbGUgY29kZSBwYXRoLAorICAgICAgICBtYWtpbmcgdXNlIG9mIGEgYm9vbGVhbiAoYXJn aCEpIHRvIGluZm9ybSBpZiB0aGUgc2Nyb2xsIG9mIHRoZSBnaXZlbgorICAgICAgICBsYXllciBz dXBwb3J0cyBjb21wb3NpdGluZyBvciBub3QuIExhdGVyIG9uLCB0aGlzIGJvb2xlYW4gaXMgdXNl ZCB0byBjYXN0aW5nIHRoZSBwcm9wZXIgZWxlbWVudC4KKworICAgICAgICAqIEFwaS9JblJlZ2lv blNjcm9sbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdpb25TY3Jv bGxlcjo6c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQpOgorICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6c2V0U2Nyb2xsUG9zaXRpb25XZWJL aXRUaHJlYWQpOgorICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmg6CisgICAgICAgICog QXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oOgorICAgICAgICAoSW5SZWdpb25TY3JvbGxlclByaXZh dGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5SZWdpb25TY3JvbGxhYmxlQXJlYS5jcHA6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lv blNjcm9sbGFibGVBcmVhOjpJblJlZ2lvblNjcm9sbGFibGVBcmVhKToKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6ZW5jbG9zaW5nTGF5ZXJOb2RlKToKKyAgICAgICAgKiBXZWJLaXRTdXBw b3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAoSW5SZWdpb25TY3JvbGxhYmxlQXJlYSk6CisKIDIwMTItMDgtMjIgIENyeXN0YWwgWmhhbmcg IDxoYWl6aGFuZ0ByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBNYWtlIGFsbCBwaWNr ZXJzIG5vbi16b29tYWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvSW5SZWdpb25TY3JvbGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcAppbmRleCA0 NGU3YjQ5Li5mNTVjMTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcApAQCAt NDYsNiArNDYsOCBAQCBJblJlZ2lvblNjcm9sbGFibGVBcmVhOjp+SW5SZWdpb25TY3JvbGxhYmxl QXJlYSgpCiAgICAgICAgIG1fY2FjaGVkQ29tcG9zaXRlZFNjcm9sbGFibGVMYXllci0+Y2xlYXJP dmVycmlkZSgpOwogfQogCitzdGF0aWMgTm9kZSogZW5jbG9zaW5nTGF5ZXJOb2RlKFJlbmRlckxh eWVyKik7CisKIEluUmVnaW9uU2Nyb2xsYWJsZUFyZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEo V2ViUGFnZVByaXZhdGUqIHdlYlBhZ2UsIFJlbmRlckxheWVyKiBsYXllcikKICAgICA6IG1fd2Vi UGFnZSh3ZWJQYWdlKQogICAgICwgbV9sYXllcihsYXllcikKQEAgLTk3LDggKzk5LDE0IEBAIElu UmVnaW9uU2Nyb2xsYWJsZUFyZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEoV2ViUGFnZVByaXZh dGUqIHdlYlBhZ2UsIFJlbmRlckxhCiAgICAgICAgICAgICBBU1NFUlQobV9sYXllci0+YmFja2lu ZygpLT5oYXNTY3JvbGxpbmdMYXllcigpKTsKICAgICAgICAgICAgIG1fY2Ftb3VmbGFnZWRDb21w b3NpdGVkU2Nyb2xsYWJsZUxheWVyID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZD4obV9sYXll ci0+YmFja2luZygpLT5zY3JvbGxpbmdMYXllcigpLT5wbGF0Zm9ybUxheWVyKCkpOwogICAgICAg ICAgICAgbV9jYWNoZWRDb21wb3NpdGVkU2Nyb2xsYWJsZUxheWVyID0gbV9sYXllci0+YmFja2lu ZygpLT5zY3JvbGxpbmdMYXllcigpLT5wbGF0Zm9ybUxheWVyKCk7CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICBtX2NhbW91ZmxhZ2VkQ29tcG9zaXRlZFNjcm9sbGFibGVMYXllciA9IHJl aW50ZXJwcmV0X2Nhc3Q8dW5zaWduZWQ+KGVuY2xvc2luZ0xheWVyTm9kZShtX2xheWVyKSk7Cisg ICAgICAgICAgICBtX2NhY2hlZE5vbkNvbXBvc2l0ZWRTY3JvbGxhYmxlTm9kZSA9IGVuY2xvc2lu Z0xheWVyTm9kZShtX2xheWVyKTsKICAgICAgICAgfQogCisgICAgICAgIC8vIEJvdGggY2FjaGVz IGFyZSBzZWxmLWV4Y2x1c2l2ZS4KKyAgICAgICAgQVNTRVJUKCFtX2NhY2hlZENvbXBvc2l0ZWRT Y3JvbGxhYmxlTGF5ZXIgfHwgIW1fY2FjaGVkTm9uQ29tcG9zaXRlZFNjcm9sbGFibGVOb2RlKTsK KwogICAgICAgICBtX292ZXJzY3JvbGxMaW1pdEZhY3RvciA9IDAuMDsKICAgICB9CiB9CkBAIC0x MjEsNSArMTI5LDE2IEBAIFJlbmRlckxheWVyKiBJblJlZ2lvblNjcm9sbGFibGVBcmVhOjpsYXll cigpIGNvbnN0CiAgICAgcmV0dXJuIG1fbGF5ZXI7CiB9CiAKKy8vIEZJWE1FOiBNYWtlIFJlbmRl ckxheWVyOjplbmNsb3NpbmdFbGVtZW50IHB1YmxpYyBzbyB0aGlzIG9uZSBjYW4gYmUgcmVtb3Zl ZC4KK3N0YXRpYyBOb2RlKiBlbmNsb3NpbmdMYXllck5vZGUoUmVuZGVyTGF5ZXIqIGxheWVyKQor eworICAgIGZvciAoUmVuZGVyT2JqZWN0KiByID0gbGF5ZXItPnJlbmRlcmVyKCk7IHI7IHIgPSBy LT5wYXJlbnQoKSkgeworICAgICAgICBpZiAoTm9kZSogZSA9IHItPm5vZGUoKSkKKyAgICAgICAg ICAgIHJldHVybiBlOworICAgIH0KKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1 cm4gMDsKK30KKwogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dl YktpdFN1cHBvcnQvSW5SZWdpb25TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5SZWdpb25TY3JvbGxhYmxlQXJlYS5oCmluZGV4IDY3OWU0 OTAuLjQ0M2I5NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmgKQEAgLTI1LDYgKzI1 LDcgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgTGF5ZXJXZWJLaXRUaHJlYWQ7Citj bGFzcyBOb2RlOwogY2xhc3MgUmVuZGVyTGF5ZXI7CiB9CiAKQEAgLTQ5LDcgKzUwLDEwIEBAIHBy aXZhdGU6CiAgICAgV2ViUGFnZVByaXZhdGUqIG1fd2ViUGFnZTsKICAgICBXZWJDb3JlOjpSZW5k ZXJMYXllciogbV9sYXllcjsKIAorICAgIC8vIFdlIGVpdGhlciBjYWNoZSBvbmUgaGVyZTogaW4g Y2FzZSBvZiBhIGNvbXBvc2l0ZWQgc2Nyb2xsYWJsZSBsYXllcgorICAgIC8vIGNhY2hlIHRoZSBM YXllcldlYktpdFRocmVhZC4gT3RoZXJ3aXNlLCB0aGUgTm9kZS4KICAgICBSZWZQdHI8V2ViQ29y ZTo6TGF5ZXJXZWJLaXRUaHJlYWQ+IG1fY2FjaGVkQ29tcG9zaXRlZFNjcm9sbGFibGVMYXllcjsK KyAgICBSZWZQdHI8V2ViQ29yZTo6Tm9kZT4gbV9jYWNoZWROb25Db21wb3NpdGVkU2Nyb2xsYWJs ZU5vZGU7CiAKICAgICBib29sIG1faGFzV2luZG93VmlzaWJsZVJlY3RDYWxjdWxhdGVkOwogfTsK LS0gCjEuNy41LjQKCg== 160230 2012-08-23 13:25:39 -0700 2012-08-23 13:28:27 -0700 patch - addressed rob's comments 0001-BlackBerry-Unify-slow-and-fast-in-region-scrolling-c.patch text/plain 11232 tonikitoo RnJvbSA3YWYzNTI3M2M3NjE5ZjJkOWQ5YjY5Y2I5MDkwMDQyNjFlMTIwZjUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDxhZ29tZXNAcmltLmNvbT4KRGF0ZTog VGh1LCAyMyBBdWcgMjAxMiAxNjowMjowNSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIFtCbGFja0Jl cnJ5XSBVbmlmeSBzbG93IGFuZCBmYXN0IGluLXJlZ2lvbiBzY3JvbGxpbmcgY29kZQogcGF0aHMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODM0IFBSCiAjMTk3NjYy CgpSZXZpZXdlZCBieSBSb2IgQnVpcy4KUGF0Y2ggYnkgQW50b25pbyBHb21lcyA8YWdvbWVzQHJp bS5jb20+CkludGVybmFsbHkgcmV2aWV3ZWQgYnkgQXJ2aWQgTmlsc3Nvbi4KCkluIG9yZGVyIHRv IGJlIGFibGUgdG8gcmVtb3ZlIGEgYnVuY2ggb2Ygb2Jzb2xldGUgY29kZSBmcm9tCkluUmVnaW9u U2Nyb2xsZXIuY3BwLCB3ZSBuZWVkIHRvIHVuaWZ5IHRoZSBjb2RlcGF0aHMgZm9yIHNsb3cKYW5k IGZhc3QgaW4tcmVnaW9uIHNjcm9sbGluZy4KClRoaXMgcGF0Y2ggY2FjaGVzIHRoZSByb290IHNj cm9sbGFibGUgbm9kZSBvZiBlYWNoIHNjcm9sbGFibGUgYmxvY2sKaW4gSW5SZWdpb25TY3JvbGxh YmxlQXJlYSBhbHNvIGZvciB0aGUgbm9uLWNvbXBvc2l0ZWQtc2Nyb2xsaW5nIGNhc2Ugbm93IHRv bwooYW5hbG9nbHkgdG8gdGhlIHdheSB3ZSBjYWNoZSBMYXllcldlYktpdFRocmVhZCBmb3IgdGhl IGNvbXBvc2l0ZWQgc2Nyb2xsaW5nIGNhc2UpLgoKTm93IHRoZSBjbGllbnQgKGxpYndlYnZpZXcp IGNhbiBkaXNwYXRjaCBhbiBpbi1yZWdpb24gc2Nyb2xsaW5nIHdpdGggb25lIHNpbmdsZSBjb2Rl IHBhdGgsCm1ha2luZyB1c2Ugb2YgYSBib29sZWFuIChhcmdoISkgdG8gaW5mb3JtIGlmIHRoZSBz Y3JvbGwgb2YgdGhlIGdpdmVuCmxheWVyIHN1cHBvcnRzIGNvbXBvc2l0aW5nIG9yIG5vdC4gTGF0 ZXIgb24sIHRoaXMgYm9vbGVhbiBpcyB1c2VkIHRvIGNhc3RpbmcgdGhlIHByb3BlciBlbGVtZW50 LgoKKiBBcGkvSW5SZWdpb25TY3JvbGxlci5jcHA6CihCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVn aW9uU2Nyb2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKToKKEJsYWNrQmVycnk6 OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0 VGhyZWFkKToKKiBBcGkvSW5SZWdpb25TY3JvbGxlci5oOgoqIEFwaS9JblJlZ2lvblNjcm9sbGVy X3AuaDoKKEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKToKKiBXZWJLaXRTdXBwb3J0L0luUmVnaW9u U2Nyb2xsYWJsZUFyZWEuY3BwOgooV2ViS2l0KToKKEJsYWNrQmVycnk6OldlYktpdDo6SW5SZWdp b25TY3JvbGxhYmxlQXJlYTo6SW5SZWdpb25TY3JvbGxhYmxlQXJlYSk6CihCbGFja0JlcnJ5OjpX ZWJLaXQ6OmVuY2xvc2luZ0xheWVyTm9kZSk6CiogV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9s bGFibGVBcmVhLmg6CihXZWJDb3JlKToKKEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEpOgotLS0KIFNv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAgIHwgICAyNyAr KysrKysrKysrLS0tLS0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3Jv bGxlci5oICAgIHwgICAgMiArLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lv blNjcm9sbGVyX3AuaCAgfCAgICAyICstCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMzYgKysrKysrKysrKysrKysrKysrKysKIC4uLi9XZWJL aXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwICAgICAgIHwgICAxNyArKysrKysr KysKIC4uLi9XZWJLaXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuaCAgICAgICAgIHwg ICAgNCArKwogNiBmaWxlcyBjaGFuZ2VkLCA3NyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Ny b2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVy LmNwcAppbmRleCAyMDVlZjg5Li5mMjM4MjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAKQEAgLTY1LDEyICs2NSwxMiBAQCBib29s IEluUmVnaW9uU2Nyb2xsZXI6OnNldFNjcm9sbFBvc2l0aW9uQ29tcG9zaXRpbmdUaHJlYWQodW5z aWduZWQgY2Ftb3VmbGFnZWRMYQogICAgIHJldHVybiBkLT5zZXRTY3JvbGxQb3NpdGlvbkNvbXBv c2l0aW5nVGhyZWFkKGNhbW91ZmxhZ2VkTGF5ZXIsIGQtPm1fd2ViUGFnZS0+bWFwRnJvbVRyYW5z Zm9ybWVkKHNjcm9sbFBvc2l0aW9uKSk7CiB9CiAKLWJvb2wgSW5SZWdpb25TY3JvbGxlcjo6c2V0 U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29u c3QgUGxhdGZvcm06OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbikKK2Jvb2wgSW5SZWdpb25TY3Jv bGxlcjo6c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRM YXllciwgY29uc3QgUGxhdGZvcm06OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9vbCBzdXBw b3J0c0FjY2VsZXJhdGVkU2Nyb2xsaW5nKQogewogICAgIEFTU0VSVChQbGF0Zm9ybTo6d2ViS2l0 VGhyZWFkTWVzc2FnZUNsaWVudCgpLT5pc0N1cnJlbnRUaHJlYWQoKSk7CiAKICAgICAvLyBGSVhN RTogTmVnYXRpdmUgdmFsdWVzIHdvbid0IHdvcmsgd2l0aCBtYXB7VG8sRnJvbX1UcmFuc2Zvcm0g bWV0aG9kcy4KLSAgICByZXR1cm4gZC0+c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQoY2Ft b3VmbGFnZWRMYXllciwgZC0+bV93ZWJQYWdlLT5tYXBGcm9tVHJhbnNmb3JtZWQoc2Nyb2xsUG9z aXRpb24pKTsKKyAgICByZXR1cm4gZC0+c2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRUaHJlYWQoY2Ft b3VmbGFnZWRMYXllciwgZC0+bV93ZWJQYWdlLT5tYXBGcm9tVHJhbnNmb3JtZWQoc2Nyb2xsUG9z aXRpb24pLCBzdXBwb3J0c0FjY2VsZXJhdGVkU2Nyb2xsaW5nKTsKIH0KIAogSW5SZWdpb25TY3Jv bGxlclByaXZhdGU6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKFdlYlBhZ2VQcml2YXRlKiB3ZWJQ YWdlUHJpdmF0ZSkKQEAgLTExOCwxNiArMTE4LDI1IEBAIGJvb2wgSW5SZWdpb25TY3JvbGxlclBy aXZhdGU6OnNldFNjcm9sbFBvc2l0aW9uQ29tcG9zaXRpbmdUaHJlYWQodW5zaWduZWQgY2Ftb3Vm CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnNl dFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNv bnN0IFdlYkNvcmU6OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbikKK2Jvb2wgSW5SZWdpb25TY3Jv bGxlclByaXZhdGU6OnNldFNjcm9sbFBvc2l0aW9uV2ViS2l0VGhyZWFkKHVuc2lnbmVkIGNhbW91 ZmxhZ2VkTGF5ZXIsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbiwgYm9v bCBzdXBwb3J0c0FjY2VsZXJhdGVkU2Nyb2xsaW5nKQogewogICAgIFJlbmRlckxheWVyKiBsYXll ciA9IDA7CiAKLSAgICBMYXllcldlYktpdFRocmVhZCogbGF5ZXJXZWJLaXRUaHJlYWQgPSByZWlu dGVycHJldF9jYXN0PExheWVyV2ViS2l0VGhyZWFkKj4oY2Ftb3VmbGFnZWRMYXllcik7Ci0gICAg QVNTRVJUKGxheWVyV2ViS2l0VGhyZWFkKTsKLSAgICBpZiAobGF5ZXJXZWJLaXRUaHJlYWQtPm93 bmVyKCkpIHsKLSAgICAgICAgR3JhcGhpY3NMYXllciogZ3JhcGhpY3NMYXllciA9IGxheWVyV2Vi S2l0VGhyZWFkLT5vd25lcigpOwotICAgICAgICBSZW5kZXJMYXllckJhY2tpbmcqIGJhY2tpbmcg PSBzdGF0aWNfY2FzdDxSZW5kZXJMYXllckJhY2tpbmcqPihncmFwaGljc0xheWVyLT5jbGllbnQo KSk7Ci0gICAgICAgIGxheWVyID0gYmFja2luZy0+b3duaW5nTGF5ZXIoKTsKKyAgICBpZiAoc3Vw cG9ydHNBY2NlbGVyYXRlZFNjcm9sbGluZykgeworICAgICAgICBMYXllcldlYktpdFRocmVhZCog bGF5ZXJXZWJLaXRUaHJlYWQgPSByZWludGVycHJldF9jYXN0PExheWVyV2ViS2l0VGhyZWFkKj4o Y2Ftb3VmbGFnZWRMYXllcik7CisgICAgICAgIEFTU0VSVChsYXllcldlYktpdFRocmVhZCk7Cisg ICAgICAgIGlmIChsYXllcldlYktpdFRocmVhZC0+b3duZXIoKSkgeworICAgICAgICAgICAgR3Jh cGhpY3NMYXllciogZ3JhcGhpY3NMYXllciA9IGxheWVyV2ViS2l0VGhyZWFkLT5vd25lcigpOwor ICAgICAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nKiBiYWNraW5nID0gc3RhdGljX2Nhc3Q8UmVu ZGVyTGF5ZXJCYWNraW5nKj4oZ3JhcGhpY3NMYXllci0+Y2xpZW50KCkpOworICAgICAgICAgICAg bGF5ZXIgPSBiYWNraW5nLT5vd25pbmdMYXllcigpOworICAgICAgICB9CisgICAgfSBlbHNlIHsK KyAgICAgICAgTm9kZSogbm9kZSA9IHJlaW50ZXJwcmV0X2Nhc3Q8Tm9kZSo+KGNhbW91ZmxhZ2Vk TGF5ZXIpOworICAgICAgICBBU1NFUlQobm9kZSk7CisgICAgICAgIGlmICghbm9kZS0+cmVuZGVy ZXIoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBsYXllciA9IG5vZGUt PnJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCk7CiAgICAgfQogCiAgICAgaWYgKCFsYXllcikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxl ci5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmgKaW5k ZXggYmJkZDk0Zi4uMzI5MWY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L0FwaS9JblJlZ2lvblNjcm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9JblJlZ2lvblNjcm9sbGVyLmgKQEAgLTM2LDcgKzM2LDcgQEAgcHVibGljOgogICAgIH5JblJl Z2lvblNjcm9sbGVyKCk7CiAKICAgICBib29sIHNldFNjcm9sbFBvc2l0aW9uQ29tcG9zaXRpbmdU aHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgUGxhdGZvcm06OkludFBvaW50 JiAvKnNjcm9sbFBvc2l0aW9uKi8pOwotICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRU aHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgUGxhdGZvcm06OkludFBvaW50 JiAvKnNjcm9sbFBvc2l0aW9uKi8pOworICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25XZWJLaXRU aHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgUGxhdGZvcm06OkludFBvaW50 JiAvKnNjcm9sbFBvc2l0aW9uKi8sIGJvb2wgYWNjZWxlcmF0ZWRTY3JvbGxpbmcpOwogCiBwcml2 YXRlOgogICAgIGZyaWVuZCBjbGFzcyBXZWJQYWdlUHJpdmF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlcl9wLmggYi9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oCmluZGV4IDA4MDc2NmEuLmRm OWM2YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25T Y3JvbGxlcl9wLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNj cm9sbGVyX3AuaApAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzY3JvbGxCeShj b25zdCBQbGF0Zm9ybTo6SW50U2l6ZSYgZGVsdGEpOwogCiAgICAgYm9vbCBzZXRTY3JvbGxQb3Np dGlvbkNvbXBvc2l0aW5nVGhyZWFkKHVuc2lnbmVkIGNhbW91ZmxhZ2VkTGF5ZXIsIGNvbnN0IFdl YkNvcmU6OkludFBvaW50JiBzY3JvbGxQb3NpdGlvbik7Ci0gICAgYm9vbCBzZXRTY3JvbGxQb3Np dGlvbldlYktpdFRocmVhZCh1bnNpZ25lZCBjYW1vdWZsYWdlZExheWVyLCBjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYgc2Nyb2xsUG9zaXRpb24pOworICAgIGJvb2wgc2V0U2Nyb2xsUG9zaXRpb25X ZWJLaXRUaHJlYWQodW5zaWduZWQgY2Ftb3VmbGFnZWRMYXllciwgY29uc3QgV2ViQ29yZTo6SW50 UG9pbnQmIHNjcm9sbFBvc2l0aW9uLCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRTY3JvbGxpbmcp OwogCiAgICAgdm9pZCBjYWxjdWxhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KGNv bnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAgY29uc3Qgc3RkOjp2ZWN0b3I8UGxhdGZvcm06 OlNjcm9sbFZpZXdCYXNlKj4mIGFjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzKCkgY29uc3Q7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAxMDU5MTgxLi4zODI2Mzg1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMi0wOC0yMyAg QW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBV bmlmeSBzbG93IGFuZCBmYXN0IGluLXJlZ2lvbiBzY3JvbGxpbmcgY29kZSBwYXRocworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQ4MzQKKyAgICAgICAg UFIgIzE5NzY2MgorCisgICAgICAgIFJldmlld2VkIGJ5IFJvYiBCdWlzLgorCisgICAgICAgIElu dGVybmFsbHkgcmV2aWV3ZWQgYnkgQXJ2aWQgTmlsc3Nvbi4KKworICAgICAgICBJbiBvcmRlciB0 byBiZSBhYmxlIHRvIHJlbW92ZSBhIGJ1bmNoIG9mIG9ic29sZXRlIGNvZGUgZnJvbQorICAgICAg ICBJblJlZ2lvblNjcm9sbGVyLmNwcCwgd2UgbmVlZCB0byB1bmlmeSB0aGUgY29kZXBhdGhzIGZv ciBzbG93CisgICAgICAgIGFuZCBmYXN0IGluLXJlZ2lvbiBzY3JvbGxpbmcuCisKKyAgICAgICAg VGhpcyBwYXRjaCBjYWNoZXMgdGhlIHJvb3Qgc2Nyb2xsYWJsZSBub2RlIG9mIGVhY2ggc2Nyb2xs YWJsZSBibG9jaworICAgICAgICBpbiBJblJlZ2lvblNjcm9sbGFibGVBcmVhIGFsc28gZm9yIHRo ZSBub24tY29tcG9zaXRlZC1zY3JvbGxpbmcgY2FzZSBub3cgdG9vCisgICAgICAgIChhbmFsb2ds eSB0byB0aGUgd2F5IHdlIGNhY2hlIExheWVyV2ViS2l0VGhyZWFkIGZvciB0aGUgY29tcG9zaXRl ZCBzY3JvbGxpbmcgY2FzZSkuCisKKyAgICAgICAgTm93IHRoZSBjbGllbnQgKGxpYndlYnZpZXcp IGNhbiBkaXNwYXRjaCBhbiBpbi1yZWdpb24gc2Nyb2xsaW5nIHdpdGggb25lIHNpbmdsZSBjb2Rl IHBhdGgsCisgICAgICAgIG1ha2luZyB1c2Ugb2YgYSBib29sZWFuIChhcmdoISkgdG8gaW5mb3Jt IGlmIHRoZSBzY3JvbGwgb2YgdGhlIGdpdmVuCisgICAgICAgIGxheWVyIHN1cHBvcnRzIGNvbXBv c2l0aW5nIG9yIG5vdC4gTGF0ZXIgb24sIHRoaXMgYm9vbGVhbiBpcyB1c2VkIHRvIGNhc3Rpbmcg dGhlIHByb3BlciBlbGVtZW50LgorCisgICAgICAgICogQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3Bw OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyOjpzZXRTY3Jv bGxQb3NpdGlvbldlYktpdFRocmVhZCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6Oklu UmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpzZXRTY3JvbGxQb3NpdGlvbldlYktpdFRocmVhZCk6Cisg ICAgICAgICogQXBpL0luUmVnaW9uU2Nyb2xsZXIuaDoKKyAgICAgICAgKiBBcGkvSW5SZWdpb25T Y3JvbGxlcl9wLmg6CisgICAgICAgIChJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZSk6CisgICAgICAg ICogV2ViS2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdl YktpdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xsYWJsZUFy ZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjplbmNsb3NpbmdMYXllck5vZGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5SZWdpb25T Y3JvbGxhYmxlQXJlYS5oOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJblJlZ2lvblNj cm9sbGFibGVBcmVhKToKKwogMjAxMi0wOC0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJp bS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIE1ha2UgYWxsIHBpY2tlcnMgbm9uLXpvb21h YmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9J blJlZ2lvblNjcm9sbGFibGVBcmVhLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwCmluZGV4IDQ0ZTdiNDkuLmYxMTQx YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu UmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuY3BwCkBAIC00Niw2ICs0NiwxNyBA QCBJblJlZ2lvblNjcm9sbGFibGVBcmVhOjp+SW5SZWdpb25TY3JvbGxhYmxlQXJlYSgpCiAgICAg ICAgIG1fY2FjaGVkQ29tcG9zaXRlZFNjcm9sbGFibGVMYXllci0+Y2xlYXJPdmVycmlkZSgpOwog fQogCisvLyBGSVhNRTogTWFrZSBSZW5kZXJMYXllcjo6ZW5jbG9zaW5nRWxlbWVudCBwdWJsaWMg c28gdGhpcyBvbmUgY2FuIGJlIHJlbW92ZWQuCitzdGF0aWMgTm9kZSogZW5jbG9zaW5nTGF5ZXJO b2RlKFJlbmRlckxheWVyKiBsYXllcikKK3sKKyAgICBmb3IgKFJlbmRlck9iamVjdCogciA9IGxh eWVyLT5yZW5kZXJlcigpOyByOyByID0gci0+cGFyZW50KCkpIHsKKyAgICAgICAgaWYgKE5vZGUq IGUgPSByLT5ub2RlKCkpCisgICAgICAgICAgICByZXR1cm4gZTsKKyAgICB9CisgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIDA7Cit9CisKIEluUmVnaW9uU2Nyb2xsYWJsZUFy ZWE6OkluUmVnaW9uU2Nyb2xsYWJsZUFyZWEoV2ViUGFnZVByaXZhdGUqIHdlYlBhZ2UsIFJlbmRl ckxheWVyKiBsYXllcikKICAgICA6IG1fd2ViUGFnZSh3ZWJQYWdlKQogICAgICwgbV9sYXllcihs YXllcikKQEAgLTkyLDExICsxMDMsMTcgQEAgSW5SZWdpb25TY3JvbGxhYmxlQXJlYTo6SW5SZWdp b25TY3JvbGxhYmxlQXJlYShXZWJQYWdlUHJpdmF0ZSogd2ViUGFnZSwgUmVuZGVyTGEKICAgICAg ICAgbV9zY3JvbGxzSG9yaXpvbnRhbGx5ID0gYm94LT5zY3JvbGxXaWR0aCgpICE9IGJveC0+Y2xp ZW50V2lkdGgoKSAmJiBib3gtPnNjcm9sbHNPdmVyZmxvd1goKTsKICAgICAgICAgbV9zY3JvbGxz VmVydGljYWxseSA9IGJveC0+c2Nyb2xsSGVpZ2h0KCkgIT0gYm94LT5jbGllbnRIZWlnaHQoKSAm JiBib3gtPnNjcm9sbHNPdmVyZmxvd1koKTsKIAorICAgICAgICAvLyBCb3RoIGNhY2hlcyBiZWxv dyBhcmUgc2VsZi1leGNsdXNpdmUuCiAgICAgICAgIGlmIChtX2xheWVyLT51c2VzQ29tcG9zaXRl ZFNjcm9sbGluZygpKSB7CiAgICAgICAgICAgICBtX3N1cHBvcnRzQ29tcG9zaXRlZFNjcm9sbGlu ZyA9IHRydWU7CiAgICAgICAgICAgICBBU1NFUlQobV9sYXllci0+YmFja2luZygpLT5oYXNTY3Jv bGxpbmdMYXllcigpKTsKICAgICAgICAgICAgIG1fY2Ftb3VmbGFnZWRDb21wb3NpdGVkU2Nyb2xs YWJsZUxheWVyID0gcmVpbnRlcnByZXRfY2FzdDx1bnNpZ25lZD4obV9sYXllci0+YmFja2luZygp LT5zY3JvbGxpbmdMYXllcigpLT5wbGF0Zm9ybUxheWVyKCkpOwogICAgICAgICAgICAgbV9jYWNo ZWRDb21wb3NpdGVkU2Nyb2xsYWJsZUxheWVyID0gbV9sYXllci0+YmFja2luZygpLT5zY3JvbGxp bmdMYXllcigpLT5wbGF0Zm9ybUxheWVyKCk7CisgICAgICAgICAgICBBU1NFUlQoIW1fY2FjaGVk Tm9uQ29tcG9zaXRlZFNjcm9sbGFibGVOb2RlKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIG1fY2Ftb3VmbGFnZWRDb21wb3NpdGVkU2Nyb2xsYWJsZUxheWVyID0gcmVpbnRlcnByZXRf Y2FzdDx1bnNpZ25lZD4oZW5jbG9zaW5nTGF5ZXJOb2RlKG1fbGF5ZXIpKTsKKyAgICAgICAgICAg IG1fY2FjaGVkTm9uQ29tcG9zaXRlZFNjcm9sbGFibGVOb2RlID0gZW5jbG9zaW5nTGF5ZXJOb2Rl KG1fbGF5ZXIpOworICAgICAgICAgICAgQVNTRVJUKCFtX2NhY2hlZENvbXBvc2l0ZWRTY3JvbGxh YmxlTGF5ZXIpOwogICAgICAgICB9CiAKICAgICAgICAgbV9vdmVyc2Nyb2xsTGltaXRGYWN0b3Ig PSAwLjA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2Vi S2l0U3VwcG9ydC9JblJlZ2lvblNjcm9sbGFibGVBcmVhLmgKaW5kZXggNjc5ZTQ5MC4uNDQzYjk0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5S ZWdpb25TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJL aXRTdXBwb3J0L0luUmVnaW9uU2Nyb2xsYWJsZUFyZWEuaApAQCAtMjUsNiArMjUsNyBAQAogCiBu YW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBMYXllcldlYktpdFRocmVhZDsKK2NsYXNzIE5vZGU7 CiBjbGFzcyBSZW5kZXJMYXllcjsKIH0KIApAQCAtNDksNyArNTAsMTAgQEAgcHJpdmF0ZToKICAg ICBXZWJQYWdlUHJpdmF0ZSogbV93ZWJQYWdlOwogICAgIFdlYkNvcmU6OlJlbmRlckxheWVyKiBt X2xheWVyOwogCisgICAgLy8gV2UgZWl0aGVyIGNhY2hlIG9uZSBoZXJlOiBpbiBjYXNlIG9mIGEg Y29tcG9zaXRlZCBzY3JvbGxhYmxlIGxheWVyCisgICAgLy8gY2FjaGUgdGhlIExheWVyV2ViS2l0 VGhyZWFkLiBPdGhlcndpc2UsIHRoZSBOb2RlLgogICAgIFJlZlB0cjxXZWJDb3JlOjpMYXllcldl YktpdFRocmVhZD4gbV9jYWNoZWRDb21wb3NpdGVkU2Nyb2xsYWJsZUxheWVyOworICAgIFJlZlB0 cjxXZWJDb3JlOjpOb2RlPiBtX2NhY2hlZE5vbkNvbXBvc2l0ZWRTY3JvbGxhYmxlTm9kZTsKIAog ICAgIGJvb2wgbV9oYXNXaW5kb3dWaXNpYmxlUmVjdENhbGN1bGF0ZWQ7CiB9OwotLSAKMS43LjUu NAoK