113537 2013-03-28 14:19:00 -0700 [BlackBerry] Don't cross editing boundary when touch hold selection expands 2013-03-28 17:59:19 -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 865787 0 shuwu 2013-03-28 14:19:00 -0700 Set editing boundary crossing rule to make sure it won't cross editing boundary when selection expands. 865802 1 195644 shuwu 2013-03-28 14:28:15 -0700 Created attachment 195644 Patch 865824 2 195651 shuwu 2013-03-28 14:50:40 -0700 Created attachment 195651 patch 865946 3 195651 rwlbuis 2013-03-28 17:52:30 -0700 Comment on attachment 195651 patch LGTM. 865947 4 195651 webkit.review.bot 2013-03-28 17:59:16 -0700 Comment on attachment 195651 patch Clearing flags on attachment: 195651 Committed r147189: <http://trac.webkit.org/changeset/147189> 865948 5 webkit.review.bot 2013-03-28 17:59:19 -0700 All reviewed patches have been landed. Closing bug. 195644 2013-03-28 14:28:15 -0700 2013-03-28 14:50:40 -0700 Patch 0001-2013-03-27-Iris-Wu-shuwu-blackberry.com.patch text/plain 5662 shuwu RnJvbSA4ZTI3MDgzNTAzOTBkZGFhMjExMzIwOTdjZTA3NjRmM2MzZTVkNzk5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJcmlzIFd1IDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KRGF0ZTog V2VkLCAyNyBNYXIgMjAxMyAxMzo0MzoyNCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTMtMDMt MjcgIElyaXMgV3UgIDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgRG9uJ3QgY3Jvc3Mg ZWRpdGluZyBib3VuZGFyeSB3aGVuIHRvdWNoIGhvbGQgc2VsZWN0aW9uIGV4cGFuZHMuCgogICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIFdlYktpdFN1cHBvcnQv U2VsZWN0aW9uSGFuZGxlci5jcHA6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0 aW9uSGFuZGxlcjo6c2VsZWN0TmV4dFBhcmFncmFwaCk6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6ZHJhd0FuaW1hdGlvbk92ZXJsYXkpOgogICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OmZpbmROZXh0QW5pbWF0aW9uT3Zl cmxheVJlZ2lvbik6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCAgfCAgIDI3ICsrKysrKysrLS0tLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDVjOGU3YjUuLjQ4ZTJkZmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTI4ICBJcmlzIFd1 ICA8c2h1d3VAYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIERvbid0IGNy b3NzIGVkaXRpbmcgYm91bmRhcnkgd2hlbiB0b3VjaCBob2xkIHNlbGVjdGlvbiBleHBhbmRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1MzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgZWRpdGlu ZyBib3VuZGFyeSBjcm9zc2luZyBydWxlIHRvIG1ha2Ugc3VyZSBpdCB3b24ndCBjcm9zcworICAg ICAgICBlZGl0aW5nIGJvdW5kYXJ5IHdoZW4gc2VsZWN0aW9uIGV4cGFuZHMuCisKKyAgICAgICAg UmV2aWV3ZWQgSW50ZXJuYWxseSBCeSBHZW5ldmlldmUgTWFrIGFuZCBNaWtlIEZlbnRvbi4KKwor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHA6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdE5leHRQYXJhZ3JhcGgp OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpmaW5kTmV4 dEFuaW1hdGlvbk92ZXJsYXlSZWdpb24pOgorCiAyMDEzLTAzLTIyICBOaW1hIEdoYW5hdmF0aWFu ICA8bmdoYW5hdmF0aWFuQGJsYWNrYmVycnkuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBC dWlsZCBmaXggaW4gSW5wdXRIYW5kbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViS2l0U3VwcG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCmluZGV4IDcwNGU3 OWIuLmEyYTE0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRT dXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJLaXRTdXBwb3J0L1NlbGVjdGlvbkhhbmRsZXIuY3BwCkBAIC02NzMsMTEgKzY3Myw2IEBA IHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0QXRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQ b2ludCYgbG9jYXRpb24sIFNlbGVjdGlvCiAgICAgc2VsZWN0T2JqZWN0KHRhcmdldFBvc2l0aW9u LCB0ZXh0R3JhbnVsYXJpdHlGcm9tU2VsZWN0aW9uRXhwYW5zaW9uVHlwZShzZWxlY3Rpb25FeHBh bnNpb25UeXBlKSk7CiB9CiAKLXN0YXRpYyBib29sIGlzSW52YWxpZExpbmUoY29uc3QgVmlzaWJs ZVBvc2l0aW9uJiBwb3MpCi17Ci0gICAgcmV0dXJuIGVuZE9mTGluZShwb3MpLmlzTnVsbCgpIHx8 IHBvcyA9PSBlbmRPZkxpbmUocG9zKSB8fCAhaW5TYW1lTGluZShwb3MsIGVuZE9mTGluZShwb3Mp KTsKLX0KLQogc3RhdGljIGJvb2wgaXNJbnZhbGlkUGFyYWdyYXBoKGNvbnN0IFZpc2libGVQb3Np dGlvbiYgcG9zKQogewogICAgIHJldHVybiBlbmRPZlBhcmFncmFwaChwb3MpLmlzTnVsbCgpIHx8 IHBvcyA9PSBlbmRPZlBhcmFncmFwaChwb3MpOwpAQCAtNjg4LDE0ICs2ODMsMTQgQEAgdm9pZCBT ZWxlY3Rpb25IYW5kbGVyOjpzZWxlY3ROZXh0UGFyYWdyYXBoKCkKICAgICBGcmFtZVNlbGVjdGlv biogY29udHJvbGxlciA9IG1fd2ViUGFnZS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPnNlbGVjdGlv bigpOwogCiAgICAgVmlzaWJsZVBvc2l0aW9uIHN0YXJ0UG9zID0gVmlzaWJsZVBvc2l0aW9uKGNv bnRyb2xsZXItPnN0YXJ0KCksIGNvbnRyb2xsZXItPmFmZmluaXR5KCkpOwotICAgIGlmIChpc1N0 YXJ0T2ZMaW5lKHN0YXJ0UG9zKSAmJiBpc0VuZE9mRWRpdGFibGVPck5vbkVkaXRhYmxlQ29udGVu dChzdGFydFBvcykpCi0gICAgICAgIHN0YXJ0UG9zID0gc3RhcnRQb3MucHJldmlvdXMoKTsKKyAg ICBpZiAoaXNTdGFydE9mTGluZShzdGFydFBvcykgJiYgaXNFbmRPZkRvY3VtZW50KHN0YXJ0UG9z KSkKKyAgICAgICAgc3RhcnRQb3MgPSBzdGFydFBvcy5wcmV2aW91cyhDYW5ub3RDcm9zc0VkaXRp bmdCb3VuZGFyeSk7CiAKICAgICAvLyBGaW5kIG5leHQgcGFyYWdyYXBoIGVuZCBwb3NpdGlvbi4K ICAgICBWaXNpYmxlUG9zaXRpb24gZW5kUG9zKGNvbnRyb2xsZXItPmVuZCgpLCBjb250cm9sbGVy LT5hZmZpbml0eSgpKTsgLy8gZW5kUG9zIGhlcmUgaW5kaWNhdGVzIHRoZSBlbmQgb2YgY3VycmVu dCBwYXJhZ3JhcGgKLSAgICBlbmRQb3MgPSBlbmRQb3MubmV4dCgpOyAvLyBmaW5kIHRoZSBzdGFy dCBvZiBuZXh0IHBhcmFncmFwaAotICAgIHdoaWxlICghaXNFbmRPZkRvY3VtZW50KGVuZFBvcy5k ZWVwRXF1aXZhbGVudCgpKSAmJiBlbmRQb3MuaXNOb3ROdWxsKCkgJiYgaXNJbnZhbGlkUGFyYWdy YXBoKGVuZFBvcykpCi0gICAgICAgIGVuZFBvcyA9IGVuZFBvcy5uZXh0KCk7IC8vIGdvIHRvIG5l eHQgcG9zaXRpb24KKyAgICBlbmRQb3MgPSBlbmRQb3MubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdC b3VuZGFyeSk7IC8vIGZpbmQgdGhlIHN0YXJ0IG9mIG5leHQgcGFyYWdyYXBoCisgICAgd2hpbGUg KCFpc0VuZE9mRG9jdW1lbnQoZW5kUG9zKSAmJiBlbmRQb3MuaXNOb3ROdWxsKCkgJiYgaXNJbnZh bGlkUGFyYWdyYXBoKGVuZFBvcykpCisgICAgICAgIGVuZFBvcyA9IGVuZFBvcy5uZXh0KENhbm5v dENyb3NzRWRpdGluZ0JvdW5kYXJ5KTsgLy8gZ28gdG8gbmV4dCBwb3NpdGlvbgogICAgIGVuZFBv cyA9IGVuZE9mUGFyYWdyYXBoKGVuZFBvcyk7IC8vIGZpbmQgdGhlIGVuZCBvZiBwYXJhZ3JhcGgK IAogICAgIC8vIFNldCBzZWxlY3Rpb24gaWYgdGhlIHBhcmFncmFwaCBpcyBjb3ZlcmVkIGJ5IG92 ZXJsYXkgYW5kIGVuZFBvcyBpcyBub3QgbnVsbC4KQEAgLTcwNSw3ICs3MDAsNyBAQCB2b2lkIFNl bGVjdGlvbkhhbmRsZXI6OnNlbGVjdE5leHRQYXJhZ3JhcGgoKQogICAgICAgICBjb250cm9sbGVy LT5zZXRTZWxlY3Rpb24oc2VsZWN0aW9uKTsKIAogICAgICAgICAvLyBTdG9wIGV4cGFuc2lvbiBp ZiByZWFjaGluZyB0aGUgZW5kIG9mIHBhZ2UuCi0gICAgICAgIGlmIChpc0VuZE9mRG9jdW1lbnQo ZW5kUG9zLmRlZXBFcXVpdmFsZW50KCkpKQorICAgICAgICBpZiAoaXNFbmRPZkRvY3VtZW50KGVu ZFBvcykpCiAgICAgICAgICAgICBtX3dlYlBhZ2UtPm1fY2xpZW50LT5zdG9wRXhwYW5kaW5nU2Vs ZWN0aW9uKCk7CiAgICAgfQogfQpAQCAtNzQwLDEzICs3MzUsMTMgQEAgSW50UmVjdFJlZ2lvbiBT ZWxlY3Rpb25IYW5kbGVyOjpyZWdpb25Gb3JTZWxlY3Rpb25RdWFkcyhWaXNpYmxlU2VsZWN0aW9u IHNlbGVjdGkKIGJvb2wgU2VsZWN0aW9uSGFuZGxlcjo6ZmluZE5leHRBbmltYXRpb25PdmVybGF5 UmVnaW9uKCkKIHsKICAgICAvLyBJZiBvdmVybGF5IGlzIGF0IHRoZSBlbmQgb2YgZG9jdW1lbnQs IHN0b3Agb3ZlcmxheSBleHBhbnNpb24uCi0gICAgaWYgKGlzRW5kT2ZEb2N1bWVudChtX2FuaW1h dGlvbk92ZXJsYXlFbmRQb3MuZGVlcEVxdWl2YWxlbnQoKSkgfHwgbV9hbmltYXRpb25PdmVybGF5 RW5kUG9zLmlzTnVsbCgpKQorICAgIGlmIChpc0VuZE9mRG9jdW1lbnQobV9hbmltYXRpb25PdmVy bGF5RW5kUG9zKSB8fCBtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MuaXNOdWxsKCkpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcyA9IG1fYW5pbWF0 aW9uT3ZlcmxheUVuZFBvcy5uZXh0KCk7Ci0gICAgd2hpbGUgKCFpc0VuZE9mRG9jdW1lbnQobV9h bmltYXRpb25PdmVybGF5RW5kUG9zLmRlZXBFcXVpdmFsZW50KCkpICYmIG1fYW5pbWF0aW9uT3Zl cmxheUVuZFBvcy5pc05vdE51bGwoKSAmJiBpc0ludmFsaWRMaW5lKG1fYW5pbWF0aW9uT3Zlcmxh eUVuZFBvcykpCi0gICAgICAgIG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcyA9IG1fYW5pbWF0aW9u T3ZlcmxheUVuZFBvcy5uZXh0KCk7IC8vIGdvIHRvIG5leHQgcG9zaXRpb24KLSAgICBtX2FuaW1h dGlvbk92ZXJsYXlFbmRQb3MgPSBlbmRPZkxpbmUobV9hbmltYXRpb25PdmVybGF5RW5kUG9zKTsg Ly8gZmluZCBlbmQgb2YgbGluZQorICAgIG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcyA9IG1fYW5p bWF0aW9uT3ZlcmxheUVuZFBvcy5uZXh0KENhbm5vdENyb3NzRWRpdGluZ0JvdW5kYXJ5KTsKKyAg ICB3aGlsZSAoIWlzRW5kT2ZEb2N1bWVudChtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MpICYmIG1f YW5pbWF0aW9uT3ZlcmxheUVuZFBvcy5pc05vdE51bGwoKSAmJiBpc0ludmFsaWRQYXJhZ3JhcGgo bV9hbmltYXRpb25PdmVybGF5RW5kUG9zKSkKKyAgICAgICAgbV9hbmltYXRpb25PdmVybGF5RW5k UG9zID0gbV9hbmltYXRpb25PdmVybGF5RW5kUG9zLm5leHQoQ2Fubm90Q3Jvc3NFZGl0aW5nQm91 bmRhcnkpOyAvLyBnbyB0byBuZXh0IHBvc2l0aW9uCisgICAgbV9hbmltYXRpb25PdmVybGF5RW5k UG9zID0gZW5kT2ZQYXJhZ3JhcGgobV9hbmltYXRpb25PdmVybGF5RW5kUG9zKTsgLy8gZmluZCBl bmQgb2YgcGFyYWdyYXBoCiAKICAgICBWaXNpYmxlU2VsZWN0aW9uIHNlbGVjdGlvbihtX2FuaW1h dGlvbk92ZXJsYXlTdGFydFBvcywgbV9hbmltYXRpb25PdmVybGF5RW5kUG9zKTsKICAgICBtX25l eHRBbmltYXRpb25PdmVybGF5UmVnaW9uID0gcmVnaW9uRm9yU2VsZWN0aW9uUXVhZHMoc2VsZWN0 aW9uKTsKLS0gCjEuNy45LjUKCg== 195651 2013-03-28 14:50:40 -0700 2013-03-28 17:59:16 -0700 patch 0001-2013-03-27-Iris-Wu-shuwu-blackberry.com.patch text/plain 5697 shuwu RnJvbSAwMDFlMzExMzg4MmFmNDRkZmQwODkxODgzMWVlYzAxYzg4NzBjOGRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBJcmlzIFd1IDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KRGF0ZTog V2VkLCAyNyBNYXIgMjAxMyAxMzo0MzoyNCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTMtMDMt MjcgIElyaXMgV3UgIDxzaHV3dUBibGFja2JlcnJ5LmNvbT4KCiAgICAgICAgRG9uJ3QgY3Jvc3Mg ZWRpdGluZyBib3VuZGFyeSB3aGVuIHRvdWNoIGhvbGQgc2VsZWN0aW9uIGV4cGFuZHMuCgogICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICAqIFdlYktpdFN1cHBvcnQv U2VsZWN0aW9uSGFuZGxlci5jcHA6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6U2VsZWN0 aW9uSGFuZGxlcjo6c2VsZWN0TmV4dFBhcmFncmFwaCk6CiAgICAgICAgKEJsYWNrQmVycnk6Oldl YktpdDo6U2VsZWN0aW9uSGFuZGxlcjo6ZHJhd0FuaW1hdGlvbk92ZXJsYXkpOgogICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OmZpbmROZXh0QW5pbWF0aW9uT3Zl cmxheVJlZ2lvbik6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKwogLi4uL2JsYWNrYmVycnkvV2ViS2l0U3Vw cG9ydC9TZWxlY3Rpb25IYW5kbGVyLmNwcCAgfCAgIDI3ICsrKysrKysrLS0tLS0tLS0tLS0tCiAy IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGQyYjQzM2IuLjRlMmI4ODEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTI4ICBJcmlzIFd1 ICA8c2h1d3VAYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIERvbid0IGNy b3NzIGVkaXRpbmcgYm91bmRhcnkgd2hlbiB0b3VjaCBob2xkIHNlbGVjdGlvbiBleHBhbmRzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM1MzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXQgZWRpdGlu ZyBib3VuZGFyeSBjcm9zc2luZyBydWxlIHRvIG1ha2Ugc3VyZSBpdCB3b24ndCBjcm9zcworICAg ICAgICBlZGl0aW5nIGJvdW5kYXJ5IHdoZW4gc2VsZWN0aW9uIGV4cGFuZHMuCisKKyAgICAgICAg UmV2aWV3ZWQgSW50ZXJuYWxseSBCeSBHZW5ldmlldmUgTWFrIGFuZCBNaWtlIEZlbnRvbi4KKwor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxlci5jcHA6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OlNlbGVjdGlvbkhhbmRsZXI6OnNlbGVjdE5leHRQYXJhZ3JhcGgp OgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpTZWxlY3Rpb25IYW5kbGVyOjpmaW5kTmV4 dEFuaW1hdGlvbk92ZXJsYXlSZWdpb24pOgorCiAyMDEzLTAzLTI4ICBKYWtvYiBQZXRzb3ZpdHMg IDxqcGV0c292aXRzQGJsYWNrYmVycnkuY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBEb24n dCB1c2UgV2ViS2l0IHRocmVhZCBzY2FsZSBpbmZvcm1hdGlvbiBpbiBXZWJQYWdlQ29tcG9zaXRv ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1Nl bGVjdGlvbkhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvU2VsZWN0aW9uSGFuZGxlci5jcHAKaW5kZXggYTVhZDkzOS4uZjJhMTg3YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0aW9uSGFuZGxl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvU2VsZWN0 aW9uSGFuZGxlci5jcHAKQEAgLTY3NCwxMSArNjc0LDYgQEAgdm9pZCBTZWxlY3Rpb25IYW5kbGVy OjpzZWxlY3RBdFBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBsb2NhdGlvbiwgU2VsZWN0 aW8KICAgICBzZWxlY3RPYmplY3QodGFyZ2V0UG9zaXRpb24sIHRleHRHcmFudWxhcml0eUZyb21T ZWxlY3Rpb25FeHBhbnNpb25UeXBlKHNlbGVjdGlvbkV4cGFuc2lvblR5cGUpKTsKIH0KIAotc3Rh dGljIGJvb2wgaXNJbnZhbGlkTGluZShjb25zdCBWaXNpYmxlUG9zaXRpb24mIHBvcykKLXsKLSAg ICByZXR1cm4gZW5kT2ZMaW5lKHBvcykuaXNOdWxsKCkgfHwgcG9zID09IGVuZE9mTGluZShwb3Mp IHx8ICFpblNhbWVMaW5lKHBvcywgZW5kT2ZMaW5lKHBvcykpOwotfQotCiBzdGF0aWMgYm9vbCBp c0ludmFsaWRQYXJhZ3JhcGgoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBwb3MpCiB7CiAgICAgcmV0 dXJuIGVuZE9mUGFyYWdyYXBoKHBvcykuaXNOdWxsKCkgfHwgcG9zID09IGVuZE9mUGFyYWdyYXBo KHBvcyk7CkBAIC02ODksMTQgKzY4NCwxNCBAQCB2b2lkIFNlbGVjdGlvbkhhbmRsZXI6OnNlbGVj dE5leHRQYXJhZ3JhcGgoKQogICAgIEZyYW1lU2VsZWN0aW9uKiBjb250cm9sbGVyID0gbV93ZWJQ YWdlLT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+c2VsZWN0aW9uKCk7CiAKICAgICBWaXNpYmxlUG9z aXRpb24gc3RhcnRQb3MgPSBWaXNpYmxlUG9zaXRpb24oY29udHJvbGxlci0+c3RhcnQoKSwgY29u dHJvbGxlci0+YWZmaW5pdHkoKSk7Ci0gICAgaWYgKGlzU3RhcnRPZkxpbmUoc3RhcnRQb3MpICYm IGlzRW5kT2ZFZGl0YWJsZU9yTm9uRWRpdGFibGVDb250ZW50KHN0YXJ0UG9zKSkKLSAgICAgICAg c3RhcnRQb3MgPSBzdGFydFBvcy5wcmV2aW91cygpOworICAgIGlmIChpc1N0YXJ0T2ZMaW5lKHN0 YXJ0UG9zKSAmJiBpc0VuZE9mRG9jdW1lbnQoc3RhcnRQb3MpKQorICAgICAgICBzdGFydFBvcyA9 IHN0YXJ0UG9zLnByZXZpb3VzKENhbm5vdENyb3NzRWRpdGluZ0JvdW5kYXJ5KTsKIAogICAgIC8v IEZpbmQgbmV4dCBwYXJhZ3JhcGggZW5kIHBvc2l0aW9uLgogICAgIFZpc2libGVQb3NpdGlvbiBl bmRQb3MoY29udHJvbGxlci0+ZW5kKCksIGNvbnRyb2xsZXItPmFmZmluaXR5KCkpOyAvLyBlbmRQ b3MgaGVyZSBpbmRpY2F0ZXMgdGhlIGVuZCBvZiBjdXJyZW50IHBhcmFncmFwaAotICAgIGVuZFBv cyA9IGVuZFBvcy5uZXh0KCk7IC8vIGZpbmQgdGhlIHN0YXJ0IG9mIG5leHQgcGFyYWdyYXBoCi0g ICAgd2hpbGUgKCFpc0VuZE9mRG9jdW1lbnQoZW5kUG9zLmRlZXBFcXVpdmFsZW50KCkpICYmIGVu ZFBvcy5pc05vdE51bGwoKSAmJiBpc0ludmFsaWRQYXJhZ3JhcGgoZW5kUG9zKSkKLSAgICAgICAg ZW5kUG9zID0gZW5kUG9zLm5leHQoKTsgLy8gZ28gdG8gbmV4dCBwb3NpdGlvbgorICAgIGVuZFBv cyA9IGVuZFBvcy5uZXh0KENhbm5vdENyb3NzRWRpdGluZ0JvdW5kYXJ5KTsgLy8gZmluZCB0aGUg c3RhcnQgb2YgbmV4dCBwYXJhZ3JhcGgKKyAgICB3aGlsZSAoIWlzRW5kT2ZEb2N1bWVudChlbmRQ b3MpICYmIGVuZFBvcy5pc05vdE51bGwoKSAmJiBpc0ludmFsaWRQYXJhZ3JhcGgoZW5kUG9zKSkK KyAgICAgICAgZW5kUG9zID0gZW5kUG9zLm5leHQoQ2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkp OyAvLyBnbyB0byBuZXh0IHBvc2l0aW9uCiAgICAgZW5kUG9zID0gZW5kT2ZQYXJhZ3JhcGgoZW5k UG9zKTsgLy8gZmluZCB0aGUgZW5kIG9mIHBhcmFncmFwaAogCiAgICAgLy8gU2V0IHNlbGVjdGlv biBpZiB0aGUgcGFyYWdyYXBoIGlzIGNvdmVyZWQgYnkgb3ZlcmxheSBhbmQgZW5kUG9zIGlzIG5v dCBudWxsLgpAQCAtNzA2LDcgKzcwMSw3IEBAIHZvaWQgU2VsZWN0aW9uSGFuZGxlcjo6c2VsZWN0 TmV4dFBhcmFncmFwaCgpCiAgICAgICAgIGNvbnRyb2xsZXItPnNldFNlbGVjdGlvbihzZWxlY3Rp b24pOwogCiAgICAgICAgIC8vIFN0b3AgZXhwYW5zaW9uIGlmIHJlYWNoaW5nIHRoZSBlbmQgb2Yg cGFnZS4KLSAgICAgICAgaWYgKGlzRW5kT2ZEb2N1bWVudChlbmRQb3MuZGVlcEVxdWl2YWxlbnQo KSkpCisgICAgICAgIGlmIChpc0VuZE9mRG9jdW1lbnQoZW5kUG9zKSkKICAgICAgICAgICAgIG1f d2ViUGFnZS0+bV9jbGllbnQtPnN0b3BFeHBhbmRpbmdTZWxlY3Rpb24oKTsKICAgICB9CiB9CkBA IC03NDEsMTMgKzczNiwxMyBAQCBJbnRSZWN0UmVnaW9uIFNlbGVjdGlvbkhhbmRsZXI6OnJlZ2lv bkZvclNlbGVjdGlvblF1YWRzKFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aQogYm9vbCBTZWxlY3Rp b25IYW5kbGVyOjpmaW5kTmV4dEFuaW1hdGlvbk92ZXJsYXlSZWdpb24oKQogewogICAgIC8vIElm IG92ZXJsYXkgaXMgYXQgdGhlIGVuZCBvZiBkb2N1bWVudCwgc3RvcCBvdmVybGF5IGV4cGFuc2lv bi4KLSAgICBpZiAoaXNFbmRPZkRvY3VtZW50KG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcy5kZWVw RXF1aXZhbGVudCgpKSB8fCBtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MuaXNOdWxsKCkpCisgICAg aWYgKGlzRW5kT2ZEb2N1bWVudChtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MpIHx8IG1fYW5pbWF0 aW9uT3ZlcmxheUVuZFBvcy5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg bV9hbmltYXRpb25PdmVybGF5RW5kUG9zID0gbV9hbmltYXRpb25PdmVybGF5RW5kUG9zLm5leHQo KTsKLSAgICB3aGlsZSAoIWlzRW5kT2ZEb2N1bWVudChtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3Mu ZGVlcEVxdWl2YWxlbnQoKSkgJiYgbV9hbmltYXRpb25PdmVybGF5RW5kUG9zLmlzTm90TnVsbCgp ICYmIGlzSW52YWxpZExpbmUobV9hbmltYXRpb25PdmVybGF5RW5kUG9zKSkKLSAgICAgICAgbV9h bmltYXRpb25PdmVybGF5RW5kUG9zID0gbV9hbmltYXRpb25PdmVybGF5RW5kUG9zLm5leHQoKTsg Ly8gZ28gdG8gbmV4dCBwb3NpdGlvbgotICAgIG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcyA9IGVu ZE9mTGluZShtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MpOyAvLyBmaW5kIGVuZCBvZiBsaW5lCisg ICAgbV9hbmltYXRpb25PdmVybGF5RW5kUG9zID0gbV9hbmltYXRpb25PdmVybGF5RW5kUG9zLm5l eHQoQ2Fubm90Q3Jvc3NFZGl0aW5nQm91bmRhcnkpOworICAgIHdoaWxlICghaXNFbmRPZkRvY3Vt ZW50KG1fYW5pbWF0aW9uT3ZlcmxheUVuZFBvcykgJiYgbV9hbmltYXRpb25PdmVybGF5RW5kUG9z LmlzTm90TnVsbCgpICYmIGlzSW52YWxpZFBhcmFncmFwaChtX2FuaW1hdGlvbk92ZXJsYXlFbmRQ b3MpKQorICAgICAgICBtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MgPSBtX2FuaW1hdGlvbk92ZXJs YXlFbmRQb3MubmV4dChDYW5ub3RDcm9zc0VkaXRpbmdCb3VuZGFyeSk7IC8vIGdvIHRvIG5leHQg cG9zaXRpb24KKyAgICBtX2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MgPSBlbmRPZlBhcmFncmFwaCht X2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MpOyAvLyBmaW5kIGVuZCBvZiBwYXJhZ3JhcGgKIAogICAg IFZpc2libGVTZWxlY3Rpb24gc2VsZWN0aW9uKG1fYW5pbWF0aW9uT3ZlcmxheVN0YXJ0UG9zLCBt X2FuaW1hdGlvbk92ZXJsYXlFbmRQb3MpOwogICAgIG1fbmV4dEFuaW1hdGlvbk92ZXJsYXlSZWdp b24gPSByZWdpb25Gb3JTZWxlY3Rpb25RdWFkcyhzZWxlY3Rpb24pOwotLSAKMS43LjkuNQoK