112259 2013-03-13 07:57:35 -0700 [BlackBerry] Touch Hold selection does not scroll text area or other subframe until selection reaches bottom of the page 2013-03-13 08:36:51 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 shuwu webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 854295 0 shuwu 2013-03-13 07:57:35 -0700 While selecting in a subframe, we have to check that the selection reaches the bottom of the current subframe instead of the page. 854305 1 192925 shuwu 2013-03-13 08:14:47 -0700 Created attachment 192925 Patch 854312 2 192925 rwlbuis 2013-03-13 08:25:21 -0700 Comment on attachment 192925 Patch LGTM. 854320 3 192925 webkit.review.bot 2013-03-13 08:36:48 -0700 Comment on attachment 192925 Patch Clearing flags on attachment: 192925 Committed r145720: <http://trac.webkit.org/changeset/145720> 854321 4 webkit.review.bot 2013-03-13 08:36:51 -0700 All reviewed patches have been landed. Closing bug. 192925 2013-03-13 08:14:47 -0700 2013-03-13 08:36:48 -0700 Patch 0001-2013-03-12-Iris-Wu-shuwu-blackberry.com.patch text/plain 9199 shuwu RnJvbSA2MWMxYjk4MThlOWRlZmZlNjM1YjcwOTY1N2U3NmEyMTU2NDgyOTlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJcmlzIFd1IDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KRGF0ZTog VHVlLCAxMiBNYXIgMjAxMyAxODowMToxMiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTMtMDMt MTIgIElyaXMgV3UgIDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgW0JsYWNrQmVycnld IFRvdWNoIEhvbGQgc2VsZWN0aW9uIGRvZXMgbm90IHNjcm9sbCB0ZXh0IGFyZWEgb3Igb3RoZXIg c3ViZnJhbWUgdW50aWwgc2VsZWN0aW9uIHJlYWNoZXMgYm90dG9tIG9mIHRoZSBwYWdlLgogICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIyNTkKCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFBSIDI2NzM5NAoKICAgICAg ICBXaGlsZSBzZWxlY3RpbmcgaW4gYSBzdWJmcmFtZSwgY2hlY2sgdGhhdCB0aGUgc2VsZWN0aW9u IHJlYWNoZXMKICAgICAgICB0aGUgYm90dG9tIG9mIHRoZSBjdXJyZW50IHN1YmZyYW1lIGluc3Rl YWQgb2YgdGhlIHBhZ2UuCgogICAgICAgIEludGVybmFsbHkgUmV2aWV3ZWQgYnkgR2VuZXZpZXZl IE1hay4KCiAgICAgICAgKiBBcGkvSW5SZWdpb25TY3JvbGxlci5jcHA6CiAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OnVwZGF0ZVNlbGVjdGlvblNj cm9sbFZpZXcpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcDoK ICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3RBdFBv aW50KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjplbnN1 cmVTZWxlY3RlZFRleHRWaXNpYmxlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxl Y3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25WaWV3cG9ydFJlY3QpOgogICAgICAgIChXZWJLaXQpOgog ICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OmV4cGFuZFNlbGVj dGlvblRvR3JhbnVsYXJpdHkpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5k bGVyLmg6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6c2V0 U2VsZWN0aW9uVmlld3BvcnRSZWN0KToKICAgICAgICAoU2VsZWN0aW9uSGFuZGxlcik6Ci0tLQog U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcCAgfCAgICA1 ICsrKy0KIFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg IHwgICAyNiArKysrKysrKysrKysrKysrKysKIC4uLi9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv U2VsZWN0aW9uSGFuZGxlci5jcHAgIHwgICAyOCArKysrKysrKysrKysrLS0tLS0tLQogLi4uL2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmggICAgfCAgICAzICsrKwog NCBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcAppbmRl eCBkMzllY2JkLi42ZDgxNzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv QXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvSW5SZWdpb25TY3JvbGxlci5jcHAKQEAgLTI5OSw3ICsyOTksMTAgQEAgdm9pZCBJblJlZ2lv blNjcm9sbGVyUHJpdmF0ZTo6dXBkYXRlU2VsZWN0aW9uU2Nyb2xsVmlldyhjb25zdCBOb2RlKiBu b2RlKQogewogICAgIC8vIFRPRE86IGRvbid0IG5vdGlmeSB0aGUgY2xpZW50IGlmIHRoZSBub2Rl IGRpZG4ndCBjaGFuZ2UuCiAgICAgLy8gRGVsZXRpbmcgdGhlIHNjcm9sbHZpZXcgaXMgaGFuZGxl ZCBieSB0aGUgY2xpZW50LgotICAgIG1fd2ViUGFnZS0+bV9jbGllbnQtPm5vdGlmeVNlbGVjdGlv blNjcm9sbFZpZXcoZmlyc3RTY3JvbGxhYmxlSW5SZWdpb25Gb3JOb2RlKG5vZGUpKTsKKyAgICBQ bGF0Zm9ybTo6U2Nyb2xsVmlld0Jhc2UqIHNlbGVjdGlvblNjcm9sbFZpZXcgPSBmaXJzdFNjcm9s bGFibGVJblJlZ2lvbkZvck5vZGUobm9kZSk7CisgICAgbV93ZWJQYWdlLT5tX2NsaWVudC0+bm90 aWZ5U2VsZWN0aW9uU2Nyb2xsVmlldyhzZWxlY3Rpb25TY3JvbGxWaWV3KTsKKyAgICAvLyBpZiB0 aGVyZSdzIG5vIHN1YmZyYW1lIHNldCBhbiBlbXB0eSByZWN0IHNvIHRoYXQgd2UgZGVmYXVsdCB0 byB0aGUgbWFpbiBmcmFtZS4KKyAgICBtX3dlYlBhZ2UtPm1fc2VsZWN0aW9uSGFuZGxlci0+c2V0 U2VsZWN0aW9uVmlld3BvcnRSZWN0KHNlbGVjdGlvblNjcm9sbFZpZXcgPyBXZWJDb3JlOjpJbnRS ZWN0KHNlbGVjdGlvblNjcm9sbFZpZXctPmRvY3VtZW50Vmlld3BvcnRSZWN0KCkpIDogV2ViQ29y ZTo6SW50UmVjdCgpKTsKIH0KIAogUGxhdGZvcm06OlNjcm9sbFZpZXdCYXNlKiBJblJlZ2lvblNj cm9sbGVyUHJpdmF0ZTo6Zmlyc3RTY3JvbGxhYmxlSW5SZWdpb25Gb3JOb2RlKGNvbnN0IE5vZGUq IG5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCAwNDI2NGE4Li4xMmIzZTZl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMy0w My0xMyAgSXJpcyBXdSAgPHNodXd1QGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBUb3VjaCBIb2xkIHNlbGVjdGlvbiBkb2VzIG5vdCBzY3JvbGwgdGV4dCBhcmVhIG9yIG90 aGVyIHN1YmZyYW1lIHVudGlsIHNlbGVjdGlvbiByZWFjaGVzIGJvdHRvbSBvZiB0aGUgcGFnZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjI1OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDI2NzM5 NAorCisgICAgICAgIFdoaWxlIHNlbGVjdGluZyBpbiBhIHN1YmZyYW1lLCBjaGVjayB0aGF0IHRo ZSBzZWxlY3Rpb24gcmVhY2hlcworICAgICAgICB0aGUgYm90dG9tIG9mIHRoZSBjdXJyZW50IHN1 YmZyYW1lIGluc3RlYWQgb2YgdGhlIHBhZ2UuCisKKyAgICAgICAgSW50ZXJuYWxseSBSZXZpZXdl ZCBieSBHZW5ldmlldmUgTWFrLgorCisgICAgICAgICogQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3Bw OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6 dXBkYXRlU2VsZWN0aW9uU2Nyb2xsVmlldyk6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9TZWxl Y3Rpb25IYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0aW9u SGFuZGxlcjo6c2VsZWN0QXRQb2ludCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlNl bGVjdGlvbkhhbmRsZXI6OmVuc3VyZVNlbGVjdGVkVGV4dFZpc2libGUpOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3Rpb25WaWV3cG9ydFJlY3Qp OgorICAgICAgICAoV2ViS2l0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0 aW9uSGFuZGxlcjo6ZXhwYW5kU2VsZWN0aW9uVG9HcmFudWxhcml0eSk6CisgICAgICAgICogV2Vi S2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmg6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJL aXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNldFNlbGVjdGlvblZpZXdwb3J0UmVjdCk6CisgICAgICAg IChTZWxlY3Rpb25IYW5kbGVyKToKKwogMjAxMy0wMy0xMiAgTWlrZSBGZW50b24gIDxtaWZlbnRv bkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBQcmV2ZW50IHRleHQgc2VsZWN0aW9u IGluc2lkZSBDb2xvdXIgYW5kIERhdGUvVGltZSBpbnB1dCBmaWVsZHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3Bw IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxl ci5jcHAKaW5kZXggOGY3NTg5ZS4uNGRhZjVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKKysrIGIvU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKQEAg LTY0MCw2ICs2NDAsNyBAQCB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdEF0UG9pbnQoY29u c3QgV2ViQ29yZTo6SW50UG9pbnQmIGxvY2F0aW9uLCBTZWxlY3RpbwogICAgICAgICBtX2FuaW1h dGlvbk92ZXJsYXlFbmRQb3MgPSBWaXNpYmxlUG9zaXRpb24oKTsKICAgICAgICAgbV9jdXJyZW50 QW5pbWF0aW9uT3ZlcmxheVJlZ2lvbiA9IEludFJlY3RSZWdpb24oKTsKICAgICAgICAgbV9uZXh0 QW5pbWF0aW9uT3ZlcmxheVJlZ2lvbiA9IEludFJlY3RSZWdpb24oKTsKKyAgICAgICAgbV9zZWxl Y3Rpb25WaWV3cG9ydFJlY3QgPSBXZWJDb3JlOjpJbnRSZWN0KCk7CiAgICAgfQogCiAgICAgLy8g SWYgcG9pbnQgaXMgaW52YWxpZCB0cmlnZ2VyIHNlbGVjdGlvbiBiYXNlZCBleHBhbnNpb24uCkBA IC03NzksMTIgKzc4MCw5IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6ZXhwYW5kU2VsZWN0aW9u KGJvb2wgaXNTY3JvbGxTdGFydGVkKQogCiBib29sIFNlbGVjdGlvbkhhbmRsZXI6OmVuc3VyZVNl bGVjdGVkVGV4dFZpc2libGUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCBib29sIHNj cm9sbElmTmVlZGVkKQogewotICAgIFdlYkNvcmU6OkludFBvaW50IHNjcm9sbFBvc2l0aW9uID0g bV93ZWJQYWdlLT5zY3JvbGxQb3NpdGlvbigpOwotICAgIFdlYkNvcmU6OkludFNpemUgYWN0dWFs VmlzaWJsZVNpemUgPSBtX3dlYlBhZ2UtPmNsaWVudCgpLT51c2VySW50ZXJmYWNlVmlld3BvcnRB Y2Nlc3NvcigpLT5kb2N1bWVudFZpZXdwb3J0UmVjdCgpLnNpemUoKTsgLy8gdmlld3BvcnQgc2l6 ZSBmb3IgYm90aCBDYXNjYWRlcyBhbmQgYnJvd3NlcgotICAgIFdlYkNvcmU6OkludFJlY3QgYWN0 dWFsU2NyZWVuUmVjdCA9IFdlYkNvcmU6OkludFJlY3Qoc2Nyb2xsUG9zaXRpb24sIGFjdHVhbFZp c2libGVTaXplKTsKLQorICAgIFdlYkNvcmU6OkludFJlY3Qgdmlld3BvcnRSZWN0ID0gc2VsZWN0 aW9uVmlld3BvcnRSZWN0KCk7CiAgICAgaWYgKCFzY3JvbGxJZk5lZWRlZCkKLSAgICAgICAgcmV0 dXJuIGFjdHVhbFNjcmVlblJlY3QubWF4WSgpID49IHBvaW50LnkoKSArIG1fc2Nyb2xsTWFyZ2lu LmhlaWdodCgpOworICAgICAgICByZXR1cm4gdmlld3BvcnRSZWN0Lm1heFkoKSA+PSBwb2ludC55 KCkgKyBtX3Njcm9sbE1hcmdpbi5oZWlnaHQoKTsKIAogICAgIFdlYkNvcmU6OkludFJlY3QgZW5k TG9jYXRpb24gPSBtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MuYWJzb2x1dGVDYXJldEJvdW5kcygp OwogCkBAIC04MDUsNyArODAzLDkgQEAgYm9vbCBTZWxlY3Rpb25IYW5kbGVyOjplbnN1cmVTZWxl Y3RlZFRleHRWaXNpYmxlKGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwKICAgICBlbmRM b2NhdGlvbi5pbmZsYXRlWChtX3Njcm9sbE1hcmdpbi53aWR0aCgpKTsKICAgICBlbmRMb2NhdGlv bi5pbmZsYXRlWShtX3Njcm9sbE1hcmdpbi5oZWlnaHQoKSk7CiAKLSAgICBXZWJDb3JlOjpJbnRS ZWN0IHJldmVhbFJlY3QobGF5ZXItPmdldFJlY3RUb0V4cG9zZShhY3R1YWxTY3JlZW5SZWN0LCBl bmRMb2NhdGlvbiwgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBTY3JvbGxB bGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQpKTsKKyAgICAvLyBGSVhNRTogVGhlIHNjcm9s bCBwb3NpdGlvbiBhZGp1c3RtZW50IGhlcmUgaXMgYmFzZWQgb24gbWFpbiBmcmFtZS4KKyAgICAv LyBJZiBzZWxlY3RpbmcgaW4gYSBzdWJmcmFtZSwgZG9uJ3QgZG8gYW5pbWF0aW9uLgorICAgIFdl YkNvcmU6OkludFJlY3QgcmV2ZWFsUmVjdChsYXllci0+Z2V0UmVjdFRvRXhwb3NlKHZpZXdwb3J0 UmVjdCwgZW5kTG9jYXRpb24sIFNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwg U2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkKSk7CiAgICAgcmV2ZWFsUmVjdC5z ZXRYKHN0ZDo6bWluKHN0ZDo6bWF4KHJldmVhbFJlY3QueCgpLCAwKSwgbV93ZWJQYWdlLT5tYXhp bXVtU2Nyb2xsUG9zaXRpb24oKS54KCkpKTsKICAgICByZXZlYWxSZWN0LnNldFkoc3RkOjptaW4o c3RkOjptYXgocmV2ZWFsUmVjdC55KCksIDApLCBtX3dlYlBhZ2UtPm1heGltdW1TY3JvbGxQb3Np dGlvbigpLnkoKSkpOwogCkBAIC04MTQsNiArODE0LDE2IEBAIGJvb2wgU2VsZWN0aW9uSGFuZGxl cjo6ZW5zdXJlU2VsZWN0ZWRUZXh0VmlzaWJsZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9p bnQsCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK1dlYkNvcmU6OkludFJlY3QgU2VsZWN0aW9uSGFu ZGxlcjo6c2VsZWN0aW9uVmlld3BvcnRSZWN0KCkgY29uc3QKK3sKKyAgICBpZiAobV9zZWxlY3Rp b25WaWV3cG9ydFJlY3QuaXNFbXB0eSgpKSB7CisgICAgICAgIFdlYkNvcmU6OkludFBvaW50IHNj cm9sbFBvc2l0aW9uID0gbV93ZWJQYWdlLT5zY3JvbGxQb3NpdGlvbigpOworICAgICAgICBXZWJD b3JlOjpJbnRTaXplIGFjdHVhbFZpc2libGVTaXplID0gbV93ZWJQYWdlLT5jbGllbnQoKS0+dXNl ckludGVyZmFjZVZpZXdwb3J0QWNjZXNzb3IoKS0+ZG9jdW1lbnRWaWV3cG9ydFJlY3QoKS5zaXpl KCk7IC8vIHZpZXdwb3J0IHNpemUgZm9yIGJvdGggQ2FzY2FkZXMgYW5kIGJyb3dzZXIKKyAgICAg ICAgcmV0dXJuIFdlYkNvcmU6OkludFJlY3Qoc2Nyb2xsUG9zaXRpb24sIGFjdHVhbFZpc2libGVT aXplKTsKKyAgICB9CisgICAgcmV0dXJuIG1fc2VsZWN0aW9uVmlld3BvcnRSZWN0OworfQorCiB2 b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNldFBhcmFncmFwaEV4cGFuc2lvblNjcm9sbE1hcmdpbihj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBzY3JvbGxNYXJnaW4pCiB7CiAgICAgbV9zY3JvbGxNYXJn aW4uc2V0V2lkdGgoc2Nyb2xsTWFyZ2luLndpZHRoKCkpOwpAQCAtODQxLDYgKzg1MSw4IEBAIGJv b2wgU2VsZWN0aW9uSGFuZGxlcjo6ZXhwYW5kU2VsZWN0aW9uVG9HcmFudWxhcml0eShGcmFtZSog ZnJhbWUsIFZpc2libGVTZWxlY3RpCiAgICAgbV9hbmltYXRpb25PdmVybGF5RW5kUG9zID0gc2Vs ZWN0aW9uLnZpc2libGVFbmQoKTsKIAogICAgIGlmIChncmFudWxhcml0eSA9PSBXb3JkR3JhbnVs YXJpdHkpIHsKKyAgICAgICAgbV93ZWJQYWdlLT51cGRhdGVTZWxlY3Rpb25TY3JvbGxWaWV3KHNl bGVjdGlvbi52aXNpYmxlRW5kKCkuZGVlcEVxdWl2YWxlbnQoKS5hbmNob3JOb2RlKCkpOworCiAg ICAgICAgIEVsZW1lbnQqIGVsZW1lbnQgPSBtX2FuaW1hdGlvbk92ZXJsYXlTdGFydFBvcy5kZWVw RXF1aXZhbGVudCgpLmVsZW1lbnQoKTsKICAgICAgICAgaWYgKCFlbGVtZW50KQogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwpAQCAtODUyLDEwICs4NjQsNiBAQCBib29sIFNlbGVjdGlvbkhhbmRs ZXI6OmV4cGFuZFNlbGVjdGlvblRvR3JhbnVsYXJpdHkoRnJhbWUqIGZyYW1lLCBWaXNpYmxlU2Vs ZWN0aQogICAgIGZyYW1lLT5zZWxlY3Rpb24oKS0+c2V0U2VsZWN0aW9uKHNlbGVjdGlvbik7CiAg ICAgaWYgKGdyYW51bGFyaXR5ID09IFBhcmFncmFwaEdyYW51bGFyaXR5KQogICAgICAgICBmaW5k TmV4dEFuaW1hdGlvbk92ZXJsYXlSZWdpb24oKTsKLQotICAgIGlmIChncmFudWxhcml0eSA9PSBX b3JkR3JhbnVsYXJpdHkpCi0gICAgICAgIG1fd2ViUGFnZS0+dXBkYXRlU2VsZWN0aW9uU2Nyb2xs VmlldyhzZWxlY3Rpb24udmlzaWJsZUVuZCgpLmRlZXBFcXVpdmFsZW50KCkuYW5jaG9yTm9kZSgp KTsKLQogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmggYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmgKaW5kZXggMDkyY2Fi Zi4uY2E4ZjIwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1 cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9X ZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuaApAQCAtODAsNiArODAsOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBleHBhbmRTZWxlY3Rpb24oYm9vbCBpc1Njcm9sbFN0YXJ0ZWQpOwogICAgIHZv aWQgc2V0T3ZlcmxheUV4cGFuc2lvbkhlaWdodChpbnQgZHkpIHsgbV9vdmVybGF5RXhwYW5zaW9u SGVpZ2h0ID0gZHk7IH0KICAgICB2b2lkIHNldFBhcmFncmFwaEV4cGFuc2lvblNjcm9sbE1hcmdp bihjb25zdCBXZWJDb3JlOjpJbnRTaXplJik7CisgICAgdm9pZCBzZXRTZWxlY3Rpb25WaWV3cG9y dFJlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgc2VsZWN0aW9uVmlld3BvcnRSZWN0KSB7IG1f c2VsZWN0aW9uVmlld3BvcnRSZWN0ID0gc2VsZWN0aW9uVmlld3BvcnRSZWN0OyB9CisgICAgV2Vi Q29yZTo6SW50UmVjdCBzZWxlY3Rpb25WaWV3cG9ydFJlY3QoKSBjb25zdDsKIAogcHJpdmF0ZToK ICAgICB2b2lkIG5vdGlmeUNhcmV0UG9zaXRpb25DaGFuZ2VkSWZOZWVkZWQoYm9vbCB1c2VyVG91 Y2hUcmlnZ2VyZWQgPSB0cnVlKTsKQEAgLTEyMiw2ICsxMjQsNyBAQCBwcml2YXRlOgogICAgIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpTdG9wV2F0Y2ggbV90aW1lcjsKIAogICAgIFdlYkNvcmU6Oklu dFNpemUgbV9zY3JvbGxNYXJnaW47CisgICAgV2ViQ29yZTo6SW50UmVjdCBtX3NlbGVjdGlvblZp ZXdwb3J0UmVjdDsKICAgICBXZWJDb3JlOjpWaXNpYmxlU2VsZWN0aW9uIG1fbGFzdFNlbGVjdGlv bjsKIH07CiAKLS0gCjEuNy45LjUKCg==