103389 2012-11-27 03:51:37 -0800 PDFPlugin: "Show Definition" context menu item should be implemented 2012-11-30 12:51:25 -0800 1 1 1 Unclassified WebKit PDF 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 103496 1 thorton thorton andersca ap mitz webkit.review.bot oldest_to_newest 776587 0 thorton 2012-11-27 03:51:37 -0800 <rdar://problem/12710751> 776600 1 176229 thorton 2012-11-27 04:08:55 -0800 Created attachment 176229 patch 776602 2 webkit.review.bot 2012-11-27 04:13:17 -0800 Attachment 176229 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/WebProcess/Plugins/PDF/PDFPlugin.h:70: The parameter name "string" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h:70: The parameter name "point" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 776607 3 176229 thorton 2012-11-27 04:24:22 -0800 Comment on attachment 176229 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176229&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:725 > + NSMutableDictionary *fontDescriptorAttributes = [[[font fontDescriptor] fontAttributes] mutableCopy]; Whoops, this leaks. Will fix tomorrow. 776787 4 176229 ap 2012-11-27 08:38:19 -0800 Comment on attachment 176229 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176229&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:718 > + NSDictionary *attributes = [string attributesAtIndex:0 effectiveRange:0]; What makes attributes at this particular index special? 777189 5 176229 thorton 2012-11-27 13:51:51 -0800 Comment on attachment 176229 patch View in context: https://bugs.webkit.org/attachment.cgi?id=176229&action=review >> Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:718 >> + NSDictionary *attributes = [string attributesAtIndex:0 effectiveRange:0]; > > What makes attributes at this particular index special? We can only have one font for the dictionary popup, so why not the font at the beginning of the attributed string? I believe this is effectively identical to what WebPageMac does with its Ranges for web content. 778542 6 176614 thorton 2012-11-28 17:40:05 -0800 Created attachment 176614 patch (much simplified) 780095 7 176614 mitz 2012-11-30 07:19:28 -0800 Comment on attachment 176614 patch (much simplified) View in context: https://bugs.webkit.org/attachment.cgi?id=176614&action=review > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:780 > + dictionaryPopupInfo.origin = convertFromPDFViewToRootView(IntPoint(point)); Is the IntPoint() necessary? 780328 8 thorton 2012-11-30 12:51:25 -0800 (In reply to comment #7) > (From update of attachment 176614 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=176614&action=review > > > Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm:780 > > + dictionaryPopupInfo.origin = convertFromPDFViewToRootView(IntPoint(point)); > > Is the IntPoint() necessary? It is. Thanks, Dan! http://trac.webkit.org/changeset/136260 176229 2012-11-27 04:08:55 -0800 2012-11-28 17:40:05 -0800 patch define.diff text/plain 4843 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMGFiOTA1Li5kODhmYWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTItMTEtMjcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgUERGUGx1Z2luOiAiU2hvdyBEZWZpbml0aW9uIiBjb250ZXh0IG1lbnUgaXRlbSBz aG91bGQgYmUgaW1wbGVtZW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMzM4OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI3MTA3NTE+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCBleGlz dGluZyBkaWN0aW9uYXJ5IHBvcHVwIGNvZGUgd2hlbiB0aGUgY29udGV4dCBtZW51ICJTaG93IERl ZmluaXRpb24iIGl0ZW0gaXMgc2VsZWN0ZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5oOgorICAgICAgICAoUERGUGx1Z2luKTogQWRkIHNob3dEZWZpbml0 aW9uRm9yQXR0cmlidXRlZFN0cmluZyBhbmQgY29udmVydEZyb21QREZWaWV3VG9Sb290Vmlldy4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbToKKyAgICAgICAg KC1bV0tQREZMYXllckNvbnRyb2xsZXJEZWxlZ2F0ZSBzaG93RGVmaW5pdGlvbkZvckF0dHJpYnV0 ZWRTdHJpbmc6YXRQb2ludDpdKTogRm9yd2FyZCB0aGlzIGNhbGwgdG8gUERGUGx1Z2luLgorICAg ICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnNob3dEZWZpbml0aW9uRm9yQXR0cmlidXRlZFN0cmlu Zyk6IENyZWF0ZSBhIERpY3Rpb25hcnlQb3B1cEluZm8gd2l0aCB0aGUgbmVjZXNzYXJ5IGluZm9y bWF0aW9uLgorICAgICAgICBXZSBoYXZlIHRvIGRpdmlkZSB0aGUgcGFnZSBzY2FsZSBvdXQgb2Yg dGhlIGZvbnQgc2l6ZSwgYXMgV2ViS2l0IG11bHRpcGxpZXMgaXQgYmFjayBpbiBsYXRlci4KKyAg ICAgICAgQXNrIFdlYlBhZ2VQcm94eSB0byBzaG93IHRoZSBkaWN0aW9uYXJ5IHBvcHVwLgorICAg ICAgICAoV2ViS2l0OjpQREZQbHVnaW46OmNvbnZlcnRGcm9tUERGVmlld1RvUm9vdFZpZXcpOiBD b252ZXJ0IGEgcG9pbnQgZnJvbSBQREZMYXllckNvbnRyb2xsZXIgc3BhY2UgdG8gdGhlIHJvb3Qg dmlldyBzcGFjZS4KKwogMjAxMi0xMS0yNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzNTgxOC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1 Z2luLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5o CmluZGV4IGExMjMzZmEuLjczZmJjNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4uaApAQCAtNjcsNiArNjcsNyBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIGNsaWNrZWRMaW5rKE5TVVJMICopOwogICAgIHZvaWQgc2F2ZVRvUERGKCk7Cisg ICAgdm9pZCBzaG93RGVmaW5pdGlvbkZvckF0dHJpYnV0ZWRTdHJpbmcoTlNBdHRyaWJ1dGVkU3Ry aW5nICpzdHJpbmcsIENHUG9pbnQgcG9pbnQpOwogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFBE RlBsdWdpbihXZWJGcmFtZSopOwpAQCAtOTksNiArMTAwLDggQEAgcHJpdmF0ZToKICAgICAKICAg ICBib29sIHN1cHBvcnRzRm9ybXMoKTsKIAorICAgIFdlYkNvcmU6OkludFBvaW50IGNvbnZlcnRG cm9tUERGVmlld1RvUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSBjb25zdDsKKwog ICAgIFJldGFpblB0cjxDQUxheWVyPiBtX2NvbnRhaW5lckxheWVyOwogICAgIFJldGFpblB0cjxD QUxheWVyPiBtX2NvbnRlbnRMYXllcjsKICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9ob3Jpem9u dGFsU2Nyb2xsYmFyTGF5ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QREYvUERGUGx1Z2luLm1tCmluZGV4IGM3MzdmYjQuLmZlYTY3MmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLm1tCkBAIC0z MCw2ICszMCw3IEBACiAKICNpbXBvcnQgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW1wb3J0ICJEYXRh UmVmZXJlbmNlLmgiCisjaW1wb3J0ICJEaWN0aW9uYXJ5UG9wdXBJbmZvLmgiCiAjaW1wb3J0ICJQ REZLaXRJbXBvcnRzLmgiCiAjaW1wb3J0ICJQREZMYXllckNvbnRyb2xsZXJEZXRhaWxzLmgiCiAj aW1wb3J0ICJQREZQbHVnaW5Bbm5vdGF0aW9uLmgiCkBAIC0xNjYsNyArMTY3LDcgQEAgc3RhdGlj IGNvbnN0IGNoYXIqIGFubm90YXRpb25TdHlsZSA9CiAKIC0gKHZvaWQpc2hvd0RlZmluaXRpb25G b3JBdHRyaWJ1dGVkU3RyaW5nOihOU0F0dHJpYnV0ZWRTdHJpbmcgKilzdHJpbmcgYXRQb2ludDoo Q0dQb2ludClwb2ludAogewotICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgX3BkZlBsdWdp bi0+c2hvd0RlZmluaXRpb25Gb3JBdHRyaWJ1dGVkU3RyaW5nKHN0cmluZywgcG9pbnQpOwogfQog CiAtICh2b2lkKXBlcmZvcm1XZWJTZWFyY2g6KE5TU3RyaW5nICopc3RyaW5nCkBAIC03MDYsNiAr NzA3LDM5IEBAIHZvaWQgUERGUGx1Z2luOjpzYXZlVG9QREYoKQogICAgIHdlYkZyYW1lKCktPnBh Z2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTYXZlUERGVG9GaWxlSW5Eb3dubG9h ZHNGb2xkZXIoc3VnZ2VzdGVkRmlsZW5hbWUoKSwgd2ViRnJhbWUoKS0+dXJsKCksIGRhdGFSZWZl cmVuY2UpKTsKIH0KIAorSW50UG9pbnQgUERGUGx1Z2luOjpjb252ZXJ0RnJvbVBERlZpZXdUb1Jv b3RWaWV3KGNvbnN0IEludFBvaW50JiBwb2ludCkgY29uc3QKK3sKKyAgICBJbnRQb2ludCBwb2lu dEluUGx1Z2luQ29vcmRpbmF0ZXMocG9pbnQueCgpLCBzaXplKCkuaGVpZ2h0KCkgLSBwb2ludC55 KCkpOworICAgIHJldHVybiBtX3Jvb3RWaWV3VG9QbHVnaW5UcmFuc2Zvcm0uaW52ZXJzZSgpLm1h cFBvaW50KHBvaW50SW5QbHVnaW5Db29yZGluYXRlcyk7Cit9CisKK3ZvaWQgUERGUGx1Z2luOjpz aG93RGVmaW5pdGlvbkZvckF0dHJpYnV0ZWRTdHJpbmcoTlNBdHRyaWJ1dGVkU3RyaW5nICpzdHJp bmcsIENHUG9pbnQgcG9pbnQpCit7CisgICAgTlNEaWN0aW9uYXJ5ICphdHRyaWJ1dGVzID0gW3N0 cmluZyBhdHRyaWJ1dGVzQXRJbmRleDowIGVmZmVjdGl2ZVJhbmdlOjBdOworICAgIE5TRm9udCAq Zm9udCA9IFthdHRyaWJ1dGVzIG9iamVjdEZvcktleTpOU0ZvbnRBdHRyaWJ1dGVOYW1lXTsKKyAg ICBkb3VibGUgcGFnZVNjYWxlRmFjdG9yID0gcGx1Z2luVmlldygpLT5wYWdlU2NhbGVGYWN0b3Io KTsKKworICAgIGlmICghZm9udCkKKyAgICAgICAgZm9udCA9IFtOU0ZvbnQgc3lzdGVtRm9udE9m U2l6ZTpbTlNGb250IHN5c3RlbUZvbnRTaXplXSAqIHBhZ2VTY2FsZUZhY3Rvcl07CisKKyAgICBO U011dGFibGVEaWN0aW9uYXJ5ICpmb250RGVzY3JpcHRvckF0dHJpYnV0ZXMgPSBbW1tmb250IGZv bnREZXNjcmlwdG9yXSBmb250QXR0cmlidXRlc10gbXV0YWJsZUNvcHldOworICAgIGlmICghZm9u dERlc2NyaXB0b3JBdHRyaWJ1dGVzKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBQYWdlQ2xp ZW50SW1wbDo6ZGlkUGVyZm9ybURpY3Rpb25hcnlMb29rdXAgaW5mbGF0ZXMgdGhlIGZvbnQgc2l6 ZSBieSB0aGUgcGFnZSBzY2FsZSBmYWN0b3IsCisgICAgLy8gYnV0IG91ciBmb250IHNpemUgYWxy ZWFkeSBpbmNsdWRlcyBpdCwgc28gd2UgbmVlZCB0byBkaXZpZGUgdGhlIHBhZ2Ugc2NhbGUgZmFj dG9yIG91dCBoZXJlLgorICAgIGRvdWJsZSBmb250U2l6ZSA9IFtbZm9udERlc2NyaXB0b3JBdHRy aWJ1dGVzIG9iamVjdEZvcktleTpOU0ZvbnRTaXplQXR0cmlidXRlXSBkb3VibGVWYWx1ZV07Cisg ICAgZm9udFNpemUgLz0gcGFnZVNjYWxlRmFjdG9yOworICAgIFtmb250RGVzY3JpcHRvckF0dHJp YnV0ZXMgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoRG91YmxlOmZvbnRTaXplXSBmb3JL ZXk6TlNGb250U2l6ZUF0dHJpYnV0ZV07CisKKyAgICBEaWN0aW9uYXJ5UG9wdXBJbmZvIGRpY3Rp b25hcnlQb3B1cEluZm87CisgICAgZGljdGlvbmFyeVBvcHVwSW5mby50eXBlID0gRGljdGlvbmFy eVBvcHVwSW5mbzo6Q29udGV4dE1lbnU7CisgICAgZGljdGlvbmFyeVBvcHVwSW5mby5vcmlnaW4g PSBjb252ZXJ0RnJvbVBERlZpZXdUb1Jvb3RWaWV3KEludFBvaW50KHBvaW50KSk7CisgICAgZGlj dGlvbmFyeVBvcHVwSW5mby5mb250SW5mby5mb250QXR0cmlidXRlRGljdGlvbmFyeSA9IChDRkRp Y3Rpb25hcnlSZWYpZm9udERlc2NyaXB0b3JBdHRyaWJ1dGVzOworICAgIAorICAgIHdlYkZyYW1l KCktPnBhZ2UoKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEaWRQZXJmb3JtRGljdGlv bmFyeUxvb2t1cChzdHJpbmcuc3RyaW5nLCBkaWN0aW9uYXJ5UG9wdXBJbmZvKSk7Cit9CisKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gRU5BQkxFKFBERktJVF9QTFVHSU4pCg== 176614 2012-11-28 17:40:05 -0800 2012-11-30 07:19:28 -0800 patch (much simplified) define.diff text/plain 3980 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmY2Q1OTkxLi45MzI0MWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMg QEAKIDIwMTItMTEtMjggIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAK KyAgICAgICAgUERGUGx1Z2luOiAiU2hvdyBEZWZpbml0aW9uIiBjb250ZXh0IG1lbnUgaXRlbSBz aG91bGQgYmUgaW1wbGVtZW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMzM4OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI3MTA3NTE+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCBleGlz dGluZyBkaWN0aW9uYXJ5IHBvcHVwIGNvZGUgd2hlbiB0aGUgY29udGV4dCBtZW51ICJTaG93IERl ZmluaXRpb24iIGl0ZW0gaXMgc2VsZWN0ZWQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdp bnMvUERGL1BERlBsdWdpbi5oOgorICAgICAgICAoUERGUGx1Z2luKTogQWRkIHNob3dEZWZpbml0 aW9uRm9yQXR0cmlidXRlZFN0cmluZyBhbmQgY29udmVydEZyb21QREZWaWV3VG9Sb290Vmlldy4K KyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbToKKyAgICAgICAg KC1bV0tQREZMYXllckNvbnRyb2xsZXJEZWxlZ2F0ZSBzaG93RGVmaW5pdGlvbkZvckF0dHJpYnV0 ZWRTdHJpbmc6YXRQb2ludDpdKTogRm9yd2FyZCB0aGlzIGNhbGwgdG8gUERGUGx1Z2luLgorICAg ICAgICAoV2ViS2l0OjpQREZQbHVnaW46OnNob3dEZWZpbml0aW9uRm9yQXR0cmlidXRlZFN0cmlu Zyk6IENyZWF0ZSBhIERpY3Rpb25hcnlQb3B1cEluZm8gd2l0aCB0aGUgbmVjZXNzYXJ5IGluZm9y bWF0aW9uLgorICAgICAgICBBc2sgV2ViUGFnZVByb3h5IHRvIHNob3cgdGhlIGRpY3Rpb25hcnkg cG9wdXAuCisgICAgICAgIChXZWJLaXQ6OlBERlBsdWdpbjo6Y29udmVydEZyb21QREZWaWV3VG9S b290Vmlldyk6IENvbnZlcnQgYSBwb2ludCBmcm9tIFBERkxheWVyQ29udHJvbGxlciBzcGFjZSB0 byB0aGUgcm9vdCB2aWV3IHNwYWNlLgorCisyMDEyLTExLTI4ICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCiAgICAgICAgIFttYWNdIERpY3Rpb25hcnkgbG9va3VwIGJ1 YmJsZSBsb3NlcyBpbnRyYXJhbmdlIGZvcm1hdHRpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzQ5NgogICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTI3NjIxNzI+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UERGL1BERlBsdWdpbi5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9Q REZQbHVnaW4uaAppbmRleCAxMzJjMjg3Li45ZDYzMjkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvUERGUGx1Z2luLmgKQEAgLTY3LDYgKzY3LDcgQEAg cHVibGljOgogCiAgICAgdm9pZCBjbGlja2VkTGluayhOU1VSTCAqKTsKICAgICB2b2lkIHNhdmVU b1BERigpOworICAgIHZvaWQgc2hvd0RlZmluaXRpb25Gb3JBdHRyaWJ1dGVkU3RyaW5nKE5TQXR0 cmlidXRlZFN0cmluZyAqLCBDR1BvaW50KTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBQREZQ bHVnaW4oV2ViRnJhbWUqKTsKQEAgLTEwNCw2ICsxMDUsOCBAQCBwcml2YXRlOgogCiAgICAgdm9p ZCB1cGRhdGVQYWdlQW5kRGV2aWNlU2NhbGVGYWN0b3JzKCk7CiAKKyAgICBXZWJDb3JlOjpJbnRQ b2ludCBjb252ZXJ0RnJvbVBERlZpZXdUb1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JikgY29uc3Q7CisKICAgICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9jb250YWluZXJMYXllcjsKICAg ICBSZXRhaW5QdHI8Q0FMYXllcj4gbV9jb250ZW50TGF5ZXI7CiAgICAgUmV0YWluUHRyPENBTGF5 ZXI+IG1faG9yaXpvbnRhbFNjcm9sbGJhckxheWVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BERi9QREZQbHVnaW4ubW0gYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBsdWdpbi5tbQppbmRleCBmNTBmYjhjLi5kMzE3YThi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1BERlBs dWdpbi5tbQpAQCAtMjksNyArMjksOSBAQAogI2ltcG9ydCAiUERGUGx1Z2luLmgiCiAKICNpbXBv cnQgIkFyZ3VtZW50Q29kZXJzLmgiCisjaW1wb3J0ICJBdHRyaWJ1dGVkU3RyaW5nLmgiCiAjaW1w b3J0ICJEYXRhUmVmZXJlbmNlLmgiCisjaW1wb3J0ICJEaWN0aW9uYXJ5UG9wdXBJbmZvLmgiCiAj aW1wb3J0ICJQREZBbm5vdGF0aW9uVGV4dFdpZGdldERldGFpbHMuaCIKICNpbXBvcnQgIlBERktp dEltcG9ydHMuaCIKICNpbXBvcnQgIlBERkxheWVyQ29udHJvbGxlckRldGFpbHMuaCIKQEAgLTE2 Nyw3ICsxNjksNyBAQCBzdGF0aWMgY29uc3QgY2hhciogYW5ub3RhdGlvblN0eWxlID0KIAogLSAo dm9pZClzaG93RGVmaW5pdGlvbkZvckF0dHJpYnV0ZWRTdHJpbmc6KE5TQXR0cmlidXRlZFN0cmlu ZyAqKXN0cmluZyBhdFBvaW50OihDR1BvaW50KXBvaW50CiB7Ci0gICAgLy8gRklYTUU6IEltcGxl bWVudC4KKyAgICBfcGRmUGx1Z2luLT5zaG93RGVmaW5pdGlvbkZvckF0dHJpYnV0ZWRTdHJpbmco c3RyaW5nLCBwb2ludCk7CiB9CiAKIC0gKHZvaWQpcGVyZm9ybVdlYlNlYXJjaDooTlNTdHJpbmcg KilzdHJpbmcKQEAgLTc2NSw2ICs3NjcsMjQgQEAgdm9pZCBQREZQbHVnaW46OnNhdmVUb1BERigp CiAgICAgd2ViRnJhbWUoKS0+cGFnZSgpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNh dmVQREZUb0ZpbGVJbkRvd25sb2Fkc0ZvbGRlcihzdWdnZXN0ZWRGaWxlbmFtZSgpLCB3ZWJGcmFt ZSgpLT51cmwoKSwgZGF0YVJlZmVyZW5jZSkpOwogfQogCitJbnRQb2ludCBQREZQbHVnaW46OmNv bnZlcnRGcm9tUERGVmlld1RvUm9vdFZpZXcoY29uc3QgSW50UG9pbnQmIHBvaW50KSBjb25zdAor eworICAgIEludFBvaW50IHBvaW50SW5QbHVnaW5Db29yZGluYXRlcyhwb2ludC54KCksIHNpemUo KS5oZWlnaHQoKSAtIHBvaW50LnkoKSk7CisgICAgcmV0dXJuIG1fcm9vdFZpZXdUb1BsdWdpblRy YW5zZm9ybS5pbnZlcnNlKCkubWFwUG9pbnQocG9pbnRJblBsdWdpbkNvb3JkaW5hdGVzKTsKK30K Kwordm9pZCBQREZQbHVnaW46OnNob3dEZWZpbml0aW9uRm9yQXR0cmlidXRlZFN0cmluZyhOU0F0 dHJpYnV0ZWRTdHJpbmcgKnN0cmluZywgQ0dQb2ludCBwb2ludCkKK3sKKyAgICBEaWN0aW9uYXJ5 UG9wdXBJbmZvIGRpY3Rpb25hcnlQb3B1cEluZm87CisgICAgZGljdGlvbmFyeVBvcHVwSW5mby50 eXBlID0gRGljdGlvbmFyeVBvcHVwSW5mbzo6Q29udGV4dE1lbnU7CisgICAgZGljdGlvbmFyeVBv cHVwSW5mby5vcmlnaW4gPSBjb252ZXJ0RnJvbVBERlZpZXdUb1Jvb3RWaWV3KEludFBvaW50KHBv aW50KSk7CisKKyAgICBBdHRyaWJ1dGVkU3RyaW5nIGF0dHJpYnV0ZWRTdHJpbmc7CisgICAgYXR0 cmlidXRlZFN0cmluZy5zdHJpbmcgPSBzdHJpbmc7CisKKyAgICB3ZWJGcmFtZSgpLT5wYWdlKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RGlkUGVyZm9ybURpY3Rpb25hcnlMb29rdXAo YXR0cmlidXRlZFN0cmluZywgZGljdGlvbmFyeVBvcHVwSW5mbykpOworfQorCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJMRShQREZLSVRfUExVR0lOKQo=