112061 2013-03-11 13:45:20 -0700 [BlackBerry] Add a method to find the ScrollView for a text selection. 2013-03-11 15:28:04 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 gmak webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 852678 0 gmak 2013-03-11 13:45:20 -0700 Refactor the code in InRegionScroller so that we can add a method to find the InRegionScrollableArea for a text selection. 852682 1 192548 gmak 2013-03-11 13:53:36 -0700 Created attachment 192548 Patch with changelog 852722 2 192548 rwlbuis 2013-03-11 14:20:02 -0700 Comment on attachment 192548 Patch with changelog LGTM. 852785 3 192548 webkit.review.bot 2013-03-11 15:28:01 -0700 Comment on attachment 192548 Patch with changelog Clearing flags on attachment: 192548 Committed r145415: <http://trac.webkit.org/changeset/145415> 852786 4 webkit.review.bot 2013-03-11 15:28:04 -0700 All reviewed patches have been landed. Closing bug. 192548 2013-03-11 13:53:36 -0700 2013-03-11 15:28:01 -0700 Patch with changelog 0001-2013-03-11-Genevieve-Mak-gmak-rim.com.patch text/plain 12385 gmak RnJvbSBkN2E3ZDgxNDgyZmQ1MGM3MzU5MjZiZmZkNmM5ZGE2N2UyMDI3MmI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHZW5ldmlldmUgTWFrIDxnbWFrQHJpbS5jb20+CkRhdGU6IFRo dSwgMjEgRmViIDIwMTMgMTc6MjY6MTcgLTA1MDAKU3ViamVjdDogW1BBVENIXSAyMDEzLTAzLTEx ICBHZW5ldmlldmUgTWFrICA8Z21ha0ByaW0uY29tPgoKICAgICAgICBbQmxhY2tCZXJyeV0gQWRk IGEgbWV0aG9kIHRvIGZpbmQgdGhlIFNjcm9sbFZpZXcgZm9yIGEgdGV4dCBzZWxlY3Rpb24uCiAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjA2MQoKICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgSW50ZXJuYWxseSByZXZp ZXdlZCBieSBNaWtlIEZlbnRvbiBhbmQgSmFrb2IgUGV0c292aXRzLgogICAgICAgIFBSICMyNzg0 OTAKCiAgICAgICAgUmVmYWN0b3IgdGhlIGNvZGUgaW4gSW5SZWdpb25TY3JvbGxlciBzbyB0aGF0 IHdlIGNhbiBhZGQgYSBtZXRob2QgdG8gZmluZAogICAgICAgIHRoZSBJblJlZ2lvblNjcm9sbGFi bGVBcmVhIGZvciBhIHRleHQgc2VsZWN0aW9uLgoKICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9s bGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyUHJp dmF0ZTo6Y2xpcFRvUmVjdCk6CiAgICAgICAgICAgIC0gUHVsbCBvdXQgcmVjdXJzaXZlIGNsaXBw aW5nIGNvZGUgaW50byBpdHMgb3duIGZ1bmN0aW9uLgogICAgICAgIChXZWJLaXQpOgogICAgICAg IChCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjYWxjdWxhdGVJ blJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6Zmlyc3RTY3JvbGxhYmxlSW5SZWdpb25Gb3JO b2RlKToKICAgICAgICAgICAgLSBUaGlzIG5ldyBtZXRob2QgYWxsb3dzIHVzIHRvIGdldCBqdXN0 IHRoZSBmaXJzdCBzY3JvbGxhYmxlIHJlZ2lvbiBpbnN0ZWFkIG9mIGxvb2tpbmcKICAgICAgICAg ICAgICBmb3IgbW9yZSBuZXN0ZWQgb25lcy4gV2UgbWF5IHdhbnQgdG8gcmVmYWN0b3IgaW4gdGhl IGZ1dHVyZSBiZWNhdXNlIHNvbWUgb2YgdGhlIGNvZGUgaXMKICAgICAgICAgICAgICB2ZXJ5IHNp bWlsYXIgdG8gY2FsY3VsYXRlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXNGb3JQb2ludC4KICAgICAg ICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6Y2xpcEFuZENy ZWF0ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWEpOgogICAgICAgICAgICAtIEFkZCBhIGNvbnZlbmll bmNlIG1ldGhvZCBmb3IgdGhlIHByZXZpb3VzIGZ1bmN0aW9uCiAgICAgICAgKiBBcGkvSW5SZWdp b25TY3JvbGxlci5oOgogICAgICAgIChXZWJLaXQpOgogICAgICAgICogQXBpL0luUmVnaW9uU2Ny b2xsZXJfcC5oOgogICAgICAgIChJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZSk6Ci0tLQogU291cmNl L1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcCB8ICAxMDUgKysrKysr KysrKysrKysrLS0tLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Ny b2xsZXIuaCAgIHwgICAgMiArCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9u U2Nyb2xsZXJfcC5oIHwgICAgMyArCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n ICAgICAgICAgICAgICAgIHwgICAyOSArKysrKysKIDQgZmlsZXMgY2hhbmdlZCwgMTExIGluc2Vy dGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVy cnkvQXBpL0luUmVnaW9uU2Nyb2xsZXIuY3BwCmluZGV4IDMwZmU3ZDguLjMyOTU1NmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5jcHAK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyLmNwcApA QCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgUmVzZWFyY2gg SW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMp IDIwMTEsIDIwMTIsIDIwMTMgUmVzZWFyY2ggSW4gTW90aW9uIExpbWl0ZWQuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAgKgogICogVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g cmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0 aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwpAQCAtMjAzLDYgKzIwMywzNCBAQCB2b2lkIElu UmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjYWxjdWxhdGVBY3RpdmVBbmRTaHJpbmtDYWNoZWRTY3Jv bGxhYmxlQXJlYXMoUmVuZAogICAgIG1fbmVlZHNBY3RpdmVTY3JvbGxhYmxlQXJlYUNhbGN1bGF0 aW9uID0gZmFsc2U7CiB9CiAKK1dlYkNvcmU6OkludFJlY3QgSW5SZWdpb25TY3JvbGxlclByaXZh dGU6OmNsaXBUb1JlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xpcHBpbmdSZWN0LCBJblJl Z2lvblNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlKQoreworICAgIFJlbmRlckxheWVyKiBsYXll ciA9IHNjcm9sbGFibGUtPmxheWVyKCk7CisgICAgaWYgKCFsYXllcikKKyAgICAgICAgcmV0dXJu IGNsaXBwaW5nUmVjdDsKKworICAgIGlmIChsYXllci0+cmVuZGVyZXIoKS0+aXNSZW5kZXJWaWV3 KCkpIHsgLy8gI2RvY3VtZW50IGNhc2UKKyAgICAgICAgRnJhbWVWaWV3KiB2aWV3ID0gdG9SZW5k ZXJWaWV3KGxheWVyLT5yZW5kZXJlcigpKS0+ZnJhbWVWaWV3KCk7CisgICAgICAgIEFTU0VSVCh2 aWV3KTsKKyAgICAgICAgQVNTRVJUKGNhblNjcm9sbElubmVyRnJhbWUodmlldy0+ZnJhbWUoKSkp OworCisgICAgICAgIFdlYkNvcmU6OkludFJlY3QgZnJhbWVXaW5kb3dSZWN0ID0gbV93ZWJQYWdl LT5tYXBUb1RyYW5zZm9ybWVkKG1fd2ViUGFnZS0+Z2V0UmVjdXJzaXZlVmlzaWJsZVdpbmRvd1Jl Y3QodmlldykpOworICAgICAgICBmcmFtZVdpbmRvd1JlY3QuaW50ZXJzZWN0KGNsaXBwaW5nUmVj dCk7CisgICAgICAgIHJldHVybiBmcmFtZVdpbmRvd1JlY3Q7CisgICAgfQorCisgICAgUmVuZGVy Qm94KiBib3ggPSBsYXllci0+cmVuZGVyQm94KCk7CisgICAgQVNTRVJUKGJveCk7CisgICAgQVNT RVJUKGNhblNjcm9sbFJlbmRlckJveChib3gpKTsKKworICAgIC8vIFdlIHdhbnQgdGhlIHdpbmRv dyByZWN0IGluIHBpeGVsIHZpZXdwb3J0IGNvb3JkaW5hdGVzIGNsaXBwZWQgdG8gdGhlIGNsaXBw aW5nIHJlY3QuCisgICAgV2ViQ29yZTo6SW50UmVjdCB2aXNpYmxlV2luZG93UmVjdCA9IGVuY2xv c2luZ0ludFJlY3QoYm94LT5hYnNvbHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKSk7CisgICAgdmlz aWJsZVdpbmRvd1JlY3QgPSBib3gtPmZyYW1lKCktPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyh2 aXNpYmxlV2luZG93UmVjdCk7CisgICAgdmlzaWJsZVdpbmRvd1JlY3QgPSBtX3dlYlBhZ2UtPm1h cFRvVHJhbnNmb3JtZWQodmlzaWJsZVdpbmRvd1JlY3QpOworICAgIHZpc2libGVXaW5kb3dSZWN0 LmludGVyc2VjdChjbGlwcGluZ1JlY3QpOworICAgIHJldHVybiB2aXNpYmxlV2luZG93UmVjdDsK K30KKwogdm9pZCBJblJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6Y2FsY3VsYXRlSW5SZWdpb25TY3Jv bGxhYmxlQXJlYXNGb3JQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgZG9jdW1lbnRQb2lu dCkKIHsKICAgICBBU1NFUlQobV9hY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcy5lbXB0eSgp KTsKQEAgLTIxNiwxMCArMjQ0LDEyIEBAIHZvaWQgSW5SZWdpb25TY3JvbGxlclByaXZhdGU6OmNh bGN1bGF0ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzRm9yUG9pbnQoY29uc3QgV2ViCiAgICAgUmVu ZGVyTGF5ZXIqIGxheWVyID0gbm9kZS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKTsKICAg ICBpZiAoIWxheWVyKQogICAgICAgICByZXR1cm47CisKICAgICBkbyB7CisKICAgICAgICAgUmVu ZGVyT2JqZWN0KiByZW5kZXJlciA9IGxheWVyLT5yZW5kZXJlcigpOwogCi0gICAgICAgIGlmIChy ZW5kZXJlci0+aXNSZW5kZXJWaWV3KCkpIHsKKyAgICAgICAgaWYgKHJlbmRlcmVyICYmIHJlbmRl cmVyLT5pc1JlbmRlclZpZXcoKSkgewogICAgICAgICAgICAgaWYgKFJlbmRlclZpZXcqIHJlbmRl clZpZXcgPSB0b1JlbmRlclZpZXcocmVuZGVyZXIpKSB7CiAgICAgICAgICAgICAgICAgRnJhbWVW aWV3KiB2aWV3ID0gcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7CiAgICAgICAgICAgICAgICAgaWYg KCF2aWV3KSB7CkBAIC0yNTgsMzkgKzI4OCw1OCBAQCB2b2lkIEluUmVnaW9uU2Nyb2xsZXJQcml2 YXRlOjpjYWxjdWxhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KGNvbnN0IFdlYgog ICAgIC8vIHdlIGFjY291bnQgZm9yIGFsbCBhbmQgYW55IGNsaXBwaW5nIHJlY3RzLgogICAgIFdl YkNvcmU6OkludFJlY3QgcmVjdXJzaXZlQ2xpcHBpbmdSZWN0KFdlYkNvcmU6OkludFBvaW50Ojp6 ZXJvKCksIG1fd2ViUGFnZS0+dHJhbnNmb3JtZWRWaWV3cG9ydFNpemUoKSk7CiAKLSAgICBzdGQ6 OnZlY3RvcjxQbGF0Zm9ybTo6U2Nyb2xsVmlld0Jhc2UqPjo6cmV2ZXJzZV9pdGVyYXRvciByZW5k ID0gbV9hY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVhcy5yZW5kKCk7Ci0gICAgZm9yIChzdGQ6 OnZlY3RvcjxQbGF0Zm9ybTo6U2Nyb2xsVmlld0Jhc2UqPjo6cmV2ZXJzZV9pdGVyYXRvciByaXQg PSBtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzLnJiZWdpbigpOyByaXQgIT0gcmVuZDsg KytyaXQpIHsKLQotICAgICAgICBJblJlZ2lvblNjcm9sbGFibGVBcmVhKiBjdXJyID0gc3RhdGlj X2Nhc3Q8SW5SZWdpb25TY3JvbGxhYmxlQXJlYSo+KCpyaXQpOwotICAgICAgICBSZW5kZXJMYXll ciogbGF5ZXIgPSBjdXJyLT5sYXllcigpOwotICAgICAgICBpZiAoIWxheWVyKQotICAgICAgICAg ICAgY29udGludWU7CisgICAgZm9yIChpbnQgaSA9IG1fYWN0aXZlSW5SZWdpb25TY3JvbGxhYmxl QXJlYXMuc2l6ZSgpIC0gMTsgaSA+PSAwOyAtLWkpIHsKKyAgICAgICAgSW5SZWdpb25TY3JvbGxh YmxlQXJlYSogc2Nyb2xsYWJsZSA9IHN0YXRpY19jYXN0PEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEq PihtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzW2ldKTsKKyAgICAgICAgc2Nyb2xsYWJs ZS0+c2V0VmlzaWJsZVdpbmRvd1JlY3QoY2xpcFRvUmVjdChyZWN1cnNpdmVDbGlwcGluZ1JlY3Qs IHNjcm9sbGFibGUpKTsKKyAgICAgICAgcmVjdXJzaXZlQ2xpcHBpbmdSZWN0ID0gc2Nyb2xsYWJs ZS0+dmlzaWJsZVdpbmRvd1JlY3QoKTsKKyAgICB9Cit9CiAKLSAgICAgICAgaWYgKGxheWVyLT5y ZW5kZXJlcigpLT5pc1JlbmRlclZpZXcoKSkgeyAvLyAjZG9jdW1lbnQgY2FzZQotICAgICAgICAg ICAgRnJhbWVWaWV3KiB2aWV3ID0gdG9SZW5kZXJWaWV3KGxheWVyLT5yZW5kZXJlcigpKS0+ZnJh bWVWaWV3KCk7Ci0gICAgICAgICAgICBBU1NFUlQodmlldyk7Ci0gICAgICAgICAgICBBU1NFUlQo Y2FuU2Nyb2xsSW5uZXJGcmFtZSh2aWV3LT5mcmFtZSgpKSk7CitQbGF0Zm9ybTo6U2Nyb2xsVmll d0Jhc2UqIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpmaXJzdFNjcm9sbGFibGVJblJlZ2lvbkZv ck5vZGUoY29uc3QgTm9kZSogbm9kZSkKK3sKKyAgICBpZiAoIW5vZGUgfHwgIW5vZGUtPnJlbmRl cmVyKCkpCisgICAgICAgIHJldHVybiAwOwogCi0gICAgICAgICAgICBXZWJDb3JlOjpJbnRSZWN0 IGZyYW1lV2luZG93UmVjdCA9IG1fd2ViUGFnZS0+bWFwVG9UcmFuc2Zvcm1lZChtX3dlYlBhZ2Ut PmdldFJlY3Vyc2l2ZVZpc2libGVXaW5kb3dSZWN0KHZpZXcpKTsKLSAgICAgICAgICAgIGZyYW1l V2luZG93UmVjdC5pbnRlcnNlY3QocmVjdXJzaXZlQ2xpcHBpbmdSZWN0KTsKLSAgICAgICAgICAg IGN1cnItPnNldFZpc2libGVXaW5kb3dSZWN0KGZyYW1lV2luZG93UmVjdCk7Ci0gICAgICAgICAg ICByZWN1cnNpdmVDbGlwcGluZ1JlY3QgPSBmcmFtZVdpbmRvd1JlY3Q7CisgICAgUmVuZGVyTGF5 ZXIqIGxheWVyID0gbm9kZS0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKTsKKyAgICBpZiAo IWxheWVyKQorICAgICAgICByZXR1cm4gMDsKKyAgICBkbyB7CisgICAgICAgIFJlbmRlck9iamVj dCogcmVuZGVyZXIgPSBsYXllci0+cmVuZGVyZXIoKTsKIAotICAgICAgICB9IGVsc2UgeyAvLyBS ZW5kZXJCb3gtYmFzZWQgZWxlbWVudHMgY2FzZSAoc2Nyb2xsYWJsZSBib3hlcyAoZGl2J3MsIHAn cywgdGV4dGFyZWEncywgZXRjKSkuCisgICAgICAgIGlmIChyZW5kZXJlci0+aXNSZW5kZXJWaWV3 KCkpIHsKKyAgICAgICAgICAgIGlmIChSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdG9SZW5kZXJW aWV3KHJlbmRlcmVyKSkgeworICAgICAgICAgICAgICAgIEZyYW1lVmlldyogdmlldyA9IHJlbmRl clZpZXctPmZyYW1lVmlldygpOworICAgICAgICAgICAgICAgIGlmICghdmlldykgeworICAgICAg ICAgICAgICAgICAgICByZXNldCgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIFJlbmRlckJveCogYm94ID0gbGF5ZXItPnJl bmRlckJveCgpOwotICAgICAgICAgICAgQVNTRVJUKGJveCk7Ci0gICAgICAgICAgICBBU1NFUlQo Y2FuU2Nyb2xsUmVuZGVyQm94KGJveCkpOworICAgICAgICAgICAgICAgIGlmICghcmVuZGVyVmll dy0+Y29tcG9zaXRvcigpLT5zY3JvbGxMYXllcigpKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKIAotICAgICAgICAgICAgV2ViQ29yZTo6SW50UmVjdCB2aXNpYmxlV2luZG93UmVjdCA9 IGVuY2xvc2luZ0ludFJlY3QoYm94LT5hYnNvbHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKSk7Ci0g ICAgICAgICAgICB2aXNpYmxlV2luZG93UmVjdCA9IGJveC0+ZnJhbWUoKS0+dmlldygpLT5jb250 ZW50c1RvV2luZG93KHZpc2libGVXaW5kb3dSZWN0KTsKLSAgICAgICAgICAgIHZpc2libGVXaW5k b3dSZWN0ID0gbV93ZWJQYWdlLT5tYXBUb1RyYW5zZm9ybWVkKHZpc2libGVXaW5kb3dSZWN0KTsK LSAgICAgICAgICAgIHZpc2libGVXaW5kb3dSZWN0LmludGVyc2VjdChyZWN1cnNpdmVDbGlwcGlu Z1JlY3QpOworICAgICAgICAgICAgICAgIGlmIChjYW5TY3JvbGxJbm5lckZyYW1lKHZpZXctPmZy YW1lKCkpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gY2xpcEFuZENyZWF0ZUluUmVnaW9u U2Nyb2xsYWJsZUFyZWEobGF5ZXIpOworICAgICAgICAgICAgfQorICAgICAgICB9IGVsc2UgaWYg KGNhblNjcm9sbFJlbmRlckJveChsYXllci0+cmVuZGVyQm94KCkpKQorICAgICAgICAgICAgcmV0 dXJuIGNsaXBBbmRDcmVhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhKGxheWVyKTsKIAotICAgICAg ICAgICAgY3Vyci0+c2V0VmlzaWJsZVdpbmRvd1JlY3QodmlzaWJsZVdpbmRvd1JlY3QpOwotICAg ICAgICAgICAgcmVjdXJzaXZlQ2xpcHBpbmdSZWN0ID0gdmlzaWJsZVdpbmRvd1JlY3Q7CisgICAg ICAgIC8vIElmIHdlIHJ1biBpbnRvIGEgZml4IHBvc2l0aW9uZWQgbGF5ZXIsIHNldCB0aGUgbGFz dCBzY3JvbGxhYmxlIGluLXJlZ2lvbiBvYmplY3QKKyAgICAgICAgLy8gYXMgbm90IGFibGUgdG8g cHJvcGFnYXRlIHNjcm9sbCB0byBpdHMgcGFyZW50IHNjcm9sbGFibGUuCisgICAgICAgIGlmIChp c05vblJlbmRlclZpZXdGaXhlZFBvc2l0aW9uZWRDb250YWluZXIobGF5ZXIpICYmIG1fYWN0aXZl SW5SZWdpb25TY3JvbGxhYmxlQXJlYXMuc2l6ZSgpKSB7CisgICAgICAgICAgICBQbGF0Zm9ybTo6 U2Nyb2xsVmlld0Jhc2UqIGVuZCA9IG1fYWN0aXZlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXMuYmFj aygpOworICAgICAgICAgICAgZW5kLT5zZXRDYW5Qcm9wYWdhdGVTY3JvbGxpbmdUb0VuY2xvc2lu Z1Njcm9sbGFibGUoZmFsc2UpOwogICAgICAgICB9Ci0gICAgfQorCisgICAgfSB3aGlsZSAobGF5 ZXIgPSBwYXJlbnRMYXllcihsYXllcikpOworICAgIHJldHVybiAwOworfQorCitQbGF0Zm9ybTo6 U2Nyb2xsVmlld0Jhc2UqIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjpjbGlwQW5kQ3JlYXRlSW5S ZWdpb25TY3JvbGxhYmxlQXJlYShSZW5kZXJMYXllciogbGF5ZXIpCit7CisgICAgV2ViQ29yZTo6 SW50UmVjdCByZWN1cnNpdmVDbGlwcGluZ1JlY3QoV2ViQ29yZTo6SW50UG9pbnQ6Onplcm8oKSwg bV93ZWJQYWdlLT50cmFuc2Zvcm1lZFZpZXdwb3J0U2l6ZSgpKTsKKyAgICBJblJlZ2lvblNjcm9s bGFibGVBcmVhKiBzY3JvbGxhYmxlID0gbmV3IEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEobV93ZWJQ YWdlLCBsYXllcik7CisgICAgc2Nyb2xsYWJsZS0+c2V0VmlzaWJsZVdpbmRvd1JlY3QoY2xpcFRv UmVjdChyZWN1cnNpdmVDbGlwcGluZ1JlY3QsIHNjcm9sbGFibGUpKTsKKyAgICByZXR1cm4gc2Ny b2xsYWJsZTsKIH0KIAogY29uc3Qgc3RkOjp2ZWN0b3I8UGxhdGZvcm06OlNjcm9sbFZpZXdCYXNl Kj4mIEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlOjphY3RpdmVJblJlZ2lvblNjcm9sbGFibGVBcmVh cygpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVn aW9uU2Nyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3Jv bGxlci5oCmluZGV4IDJjZGU5OTYuLjIzYzllYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvSW5SZWdpb25TY3JvbGxlci5oCkBAIC0zMSw2ICszMSw3IEBAIG5hbWVzcGFj ZSBXZWJLaXQgewogY2xhc3MgSW5SZWdpb25TY3JvbGxlclByaXZhdGU7CiBjbGFzcyBUb3VjaEV2 ZW50SGFuZGxlcjsKIGNsYXNzIFdlYlBhZ2VQcml2YXRlOworY2xhc3MgU2VsZWN0aW9uSGFuZGxl cjsKIAogY2xhc3MgQkxBQ0tCRVJSWV9FWFBPUlQgSW5SZWdpb25TY3JvbGxlciB7CiBwdWJsaWM6 CkBAIC00NCw2ICs0NSw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFdl YlBhZ2VQcml2YXRlOwogICAgIGZyaWVuZCBjbGFzcyBUb3VjaEV2ZW50SGFuZGxlcjsKKyAgICBm cmllbmQgY2xhc3MgU2VsZWN0aW9uSGFuZGxlcjsKICAgICBJblJlZ2lvblNjcm9sbGVyUHJpdmF0 ZSAqZDsKICAgICBESVNBQkxFX0NPUFkoSW5SZWdpb25TY3JvbGxlcikKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0luUmVnaW9uU2Nyb2xsZXJfcC5oIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9JblJlZ2lvblNjcm9sbGVyX3AuaAppbmRleCA3ZTc5 MWQ5Li40MDRhMTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL0lu UmVnaW9uU2Nyb2xsZXJfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvSW5S ZWdpb25TY3JvbGxlcl9wLmgKQEAgLTUzLDYgKzUzLDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBj YWxjdWxhdGVJblJlZ2lvblNjcm9sbGFibGVBcmVhc0ZvclBvaW50KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jik7CiAgICAgY29uc3Qgc3RkOjp2ZWN0b3I8UGxhdGZvcm06OlNjcm9sbFZpZXdCYXNl Kj4mIGFjdGl2ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWFzKCkgY29uc3Q7CisgICAgUGxhdGZvcm06 OlNjcm9sbFZpZXdCYXNlKiBmaXJzdFNjcm9sbGFibGVJblJlZ2lvbkZvck5vZGUoY29uc3QgV2Vi Q29yZTo6Tm9kZSopOwogCiAgICAgdm9pZCBjbGVhckRvY3VtZW50RGF0YShjb25zdCBXZWJDb3Jl OjpEb2N1bWVudCopOwogCkBAIC02OSw5ICs3MCwxMSBAQCBwcml2YXRlOgogICAgIHZvaWQgcHVz aEJhY2tJblJlZ2lvblNjcm9sbGFibGUoSW5SZWdpb25TY3JvbGxhYmxlQXJlYSopOwogCiAgICAg dm9pZCBhZGp1c3RTY3JvbGxEZWx0YShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWF4T2Zmc2V0 LCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgY3VycmVudE9mZnNldCwgV2ViQ29yZTo6SW50U2l6 ZSYgZGVsdGEpIGNvbnN0OworICAgIFBsYXRmb3JtOjpTY3JvbGxWaWV3QmFzZSogY2xpcEFuZENy ZWF0ZUluUmVnaW9uU2Nyb2xsYWJsZUFyZWEoV2ViQ29yZTo6UmVuZGVyTGF5ZXIqKTsKIAogICAg IGJvb2wgaXNWYWxpZFNjcm9sbGFibGVMYXllcldlYktpdFRocmVhZChXZWJDb3JlOjpMYXllcldl YktpdFRocmVhZCopIGNvbnN0OwogICAgIGJvb2wgaXNWYWxpZFNjcm9sbGFibGVOb2RlKFdlYkNv cmU6Ok5vZGUqKSBjb25zdDsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IGNsaXBUb1JlY3QoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYsIEluUmVnaW9uU2Nyb2xsYWJsZUFyZWEqKTsKICAgICBzdGQ6OnZl Y3RvcjxQbGF0Zm9ybTo6U2Nyb2xsVmlld0Jhc2UqPiBtX2FjdGl2ZUluUmVnaW9uU2Nyb2xsYWJs ZUFyZWFzOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggOTEwN2ExZi4u MTdkMjY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAK KzIwMTMtMDMtMTEgIEdlbmV2aWV2ZSBNYWsgIDxnbWFrQHJpbS5jb20+CisKKyAgICAgICAgW0Js YWNrQmVycnldIEFkZCBhIG1ldGhvZCB0byBmaW5kIHRoZSBTY3JvbGxWaWV3IGZvciBhIHRleHQg c2VsZWN0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTEyMDYxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBNaWtlIEZlbnRvbiBhbmQgSmFrb2IgUGV0c292aXRz LgorICAgICAgICBQUiAjMjc4NDkwCisKKyAgICAgICAgUmVmYWN0b3IgdGhlIGNvZGUgaW4gSW5S ZWdpb25TY3JvbGxlciBzbyB0aGF0IHdlIGNhbiBhZGQgYSBtZXRob2QgdG8gZmluZAorICAgICAg ICB0aGUgSW5SZWdpb25TY3JvbGxhYmxlQXJlYSBmb3IgYSB0ZXh0IHNlbGVjdGlvbi4KKworICAg ICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6SW5SZWdpb25TY3JvbGxlclByaXZhdGU6OmNsaXBUb1JlY3QpOgorICAgICAgICAgICAg LSBQdWxsIG91dCByZWN1cnNpdmUgY2xpcHBpbmcgY29kZSBpbnRvIGl0cyBvd24gZnVuY3Rpb24u CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJblJlZ2lv blNjcm9sbGVyUHJpdmF0ZTo6Y2FsY3VsYXRlSW5SZWdpb25TY3JvbGxhYmxlQXJlYXNGb3JQb2lu dCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkluUmVnaW9uU2Nyb2xsZXJQcml2YXRl OjpmaXJzdFNjcm9sbGFibGVJblJlZ2lvbkZvck5vZGUpOgorICAgICAgICAgICAgLSBUaGlzIG5l dyBtZXRob2QgYWxsb3dzIHVzIHRvIGdldCBqdXN0IHRoZSBmaXJzdCBzY3JvbGxhYmxlIHJlZ2lv biBpbnN0ZWFkIG9mIGxvb2tpbmcKKyAgICAgICAgICAgICAgZm9yIG1vcmUgbmVzdGVkIG9uZXMu IFdlIG1heSB3YW50IHRvIHJlZmFjdG9yIGluIHRoZSBmdXR1cmUgYmVjYXVzZSBzb21lIG9mIHRo ZSBjb2RlIGlzCisgICAgICAgICAgICAgIHZlcnkgc2ltaWxhciB0byBjYWxjdWxhdGVJblJlZ2lv blNjcm9sbGFibGVBcmVhc0ZvclBvaW50LgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ blJlZ2lvblNjcm9sbGVyUHJpdmF0ZTo6Y2xpcEFuZENyZWF0ZUluUmVnaW9uU2Nyb2xsYWJsZUFy ZWEpOgorICAgICAgICAgICAgLSBBZGQgYSBjb252ZW5pZW5jZSBtZXRob2QgZm9yIHRoZSBwcmV2 aW91cyBmdW5jdGlvbgorICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVyLmg6CisgICAgICAg IChXZWJLaXQpOgorICAgICAgICAqIEFwaS9JblJlZ2lvblNjcm9sbGVyX3AuaDoKKyAgICAgICAg KEluUmVnaW9uU2Nyb2xsZXJQcml2YXRlKToKKwogMjAxMy0wMy0xMSAgQWxiZXJ0byBHYXJjaWEg IDxhZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFNlbGVjdGlvbkhh bmRsZXI6IGJyaW5nIGJhY2sgbV9sYXN0U2VsZWN0aW9uIGF0dHJpYnV0ZQotLSAKMS43LjEwLjIg KEFwcGxlIEdpdC0zMykKCg==