62547 2011-06-13 10:18:26 -0700 kAXTextMarkerForPositionParameterizedAttribute does not work correctly in WK2 2011-06-13 12:10:36 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach darin webkit.review.bot oldest_to_newest 419624 0 cfleizach 2011-06-13 10:18:26 -0700 With WK2 I am running into some serious issues with the AXTextMarker API. There seems to be a significant change in accessing webkit content. I used to grab the current paragraph of text below the cursor in a webkit view using this strategy: get kAXTextMarkerForPositionParametrizedAttribute, then kAXParagraphTextMarkerRangeForTextMarkerParametrizedAttribute followed by kAXStringForTextMarkerRangeParameterizedAttribute. This seems to give no string or text from a completely different part of the web site. 419625 1 cfleizach 2011-06-13 10:18:33 -0700 rdar://9555733 419630 2 96969 cfleizach 2011-06-13 10:26:44 -0700 Created attachment 96969 patch 419636 3 webkit.review.bot 2011-06-13 10:30:01 -0700 Attachment 96969 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/WebPageProxy.h:616: The parameter name "point" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 16 files If any of these errors are false positives, please file a bug against check-webkit-style. 419642 4 96969 darin 2011-06-13 10:33:53 -0700 Comment on attachment 96969 patch View in context: https://bugs.webkit.org/attachment.cgi?id=96969&action=review > Source/WebKit2/UIProcess/WebPageProxy.h:610 > + void screenToWindow(const WebCore::IntPoint& point, WebCore::IntPoint& result); The stylebot suggests leaving out the name “point” here, and I agree. Unless you want to call this screenPoint. > Source/WebKit2/UIProcess/WebPageProxy.messages.in:55 > + ScreenToWindow(WebCore::IntPoint point) -> (WebCore::IntPoint resultPoint) I’d call these screenPoint and windowPoint rather than point and resultPoint. 419756 5 cfleizach 2011-06-13 12:10:36 -0700 http://trac.webkit.org/changeset/88669 96969 2011-06-13 10:26:44 -0700 2011-06-13 10:33:53 -0700 patch patch.txt text/plain 11333 cfleizach SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4NjQ4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDYtMTMgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBrQVhUZXh0TWFya2VyRm9yUG9zaXRpb25QYXJhbWV0cml6 ZWRBdHRyaWJ1dGUgZG9lcyBub3Qgd29yayBjb3JyZWN0bHkgaW4gV0syCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjU0NworCisgICAgICAgIEltcGxl bWVudCB0aGUgbWlzc2luZyBzY3JlZW5Ub1dpbmRvdyBtZXRob2QgZm9yIFdLMi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6UGFnZUNsaWVudEltcGw6OnNjcmVlblRvV2luZG93KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1Bh Z2VDbGllbnRJbXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudElt cGwubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1dpbmRvdyk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcDoKKyAgICAgICAgKFFXS1Bh Z2VQcml2YXRlOjpzY3JlZW5Ub1dpbmRvdyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x d2twYWdlX3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZUNsaWVudC5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNjcmVlblRvV2luZG93KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAg KiBVSVByb2Nlc3Mvd2luL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3Ojpz Y3JlZW5Ub1dpbmRvdyk6CisgICAgICAgICogVUlQcm9jZXNzL3dpbi9XZWJWaWV3Lmg6CisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6OnNjcmVlblRvV2luZG93KToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnNjcmVlblRvV2luZG93KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oOgorCiAyMDExLTA2LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5jcHAJKHJldmlzaW9uIDg3NzY2KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MDcsMTAgKzQwNyw5IEBACiB9CiAjZW5kaWYKIAotSW50UG9pbnQgV2ViQ2hyb21lQ2xpZW50Ojpz Y3JlZW5Ub1dpbmRvdyhjb25zdCBJbnRQb2ludCYpIGNvbnN0CitJbnRQb2ludCBXZWJDaHJvbWVD bGllbnQ6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBJbnRQb2ludCgpOworICAgIHJldHVybiBt X3BhZ2UtPnNjcmVlblRvV2luZG93KHBvaW50KTsKIH0KIAogSW50UmVjdCBXZWJDaHJvbWVDbGll bnQ6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpIGNvbnN0CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA4 Nzc2NikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTMzNCw2ICsxMzM0LDEzIEBACiB7CiAgICAgbV91c2VyQWdlbnQg PSB1c2VyQWdlbnQ7CiB9CisgIAorSW50UG9pbnQgV2ViUGFnZTo6c2NyZWVuVG9XaW5kb3coY29u c3QgSW50UG9pbnQmIHBvaW50KQoreworICAgIEludFBvaW50IHJlc3VsdFBvaW50OworICAgIHNl bmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNjcmVlblRvV2luZG93KHBvaW50KSwgTWVz c2FnZXM6OldlYlBhZ2VQcm94eTo6U2NyZWVuVG9XaW5kb3c6OlJlcGx5KHJlc3VsdFBvaW50KSk7 CisgICAgcmV0dXJuIHJlc3VsdFBvaW50OworfQogICAgIAogSW50UmVjdCBXZWJQYWdlOjp3aW5k b3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQogewpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiA4Nzc2NikKKysrIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAg LTI3MSw2ICsyNzEsNyBAQAogICAgIHZvaWQgaW5zdGFsbFBhZ2VPdmVybGF5KFBhc3NSZWZQdHI8 UGFnZU92ZXJsYXk+KTsKICAgICB2b2lkIHVuaW5zdGFsbFBhZ2VPdmVybGF5KFBhZ2VPdmVybGF5 KiwgYm9vbCBmYWRlT3V0KTsKICAgICBib29sIGhhc1BhZ2VPdmVybGF5KCkgY29uc3QgeyByZXR1 cm4gbV9wYWdlT3ZlcmxheTsgfQorICAgIFdlYkNvcmU6OkludFBvaW50IHNjcmVlblRvV2luZG93 KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7CiAgICAgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dU b1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAKICAgICBQYXNzUmVmUHRyPFdlYklt YWdlPiBzbmFwc2hvdEluVmlld0Nvb3JkaW5hdGVzKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBJ bWFnZU9wdGlvbnMpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAJKHJldmlzaW9uIDg3NzY2KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwNzIsNyArMjA3MiwxMiBAQAogewogICAg IG5ld1dpbmRvd0ZyYW1lID0gbV9wYWdlQ2xpZW50LT5jb252ZXJ0VG9Vc2VyU3BhY2UobV91aUNs aWVudC53aW5kb3dGcmFtZSh0aGlzKSk7CiB9Ci0KKyAgICAKK3ZvaWQgV2ViUGFnZVByb3h5Ojpz Y3JlZW5Ub1dpbmRvdyhjb25zdCBJbnRQb2ludCYgcG9pbnQsIEludFBvaW50JiByZXN1bHQpCit7 CisgICAgcmVzdWx0ID0gbV9wYWdlQ2xpZW50LT5zY3JlZW5Ub1dpbmRvdyhwb2ludCk7Cit9Cisg ICAgCiB2b2lkIFdlYlBhZ2VQcm94eTo6d2luZG93VG9TY3JlZW4oY29uc3QgSW50UmVjdCYgdmll d1JlY3QsIEludFJlY3QmIHJlc3VsdCkKIHsKICAgICByZXN1bHQgPSBtX3BhZ2VDbGllbnQtPndp bmRvd1RvU2NyZWVuKHZpZXdSZWN0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1BhZ2VDbGllbnRJbXBsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAkocmV2aXNpb24gODc3NjYpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCSh3b3JraW5nIGNv cHkpCkBAIC03OSw2ICs3OSw3IEBACiAKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBj b252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAgICB2aXJ0 dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5Ub1dpbmRv dyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVj dCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgCiAgICAgdmly dHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYs IGJvb2wgd2FzRXZlbnRIYW5kbGVkKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCShyZXZpc2lvbiA4Nzc2NikKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLm1tCSh3b3JraW5n IGNvcHkpCkBAIC0yNzgsNiArMjc4LDEyIEBACiB7CiAgICAgcmV0dXJuIFttX3drVmlldyBfY29u dmVydFRvVXNlclNwYWNlOnJlY3RdOwogfQorICAgCitJbnRQb2ludCBQYWdlQ2xpZW50SW1wbDo6 c2NyZWVuVG9XaW5kb3coY29uc3QgSW50UG9pbnQmIHBvaW50KQoreworICAgIE5TUG9pbnQgd2lu ZG93Q29vcmQgPSBbW21fd2tWaWV3IHdpbmRvd10gY29udmVydFNjcmVlblRvQmFzZTpwb2ludF07 CisgICAgcmV0dXJuIEludFBvaW50KFttX3drVmlldyBjb252ZXJ0UG9pbnQ6d2luZG93Q29vcmQg ZnJvbVZpZXc6bmlsXSk7Cit9CiAgICAgCiBJbnRSZWN0IFBhZ2VDbGllbnRJbXBsOjp3aW5kb3dU b1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQogewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCShyZXZpc2lvbiA4Nzc2NikKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIy OCw2ICsyMjgsMTEgQEAKICAgICByZXR1cm4gcmVjdDsKIH0KIAorSW50UG9pbnQgUVdLUGFnZVBy aXZhdGU6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBvaW50JiBwb2ludCkKK3sKKyAgICByZXR1 cm4gcG9pbnQ7Cit9CisKIEludFJlY3QgUVdLUGFnZVByaXZhdGU6OndpbmRvd1RvU2NyZWVuKGNv bnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgcmV0dXJuIHJlY3Q7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2VfcC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZV9wLmgJKHJldmlzaW9uIDg3NzY2KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlX3AuaAkod29ya2luZyBjb3B5 KQpAQCAtNzgsNiArNzgsNyBAQAogICAgIHZpcnR1YWwgdm9pZCBleGVjdXRlVW5kb1JlZG8oV2Vi UGFnZVByb3h5OjpVbmRvT3JSZWRvKTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBj b252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAgICB2aXJ0 dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5Ub1dpbmRv dyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVj dCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAKICAgICB2aXJ0dWFs IHZvaWQgZG9uZVdpdGhLZXlFdmVudChjb25zdCBXZWJLaXQ6Ok5hdGl2ZVdlYktleWJvYXJkRXZl bnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgJKHJldmlzaW9uIDg3NzY2KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaAkod29ya2lu ZyBjb3B5KQpAQCAtNzUsNiArNzUsNyBAQAogICAgIHZpcnR1YWwgdm9pZCBleGVjdXRlVW5kb1Jl ZG8oV2ViUGFnZVByb3h5OjpVbmRvT3JSZWRvKTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0 UmVjdCBjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAg ICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2Vi Q29yZTo6RmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5U b1dpbmRvdyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6 SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmly dHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYs IGJvb2wgd2FzRXZlbnRIYW5kbGVkKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkTm90SGFuZGxlS2V5 RXZlbnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYpOwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcAkocmV2aXNp b24gODc3NjYpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50 SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NCw2ICsxODQsMTIgQEAKICAgICByZXR1cm4g dmlld1JlY3Q7CiB9CiAKK0ludFBvaW50IFBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1dpbmRvdyhj b25zdCBJbnRQb2ludCYgcG9pbnQpCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1 cm4gcG9pbnQ7Cit9CisKIEludFJlY3QgUGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKGNv bnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgcmV0dXJuIGNvbnZlcnRXaWRnZXRSZWN0VG9TY3Jl ZW5SZWN0KG1fdmlld1dpZGdldCwgcmVjdCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3Mvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDg3NzY2KQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3dpbi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEyMSw2ICsxMTIxLDEx IEBACiAgICAgcmV0dXJuIHJlY3Q7CiB9CiAKK0ludFBvaW50IFdlYlZpZXc6OnNjcmVlblRvV2lu ZG93KGNvbnN0IEludFBvaW50JiBwb2ludCkKK3sKKyAgICByZXR1cm4gcG9pbnQ7Cit9CisKIElu dFJlY3QgV2ViVmlldzo6d2luZG93VG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICAg ICByZXR1cm4gcmVjdDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmll dy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmlldy5o CShyZXZpc2lvbiA4Nzc2NikKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy93aW4vV2ViVmll dy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xOTEsNiArMTkxLDcgQEAKICAgICB2aXJ0dWFsIHZvaWQg ZXhlY3V0ZVVuZG9SZWRvKFdlYlBhZ2VQcm94eTo6VW5kb09yUmVkbyk7CiAgICAgdmlydHVhbCBX ZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvRGV2aWNlU3BhY2UoY29uc3QgV2ViQ29yZTo6Rmxv YXRSZWN0Jik7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvVXNlclNw YWNlKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOworICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50 UG9pbnQgc2NyZWVuVG9XaW5kb3coY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKTsKICAgICB2aXJ0 dWFsIFdlYkNvcmU6OkludFJlY3Qgd2luZG93VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVj dCYpOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2ZW50KGNvbnN0IE5hdGl2ZVdlYktl eWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCk7CiAgICAgdmlydHVhbCB2b2lkIGNv bXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlZChib29sKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgJKHJldmlzaW9uIDg3NzY2KQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC02MDcsNiArNjA3LDcg QEAKICAgICB2b2lkIGdldElzUmVzaXphYmxlKGJvb2wmIGlzUmVzaXphYmxlKTsKICAgICB2b2lk IHNldFdpbmRvd0ZyYW1lKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpOwogICAgIHZvaWQgZ2V0 V2luZG93RnJhbWUoV2ViQ29yZTo6RmxvYXRSZWN0Jik7CisgICAgdm9pZCBzY3JlZW5Ub1dpbmRv dyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgcG9pbnQsIFdlYkNvcmU6OkludFBvaW50JiByZXN1 bHQpOwogICAgIHZvaWQgd2luZG93VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgdmll d1JlY3QsIFdlYkNvcmU6OkludFJlY3QmIHJlc3VsdCk7CiAgICAgdm9pZCBydW5CZWZvcmVVbmxv YWRDb25maXJtUGFuZWwoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1aW50NjRfdCBmcmFtZUlELCBi b29sJiBzaG91bGRDbG9zZSk7CiAgICAgdm9pZCBkaWRDaGFuZ2VWaWV3cG9ydERhdGEoY29uc3Qg V2ViQ29yZTo6Vmlld3BvcnRBcmd1bWVudHMmKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gODc3NjYpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3Jr aW5nIGNvcHkpCkBAIC01Miw2ICs1Miw3IEBACiAgICAgR2V0SXNSZXNpemFibGUoKSAtPiAoYm9v bCBpc1Jlc2l6YWJsZSkKICAgICBTZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9hdFJlY3Qgd2lu ZG93RnJhbWUpCiAgICAgR2V0V2luZG93RnJhbWUoKSAtPiAoV2ViQ29yZTo6RmxvYXRSZWN0IHdp bmRvd0ZyYW1lKQorICAgIFNjcmVlblRvV2luZG93KFdlYkNvcmU6OkludFBvaW50IHBvaW50KSAt PiAoV2ViQ29yZTo6SW50UG9pbnQgcmVzdWx0UG9pbnQpCiAgICAgV2luZG93VG9TY3JlZW4oV2Vi Q29yZTo6SW50UmVjdCByZWN0KSAtPiAoV2ViQ29yZTo6SW50UmVjdCBzY3JlZW5GcmFtZSkKICAg ICBSdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWwoV1RGOjpTdHJpbmcgbWVzc2FnZSwgdWludDY0 X3QgZnJhbWVJRCkgLT4gKGJvb2wgc2hvdWxkQ2xvc2UpCiAgICAgUGFnZURpZFNjcm9sbCgpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlQ2xpZW50LmgJKHJldmlzaW9uIDg3NzY2KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAkod29ya2luZyBjb3B5KQpA QCAtMTI3LDYgKzEyNyw3IEBACiAjZW5kaWYKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVj dCBjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSA9IDA7CiAg ICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvVXNlclNwYWNlKGNvbnN0IFdl YkNvcmU6OkZsb2F0UmVjdCYpID0gMDsKKyAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFBvaW50IHNj cmVlblRvV2luZG93KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgPSAwOwogICAgIHZpcnR1YWwg V2ViQ29yZTo6SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jikg PSAwOwogICAgIAogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2ZW50KGNvbnN0IE5hdGl2 ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkgPSAwOwo=