146951 2015-07-14 17:01:43 -0700 [iOS] Add support for updateSelectionWithExtentPoint:withBoundary 2015-07-15 10:54:02 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica commit-queue oldest_to_newest 1109522 0 enrica 2015-07-14 17:01:43 -0700 The text selection code on iOS uses this new method that must be supported in WK2. <rdar://problem/20864286> [Orb] One finger Orb text selection not working in WK2 1109523 1 256811 enrica 2015-07-14 17:10:29 -0700 Created attachment 256811 Patch 1109525 2 commit-queue 2015-07-14 17:13:58 -0700 Attachment 256811 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/WebPage/WebPage.h:933: The parameter name "frame" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/WebProcess/WebPage/WebPage.h:933: The parameter name "point" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/WebKit2/UIProcess/WebPageProxy.h:491: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm:499: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1109653 3 enrica 2015-07-15 10:54:02 -0700 Fixed style issues. Committed revision 186849. 256811 2015-07-14 17:10:29 -0700 2015-07-14 18:00:38 -0700 Patch addselectionsupport.txt text/plain 10754 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjgyNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE1LTA3LTE0ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHN1cHBvcnQg Zm9yIHVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludDp3aXRoQm91bmRhcnkuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY5NTEKKyAgICAgICAg cmRhcjovL3Byb2JsZW0vMjA4NjQyODYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgaW1wbGVtZW50YXRpb24gZm9yIG5ldyBtZXRob2QgdXNlZCBi eSB0ZXh0IHNlbGVjdGlvbgorICAgICAgICBlbmdpbmUgb24gaU9TLiBUaGUgbmV3IGZ1bmN0aW9u IG1vZGlmaWVzIHRoZSBzZWxlY3Rpb24gbmVhciB0aGUgZ2l2ZW4gcG9pbnQKKyAgICAgICAgYW5k IHNuYXBzIGl0IGF0IHRoZSBib3VuZGFyeSBvZiB0aGUgc3BlY2lmaWVkIGdyYW51bGFyaXR5Lgor CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludDpjb21wbGV0aW9uSGFuZGxlcjpdKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyB1cGRhdGVTZWxlY3Rpb25XaXRoRXh0ZW50UG9pbnQ6 d2l0aEJvdW5kYXJ5OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9jaGFyYWN0ZXJCZWZvcmVDYXJldFNlbGVjdGlvbl0pOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6dXBkYXRlU2VsZWN0aW9uV2l0aEV4dGVudFBvaW50QW5kQm91bmRhcnkpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlcXVlc3REaWN0YXRpb25Db250ZXh0KToKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmFuZ2VG b3JHcmFudWxhcml0eUF0UG9pbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzZWxlY3RU ZXh0V2l0aEdyYW51bGFyaXR5QXRQb2ludCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVw ZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludEFuZEJvdW5kYXJ5KToKKwogMjAxNS0wNy0xNCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSB3 a1BvcHVwTWVudSBmcm9tIFdlYkNvcmVTeXN0ZW1JbnRlcmZhY2U7IGl0J3Mgbm90IGNhbGxlZCBm cm9tIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJ KHJldmlzaW9uIDE4NjgyNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtNDg4LDYgKzQ4OCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IG1vdmVTZWxlY3Rpb25BdEJvdW5kYXJ5V2l0aERpcmVjdGlvbihXZWJDb3JlOjpUZXh0R3JhbnVs YXJpdHksIFdlYkNvcmU6OlNlbGVjdGlvbkRpcmVjdGlvbiwgc3RkOjpmdW5jdGlvbjx2b2lkKENh bGxiYWNrQmFzZTo6RXJyb3IpPik7CiAgICAgdm9pZCBiZWdpblNlbGVjdGlvbkluRGlyZWN0aW9u KFdlYkNvcmU6OlNlbGVjdGlvbkRpcmVjdGlvbiwgc3RkOjpmdW5jdGlvbjx2b2lkICh1aW50NjRf dCwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+KTsKICAgICB2b2lkIHVwZGF0ZVNlbGVjdGlvbldpdGhF eHRlbnRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCwgc3RkOjpmdW5jdGlvbjx2b2lkICh1 aW50NjRfdCwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+KTsKKyAgICB2b2lkIHVwZGF0ZVNlbGVjdGlv bldpdGhFeHRlbnRQb2ludEFuZEJvdW5kYXJ5KGNvbnN0IFdlYkNvcmU6OkludFBvaW50LCBXZWJD b3JlOjpUZXh0R3JhbnVsYXJpdHksIHN0ZDo6ZnVuY3Rpb248dm9pZCAodWludDY0X3QsIENhbGxi YWNrQmFzZTo6RXJyb3IpPik7CiAgICAgdm9pZCByZXF1ZXN0QXV0b2NvcnJlY3Rpb25EYXRhKGNv bnN0IFN0cmluZyYgdGV4dEZvckF1dG9jb3JyZWN0aW9uLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNv bnN0IFZlY3RvcjxXZWJDb3JlOjpGbG9hdFJlY3Q+JiwgY29uc3QgU3RyaW5nJiwgZG91YmxlLCB1 aW50NjRfdCwgQ2FsbGJhY2tCYXNlOjpFcnJvcik+KTsKICAgICB2b2lkIGFwcGx5QXV0b2NvcnJl Y3Rpb24oY29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uLCBjb25zdCBTdHJpbmcmIG9yaWdpbmFsVGV4 dCwgc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmLCBDYWxsYmFja0Jhc2U6OkVycm9y KT4pOwogICAgIGJvb2wgYXBwbHlBdXRvY29ycmVjdGlvbihjb25zdCBTdHJpbmcmIGNvcnJlY3Rp b24sIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxUZXh0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShy ZXZpc2lvbiAxODY4MjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMjA0Myw2ICsyMDQzLDE2IEBA IC0gKHZvaWQpdXBkYXRlU2VsZWN0aW9uV2l0aEV4dGVudFBvaW50OigKICAgICB9KTsKIH0KIAor LSAodm9pZCl1cGRhdGVTZWxlY3Rpb25XaXRoRXh0ZW50UG9pbnQ6KENHUG9pbnQpcG9pbnQgd2l0 aEJvdW5kYXJ5OihVSVRleHRHcmFudWxhcml0eSlncmFudWxhcml0eSBjb21wbGV0aW9uSGFuZGxl cjoodm9pZCAoXikoQk9PTCBzZWxlY3Rpb25FbmRJc01vdmluZykpY29tcGxldGlvbkhhbmRsZXIK K3sKKyAgICBVSVdLU2VsZWN0aW9uV2l0aERpcmVjdGlvbkNvbXBsZXRpb25IYW5kbGVyIHNlbGVj dGlvbkhhbmRsZXIgPSBbY29tcGxldGlvbkhhbmRsZXIgY29weV07CisgICAgCisgICAgX3BhZ2Ut PnVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludEFuZEJvdW5kYXJ5KFdlYkNvcmU6OkludFBv aW50KHBvaW50KSwgdG9XS1RleHRHcmFudWxhcml0eShncmFudWxhcml0eSksIFtzZWxlY3Rpb25I YW5kbGVyXShib29sIGVuZElzTW92aW5nLCBXZWJLaXQ6OkNhbGxiYWNrQmFzZTo6RXJyb3IgZXJy b3IpIHsKKyAgICAgICAgc2VsZWN0aW9uSGFuZGxlcihlbmRJc01vdmluZyk7CisgICAgICAgIFtz ZWxlY3Rpb25IYW5kbGVyIHJlbGVhc2VdOworICAgIH0pOworfQorCiAtIChVVEYzMkNoYXIpX2No YXJhY3RlckJlZm9yZUNhcmV0U2VsZWN0aW9uCiB7CiAgICAgcmV0dXJuIF9wYWdlLT5lZGl0b3JT dGF0ZSgpLnBvc3RMYXlvdXREYXRhKCkuY2hhcmFjdGVyQmVmb3JlU2VsZWN0aW9uOwpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0JKHJl dmlzaW9uIDE4NjgyNikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00OTYsNiArNDk2LDE4IEBAIHZvaWQgV2ViUGFn ZVByb3h5Ojp1cGRhdGVTZWxlY3Rpb25XaXRoRXgKICAgICAKIH0KIAordm9pZCBXZWJQYWdlUHJv eHk6OnVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQb2ludEFuZEJvdW5kYXJ5KGNvbnN0IFdlYkNv cmU6OkludFBvaW50IHBvaW50LCBXZWJDb3JlOjpUZXh0R3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHks IHN0ZDo6ZnVuY3Rpb248dm9pZCAodWludDY0X3QsIENhbGxiYWNrQmFzZTo6RXJyb3IpPiBjYWxs YmFja0Z1bmN0aW9uKQoreworICAgIGlmICghaXNWYWxpZCgpKSB7CisgICAgICAgIGNhbGxiYWNr RnVuY3Rpb24oMCwgQ2FsbGJhY2tCYXNlOjpFcnJvcjo6VW5rbm93bik7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisgICAgCisgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IG1fY2FsbGJhY2tzLnB1 dChXVEY6Om1vdmUoY2FsbGJhY2tGdW5jdGlvbiksIG1fcHJvY2Vzcy0+dGhyb3R0bGVyKCkuYmFj a2dyb3VuZEFjdGl2aXR5VG9rZW4oKSk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpVcGRhdGVTZWxlY3Rpb25XaXRoRXh0ZW50UG9pbnRBbmRCb3VuZGFyeShwb2ludCwg Z3JhbnVsYXJpdHksIGNhbGxiYWNrSUQpLCBtX3BhZ2VJRCk7CisgICAgCit9CisKIHZvaWQgV2Vi UGFnZVByb3h5OjpyZXF1ZXN0RGljdGF0aW9uQ29udGV4dChzdGQ6OmZ1bmN0aW9uPHZvaWQgKGNv bnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIENhbGxiYWNrQmFzZTo6 RXJyb3IpPiBjYWxsYmFja0Z1bmN0aW9uKQogewogICAgIGlmICghaXNWYWxpZCgpKSB7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9u IDE4NjgyNikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTUwOSw2ICs1MDksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZWxl Y3RQb3NpdGlvbkF0UG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCB1aW50NjRfdCBjYWxs YmFja0lEKTsKICAgICB2b2lkIGJlZ2luU2VsZWN0aW9uSW5EaXJlY3Rpb24odWludDMyX3QgZGly ZWN0aW9uLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKICAgICB2b2lkIHVwZGF0ZVNlbGVjdGlvbldp dGhFeHRlbnRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYsIHVpbnQ2NF90IGNhbGxiYWNr SUQpOworICAgIHZvaWQgdXBkYXRlU2VsZWN0aW9uV2l0aEV4dGVudFBvaW50QW5kQm91bmRhcnko Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCB1aW50MzJfdCBncmFudWxhcml0eSwgdWludDY0X3Qg Y2FsbGJhY2tJRCk7CiAKICAgICB2b2lkIGVsZW1lbnREaWRGb2N1cyhXZWJDb3JlOjpOb2RlKik7 CiAgICAgdm9pZCBlbGVtZW50RGlkQmx1cihXZWJDb3JlOjpOb2RlKik7CkBAIC05MjksNiArOTMw LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNlbmRUYXBIaWdobGlnaHRGb3JOb2RlSWZOZWNlc3Nh cnkodWludDY0X3QgcmVxdWVzdElELCBXZWJDb3JlOjpOb2RlKik7CiAgICAgdm9pZCByZXNldFRl eHRBdXRvc2l6aW5nQmVmb3JlTGF5b3V0SWZOZWVkZWQoY29uc3QgV2ViQ29yZTo6RmxvYXRTaXpl JiBvbGRTaXplLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIG5ld1NpemUpOwogICAgIFdlYkNv cmU6OlZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25JbkZvY3VzZWROb2RlRm9yUG9pbnQo Y29uc3QgV2ViQ29yZTo6RnJhbWUmLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOworICAgIFBh c3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IHJhbmdlRm9yR3JhbnVsYXJpdHlBdFBvaW50KGNvbnN0 IFdlYkNvcmU6OkZyYW1lJiBmcmFtZSwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCB1 aW50MzJfdCBncmFudWxhcml0eSk7CiAgICAgdm9pZCB2b2xhdGlsaXR5VGltZXJGaXJlZCgpOwog I2VuZGlmCiAjaWYgIVBMQVRGT1JNKENPQ09BKQpAQCAtMTM0Niw2ICsxMzQ4LDcgQEAgcHJpdmF0 ZToKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9zY3JlZW5TaXplOwogICAgIFdlYkNvcmU6OkZs b2F0U2l6ZSBtX2F2YWlsYWJsZVNjcmVlblNpemU7CiAgICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdl PiBtX2N1cnJlbnRCbG9ja1NlbGVjdGlvbjsKKyAgICBSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+IG1f aW5pdGlhbFNlbGVjdGlvbjsKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fYmxvY2tTZWxlY3Rpb25E ZXNpcmVkU2l6ZTsKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgbV9tYXhpbXVtVW5vYnNjdXJlZFNp emU7CiAgICAgaW50MzJfdCBtX2RldmljZU9yaWVudGF0aW9uOwpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJl dmlzaW9uIDE4NjgyNikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC03MCw2ICs3MCw3IEBAIG1lc3NhZ2Vz IC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogICAgIFNlbGVjdFBvc2l0aW9uQXRQb2ludChX ZWJDb3JlOjpJbnRQb2ludCBwb2ludCwgdWludDY0X3QgY2FsbGJhY2tJRCkKICAgICBCZWdpblNl bGVjdGlvbkluRGlyZWN0aW9uKHVpbnQzMl90IGRpcmVjdGlvbiwgdWludDY0X3QgY2FsbGJhY2tJ RCkKICAgICBVcGRhdGVTZWxlY3Rpb25XaXRoRXh0ZW50UG9pbnQoV2ViQ29yZTo6SW50UG9pbnQg cG9pbnQsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCisgICAgVXBkYXRlU2VsZWN0aW9uV2l0aEV4dGVu dFBvaW50QW5kQm91bmRhcnkoV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIHVpbnQzMl90IGdyYW51 bGFyaXR5LCB1aW50NjRfdCBjYWxsYmFja0lEKQogICAgIFJlcXVlc3REaWN0YXRpb25Db250ZXh0 KHVpbnQ2NF90IGNhbGxiYWNrSUQpCiAgICAgUmVwbGFjZURpY3RhdGVkVGV4dChTdHJpbmcgb2xk VGV4dCwgU3RyaW5nIG5ld1RleHQpCiAgICAgUmVwbGFjZVNlbGVjdGVkVGV4dChTdHJpbmcgb2xk VGV4dCwgU3RyaW5nIG5ld1RleHQpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCShyZXZpc2lvbiAxODY4MjYpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtp bmcgY29weSkKQEAgLTE3MzQsOSArMTczNCw4IEBAIHZvaWQgV2ViUGFnZTo6bW92ZVNlbGVjdGlv bkF0Qm91bmRhcnlXaXQKICAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlZvaWRDYWxs YmFjayhjYWxsYmFja0lEKSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6c2VsZWN0VGV4dFdpdGhHcmFu dWxhcml0eUF0UG9pbnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCB1aW50MzJfdCBn cmFudWxhcml0eSwgdWludDY0X3QgY2FsbGJhY2tJRCkKK1Bhc3NSZWZQdHI8UmFuZ2U+IFdlYlBh Z2U6OnJhbmdlRm9yR3JhbnVsYXJpdHlBdFBvaW50KGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIHBvaW50LCB1aW50MzJfdCBncmFudWxhcml0eSkKIHsKLSAgICBj b25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1h aW5GcmFtZSgpOwogICAgIFZpc2libGVQb3NpdGlvbiBwb3NpdGlvbiA9IHZpc2libGVQb3NpdGlv bkluRm9jdXNlZE5vZGVGb3JQb2ludChmcmFtZSwgcG9pbnQpOwogCiAgICAgUmVmUHRyPFJhbmdl PiByYW5nZTsKQEAgLTE3NTYsOCArMTc1NSwxNyBAQCB2b2lkIFdlYlBhZ2U6OnNlbGVjdFRleHRX aXRoR3JhbnVsYXJpdHlBCiAgICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CiAgICAgfQorICAg IHJldHVybiByYW5nZTsKK30KKwordm9pZCBXZWJQYWdlOjpzZWxlY3RUZXh0V2l0aEdyYW51bGFy aXR5QXRQb2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQsIHVpbnQzMl90IGdyYW51 bGFyaXR5LCB1aW50NjRfdCBjYWxsYmFja0lEKQoreworICAgIGNvbnN0IEZyYW1lJiBmcmFtZSA9 IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7CisgICAgUmVm UHRyPFJhbmdlPiByYW5nZSA9IHJhbmdlRm9yR3JhbnVsYXJpdHlBdFBvaW50KGZyYW1lLCBwb2lu dCwgZ3JhbnVsYXJpdHkpOworCiAgICAgaWYgKHJhbmdlKQogICAgICAgICBmcmFtZS5zZWxlY3Rp b24oKS5zZXRTZWxlY3RlZFJhbmdlKHJhbmdlLmdldCgpLCBVUFNUUkVBTSwgdHJ1ZSk7CisgICAg bV9pbml0aWFsU2VsZWN0aW9uID0gcmFuZ2U7CiAgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpWb2lkQ2FsbGJhY2soY2FsbGJhY2tJRCkpOwogfQogCkBAIC0xNzY2LDcgKzE3NzQsMzYg QEAgdm9pZCBXZWJQYWdlOjpiZWdpblNlbGVjdGlvbkluRGlyZWN0aW9uKAogICAgIG1fc2VsZWN0 aW9uQW5jaG9yID0gKHN0YXRpY19jYXN0PFNlbGVjdGlvbkRpcmVjdGlvbj4oZGlyZWN0aW9uKSA9 PSBEaXJlY3Rpb25MZWZ0KSA/IFN0YXJ0IDogRW5kOwogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBh Z2VQcm94eTo6VW5zaWduZWRDYWxsYmFjayhtX3NlbGVjdGlvbkFuY2hvciA9PSBTdGFydCwgY2Fs bGJhY2tJRCkpOwogfQorCit2b2lkIFdlYlBhZ2U6OnVwZGF0ZVNlbGVjdGlvbldpdGhFeHRlbnRQ b2ludEFuZEJvdW5kYXJ5KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwgdWludDMyX3Qg Z3JhbnVsYXJpdHksIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit7CisgICAgY29uc3QgRnJhbWUmIGZy YW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAg ICBWaXNpYmxlUG9zaXRpb24gcG9zaXRpb24gPSB2aXNpYmxlUG9zaXRpb25JbkZvY3VzZWROb2Rl Rm9yUG9pbnQoZnJhbWUsIHBvaW50KTsKKyAgICBSZWZQdHI8UmFuZ2U+IG5ld1JhbmdlID0gcmFu Z2VGb3JHcmFudWxhcml0eUF0UG9pbnQoZnJhbWUsIHBvaW50LCBncmFudWxhcml0eSk7CiAgICAg CisgICAgaWYgKHBvc2l0aW9uLmlzTnVsbCgpIHx8ICFtX2luaXRpYWxTZWxlY3Rpb24gfHwgIW5l d1JhbmdlKSB7CisgICAgICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6VW5zaWduZWRD YWxsYmFjayhmYWxzZSwgY2FsbGJhY2tJRCkpOworICAgICAgICByZXR1cm47CisgICAgfQorICAg IAorICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2U7CisgICAgVmlzaWJsZVBvc2l0aW9uIHNlbGVjdGlv blN0YXJ0ID0gbV9pbml0aWFsU2VsZWN0aW9uLT5zdGFydFBvc2l0aW9uKCk7CisgICAgVmlzaWJs ZVBvc2l0aW9uIHNlbGVjdGlvbkVuZCA9IG1faW5pdGlhbFNlbGVjdGlvbi0+ZW5kUG9zaXRpb24o KTsKKworICAgIGlmIChwb3NpdGlvbiA+IG1faW5pdGlhbFNlbGVjdGlvbi0+ZW5kUG9zaXRpb24o KSkKKyAgICAgICAgc2VsZWN0aW9uRW5kID0gbmV3UmFuZ2UtPmVuZFBvc2l0aW9uKCk7CisgICAg ZWxzZSBpZiAocG9zaXRpb24gPCBtX2luaXRpYWxTZWxlY3Rpb24tPnN0YXJ0UG9zaXRpb24oKSkK KyAgICAgICAgc2VsZWN0aW9uU3RhcnQgPSBuZXdSYW5nZS0+c3RhcnRQb3NpdGlvbigpOworICAg IAorICAgIGlmIChzZWxlY3Rpb25TdGFydC5pc05vdE51bGwoKSAmJiBzZWxlY3Rpb25FbmQuaXNO b3ROdWxsKCkpCisgICAgICAgIHJhbmdlID0gUmFuZ2U6OmNyZWF0ZSgqZnJhbWUuZG9jdW1lbnQo KSwgc2VsZWN0aW9uU3RhcnQsIHNlbGVjdGlvbkVuZCk7CisgICAgCisgICAgaWYgKHJhbmdlKQor ICAgICAgICBmcmFtZS5zZWxlY3Rpb24oKS5zZXRTZWxlY3RlZFJhbmdlKHJhbmdlLmdldCgpLCBV UFNUUkVBTSwgdHJ1ZSk7CisgICAgCisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpV bnNpZ25lZENhbGxiYWNrKHNlbGVjdGlvblN0YXJ0ID09IG1faW5pdGlhbFNlbGVjdGlvbi0+c3Rh cnRQb3NpdGlvbigpLCBjYWxsYmFja0lEKSk7Cit9CisKIHZvaWQgV2ViUGFnZTo6dXBkYXRlU2Vs ZWN0aW9uV2l0aEV4dGVudFBvaW50KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb2ludCwgdWlu dDY0X3QgY2FsbGJhY2tJRCkKIHsKICAgICBjb25zdCBGcmFtZSYgZnJhbWUgPSBtX3BhZ2UtPmZv Y3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwo=