108418 2013-01-30 19:50:32 -0800 PDFPlugin: Should respond to three-finger tap for dictionary definitions 2013-01-30 21:04:04 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ap sam simon.fraser oldest_to_newest 820998 0 thorton 2013-01-30 19:50:32 -0800 Have to snatch performDictionaryLookupAtLocation away from WebPageMac and route it through PDFLayerController. <rdar://problem/13121409> 821002 1 185661 thorton 2013-01-30 19:54:56 -0800 Created attachment 185661 patch 821009 2 185661 simon.fraser 2013-01-30 20:04:55 -0800 Comment on attachment 185661 patch View in context: https://bugs.webkit.org/attachment.cgi?id=185661&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:935 > + if ([lookupSelection string] && [[lookupSelection string] isNotEqualTo:@""]) Better to test [[lookupSelection string] length], which you can do without null-checking [lookupSelection string] 821047 3 thorton 2013-01-30 21:04:04 -0800 http://trac.webkit.org/changeset/141372 185661 2013-01-30 19:54:56 -0800 2013-01-30 20:04:54 -0800 patch dictionary2.diff text/plain 9307 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkZGUwZDQyLi5mNDFkNTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTMtMDEtMzAgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiBTaG91bGQgcmVzcG9uZCB0byB0aHJlZS1maW5nZXIgdGFwIGZv ciBkaWN0aW9uYXJ5IGRlZmluaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDg0MTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzMTIxNDA5 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmg6IEFkZCBkZWZhdWx0IGlt cGxlbWVudGF0aW9uIG9mIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbi4KKyAgICAg ICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERkxheWVyQ29udHJvbGxlckRldGFpbHMuaDog QWRkIGdldFNlbGVjdGlvbkZvcldvcmRBdFBvaW50IGFuZCBzZWFyY2hJbkRpY3Rpb25hcnlXaXRo U2VsZWN0aW9uLgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmg6 IEFkZCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24uCisgICAgICAgICogV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW06IEdyYWIgYSBQREZTZWxlY3Rpb24gcmVwcmVz ZW50aW5nIHRoZSB3b3JkIGVuY29tcGFzc2luZyB0aGUgZ2l2ZW4gcG9pbnQsIGFuZAorICAgICAg ICB0aHJvdyB1cCBhIGRpY3Rpb25hcnkgcG9wb3Zlci4KKyAgICAgICAgKFdlYktpdDo6UERGUGx1 Z2luOjpwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24pOgorICAgICAgICAqIFdlYlBy b2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLmg6ICBBZGQgZGVmYXVsdCBpbXBsZW1l bnRhdGlvbiBvZiBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24uCisgICAgICAgICog V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oOiAgQWRkIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3Vw QXRMb2NhdGlvbi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaDog QWRkIGRlZmF1bHQgaW1wbGVtZW50YXRpb24gb2YgcGVyZm9ybURpY3Rpb25hcnlMb29rdXBBdExv Y2F0aW9uLgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDogCisg ICAgICAgIChXZWJLaXQ6OlBsdWdpblZpZXc6OnBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2Nh dGlvbik6IEZvcndhcmQgcGVyZm9ybURpY3Rpb25hcnlMb29rdXBBdExvY2F0aW9uIHRvIHRoZSBw bHVnaW4uCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDogQWRkIHBl cmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbi4KKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZv cm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbik6IEludGVyY2VwdCBwZXJmb3JtRGljdGlvbmFy eUxvb2t1cEF0TG9jYXRpb24sIGFuZCBnaXZlCisgICAgICAgIHRoZSBtYWluLWZyYW1lIHBsdWdp biAoaWYgaXQgZXhpc3RzKSBhIGNoYW5jZSB0byBoYW5kbGUgaXQuCisKIDIwMTMtMDEtMzAgIEh1 YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgQ29vcmRp bmF0ZWQgR3JhcGhpY3M6IExheWVyVHJlZVJlbmRlcmVyIG1hbmFnZXMgdGhlIHN1cmZhY2Ugb2Yg VXBkYXRlQXRsYXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCmluZGV4IGI5MmY1YzkuLmQ4MzczYjQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9O ZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCkBAIC0yNDksNiArMjQ5LDggQEAgcHJpdmF0ZToKIAog ICAgIHZpcnR1YWwgYm9vbCBnZXRSZXNvdXJjZURhdGEoY29uc3QgdW5zaWduZWQgY2hhciomIC8q IGJ5dGVzICovLCB1bnNpZ25lZCYgLyogbGVuZ3RoICovKSBjb25zdCBPVkVSUklERSB7IHJldHVy biBmYWxzZTsgfQogCisgICAgdmlydHVhbCBib29sIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRM b2NhdGlvbihjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JikgT1ZFUlJJREUgeyByZXR1cm4gZmFs c2U7IH0KKwogICAgIHZvaWQgdXBkYXRlTlBOUHJpdmF0ZU1vZGUoKTsKIAogI2lmIFBMVUdJTl9B UkNISVRFQ1RVUkUoV0lOKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BERi9QREZMYXllckNvbnRyb2xsZXJEZXRhaWxzLmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERkxheWVyQ29udHJvbGxlckRldGFpbHMuaAppbmRleCA4 Y2I4ZDBhLi43YzFmY2E5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUERGL1BERkxheWVyQ29udHJvbGxlckRldGFpbHMuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERkxheWVyQ29udHJvbGxlckRldGFpbHMuaApAQCAt ODgsNiArODgsNyBAQAogLSAoUERGU2VsZWN0aW9uICopc2VhcmNoU2VsZWN0aW9uOwogLSAodm9p ZClzZXRTZWFyY2hTZWxlY3Rpb246KFBERlNlbGVjdGlvbiAqKXNlbGVjdGlvbjsKIC0gKHZvaWQp Z290b1NlbGVjdGlvbjooUERGU2VsZWN0aW9uICopc2VsZWN0aW9uOworLSAoUERGU2VsZWN0aW9u ICopZ2V0U2VsZWN0aW9uRm9yV29yZEF0UG9pbnQ6KENHUG9pbnQpcG9pbnQ7CiAKIC0gKHZvaWQp Y29weVNlbGVjdGlvbjsKIC0gKHZvaWQpc2VsZWN0QWxsOwpAQCAtOTksNCArMTAwLDYgQEAKIAog LSAoQ0dSZWN0KWJvdW5kc0ZvckFubm90YXRpb246KFBERkFubm90YXRpb24gKilhbm5vdGF0aW9u OwogCistICh2b2lkKXNlYXJjaEluRGljdGlvbmFyeVdpdGhTZWxlY3Rpb246KFBERlNlbGVjdGlv biAqKXNlbGVjdGlvbjsKKwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QREYvUERGUGx1Z2luLmgKaW5kZXggY2M1NGZkMC4uMjRmNDQ3MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCkBAIC0x MDQsNiArMTA0LDggQEAgcHJpdmF0ZToKIAogICAgIFBERlNlbGVjdGlvbiAqbmV4dE1hdGNoRm9y U3RyaW5nKGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBCT09MIHNlYXJjaEZvcndhcmQsIEJPT0wgY2Fz ZVNlbnNpdGl2ZSwgQk9PTCB3cmFwU2VhcmNoLCBQREZTZWxlY3Rpb24gKmluaXRpYWxTZWxlY3Rp b24sIEJPT0wgc3RhcnRJblNlbGVjdGlvbik7CiAKKyAgICB2aXJ0dWFsIGJvb2wgcGVyZm9ybURp Y3Rpb25hcnlMb29rdXBBdExvY2F0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKSBPVkVS UklERTsKKwogICAgIC8vIFNjcm9sbGFibGVBcmVhIGZ1bmN0aW9ucy4KICAgICB2aXJ0dWFsIHZv aWQgc2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JikgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGVTY3JvbGxiYXJSZWN0KFdlYkNvcmU6OlNjcm9sbGJh ciosIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSBPVkVSUklERTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0KaW5kZXggOTRhN2QwMC4u NzdiMTg4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BE Ri9QREZQbHVnaW4ubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BE Ri9QREZQbHVnaW4ubW0KQEAgLTkyOCw2ICs5MjgsMTYgQEAgYm9vbCBQREZQbHVnaW46OmZpbmRT dHJpbmcoY29uc3QgU3RyaW5nJiB0YXJnZXQsIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMs IHUKICAgICByZXR1cm4gbWF0Y2hDb3VudCA+IDA7CiB9CiAKK2Jvb2wgUERGUGx1Z2luOjpwZXJm b3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYg cG9pbnQpCit7CisgICAgUERGU2VsZWN0aW9uKiBsb29rdXBTZWxlY3Rpb24gPSBbbV9wZGZMYXll ckNvbnRyb2xsZXIuZ2V0KCkgZ2V0U2VsZWN0aW9uRm9yV29yZEF0UG9pbnQ6Y29udmVydEZyb21Q bHVnaW5Ub1BERlZpZXcoSW50UG9pbnQocG9pbnQpKV07CisKKyAgICBpZiAoW2xvb2t1cFNlbGVj dGlvbiBzdHJpbmddICYmIFtbbG9va3VwU2VsZWN0aW9uIHN0cmluZ10gaXNOb3RFcXVhbFRvOkAi Il0pCisgICAgICAgIFttX3BkZkxheWVyQ29udHJvbGxlci5nZXQoKSBzZWFyY2hJbkRpY3Rpb25h cnlXaXRoU2VsZWN0aW9uOmxvb2t1cFNlbGVjdGlvbl07CisKKyAgICByZXR1cm4gdHJ1ZTsKK30K KwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBFTkFCTEUoUERGS0lUX1BMVUdJ TikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2lt cGxlUERGUGx1Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1Np bXBsZVBERlBsdWdpbi5oCmluZGV4IDFhNjUxZTMuLjExMGU4YTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLmgKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9TaW1wbGVQREZQbHVnaW4uaApA QCAtMTc4LDYgKzE3OCw3IEBAIHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIGJvb2wgZmluZFN0cmlu Zyhjb25zdCBTdHJpbmcmLCBXZWJDb3JlOjpGaW5kT3B0aW9ucywgdW5zaWduZWQpIE9WRVJSSURF IHsgcmV0dXJuIGZhbHNlOyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgZ2V0UmVzb3VyY2VEYXRhKGNv bnN0IHVuc2lnbmVkIGNoYXIqJiBieXRlcywgdW5zaWduZWQmIGxlbmd0aCkgY29uc3QgT1ZFUlJJ REU7CisgICAgdmlydHVhbCBib29sIHBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbihj b25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JikgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0KIAog ICAgIFdlYkNvcmU6OkludFNpemUgbV9zY3JvbGxPZmZzZXQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaAppbmRleCA5OTc1YmQwLi4yM2E5ZWI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luLmgKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCkBAIC0yNjUsNiArMjY1LDgg QEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGdldFJlc291cmNlRGF0YShjb25zdCB1bnNp Z25lZCBjaGFyKiYgYnl0ZXMsIHVuc2lnbmVkJiBsZW5ndGgpIGNvbnN0ID0gMDsKIAorICAgIHZp cnR1YWwgYm9vbCBwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oY29uc3QgV2ViQ29y ZTo6RmxvYXRQb2ludCYpID0gMDsKKwogcHJvdGVjdGVkOgogICAgIFBsdWdpbigpOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oCmluZGV4IDYx M2NkNWMuLjU5ZmM3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5Qcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5Qcm94eS5oCkBAIC0xMzQsNiArMTM0LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFs IFdlYkNvcmU6OkludFBvaW50IGNvbnZlcnRUb1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBv aW50JikgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIGJvb2wgZ2V0UmVzb3VyY2VEYXRh KGNvbnN0IHVuc2lnbmVkIGNoYXIqJiAvKiBieXRlcyAqLywgdW5zaWduZWQmIC8qIGxlbmd0aCAq LykgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIGJvb2wgcGVy Zm9ybURpY3Rpb25hcnlMb29rdXBBdExvY2F0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQm KSBPVkVSUklERSB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgZmxvYXQgY29udGVudHNTY2FsZUZh Y3RvcigpOwogICAgIGJvb2wgbmVlZHNCYWNraW5nU3RvcmUoKSBjb25zdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBkZTdkOTE4 Li4xMGYyZjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblZpZXcuY3BwCkBAIC04ODcsNiArODg3LDE0IEBAIGJvb2wgUGx1Z2luVmlldzo6Z2V0UmVz b3VyY2VEYXRhKGNvbnN0IHVuc2lnbmVkIGNoYXIqJiBieXRlcywgdW5zaWduZWQmIGxlbmd0aCkK ICAgICByZXR1cm4gbV9wbHVnaW4tPmdldFJlc291cmNlRGF0YShieXRlcywgbGVuZ3RoKTsKIH0K IAorYm9vbCBQbHVnaW5WaWV3OjpwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oY29u c3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgcG9pbnQpCit7CisgICAgaWYgKCFtX2lzSW5pdGlhbGl6 ZWQgfHwgIW1fcGx1Z2luKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gbV9w bHVnaW4tPnBlcmZvcm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbihwb2ludCk7Cit9CisKIHZv aWQgUGx1Z2luVmlldzo6bm90aWZ5V2lkZ2V0KFdpZGdldE5vdGlmaWNhdGlvbiBub3RpZmljYXRp b24pCiB7CiAgICAgc3dpdGNoIChub3RpZmljYXRpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5oCmluZGV4IGM5YmFiMDkuLmVlYzIzNmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApAQCAt MTAwLDYgKzEwMCw3IEBAIHB1YmxpYzoKICAgICBib29sIHNob3VsZEFsbG93U2NyaXB0aW5nKCk7 CiAKICAgICBib29sIGdldFJlc291cmNlRGF0YShjb25zdCB1bnNpZ25lZCBjaGFyKiYgYnl0ZXMs IHVuc2lnbmVkJiBsZW5ndGgpIGNvbnN0OworICAgIGJvb2wgcGVyZm9ybURpY3Rpb25hcnlMb29r dXBBdExvY2F0aW9uKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsKIAogcHJpdmF0ZToKICAg ICBQbHVnaW5WaWV3KFBhc3NSZWZQdHI8V2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQ+LCBQYXNz UmVmUHRyPFBsdWdpbj4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VN YWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMu bW0KaW5kZXggOGQ0MTA5ZS4uZTM2N2ExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQpAQCAtNTIsNiArNTIsNyBAQAogI2lt cG9ydCA8V2ViQ29yZS9OZXR3b3JraW5nQ29udGV4dC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYWdl Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BsYXRmb3JtS2V5Ym9hcmRFdmVudC5oPgorI2ltcG9ydCA8 V2ViQ29yZS9QbHVnaW5Eb2N1bWVudC5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZXNvdXJjZUhhbmRs ZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZW5kZXJPYmplY3QuaD4KICNpbXBvcnQgPFdlYkNvcmUv UmVuZGVyU3R5bGUuaD4KQEAgLTQ3MSw2ICs0NzIsMTQgQEAgdm9pZCBXZWJQYWdlOjpwZXJmb3Jt RGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oY29uc3QgRmxvYXRQb2ludCYgZmxvYXRQb2ludCkK ICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAoZnJhbWUtPmRvY3Vt ZW50KCktPmlzUGx1Z2luRG9jdW1lbnQoKSkgeworICAgICAgICBQbHVnaW5Eb2N1bWVudCogcGx1 Z2luRG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxQbHVnaW5Eb2N1bWVudCo+KGZyYW1lLT5kb2N1bWVu dCgpKTsKKyAgICAgICAgUGx1Z2luVmlldyogcGx1Z2luVmlldyA9IHN0YXRpY19jYXN0PFBsdWdp blZpZXcqPihwbHVnaW5Eb2N1bWVudC0+cGx1Z2luV2lkZ2V0KCkpOworCisgICAgICAgIGlmIChw bHVnaW5WaWV3LT5wZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oZmxvYXRQb2ludCkp CisgICAgICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgLy8gRmluZCB0aGUgZnJhbWUgdGhl IHBvaW50IGlzIG92ZXIuCiAgICAgSW50UG9pbnQgcG9pbnQgPSByb3VuZGVkSW50UG9pbnQoZmxv YXRQb2ludCk7CiAgICAgSGl0VGVzdFJlc3VsdCByZXN1bHQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVy KCktPmhpdFRlc3RSZXN1bHRBdFBvaW50KGZyYW1lLT52aWV3KCktPndpbmRvd1RvQ29udGVudHMo cG9pbnQpLCBmYWxzZSk7Cg==