58473 2011-04-13 13:14:14 -0700 REGRESSION: Links are clickable when a contentEditable is set to true 2011-04-13 15:41:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica andersca enrica mitz sam webkit.review.bot oldest_to_newest 385171 0 enrica 2011-04-13 13:14:14 -0700 Repro steps: 1. Launch Safari and navigate to http://www.mozilla.org/editor/midasdemo/ 2. Paste in the editor some content previously copied that contains links. 3. Click on one of the links Expected No navigation takes place. Actual The page pointed by the link gets loaded in the editor frame. 385172 1 enrica 2011-04-13 13:14:34 -0700 <rdar://problem/9256793> 385178 2 89444 enrica 2011-04-13 13:36:34 -0700 Created attachment 89444 Patch 385179 3 89444 mitz 2011-04-13 13:40:23 -0700 Comment on attachment 89444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89444&action=review > Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h:53 > +enum WKEditableLinkBehavior { > + WKEditableLinkDefaultBehavior, > + WKEditableLinkAlwaysLive, > + WKEditableLinkOnlyLiveWithShiftKey, > + WKEditableLinkLiveWhenNotFocused, > + WKEditableLinkNeverLive > +}; > +typedef enum WKEditableLinkBehavior WKEditableLinkBehavior; CF-style constants should be prefixed with a lowercase k. These are also missing the word “Behavior”. 385184 4 89447 enrica 2011-04-13 13:48:46 -0700 Created attachment 89447 Patch2 Addresses Dan's comments. 385233 5 enrica 2011-04-13 14:27:20 -0700 http://trac.webkit.org/changeset/83766 385270 6 89469 enrica 2011-04-13 14:56:07 -0700 Created attachment 89469 Follow-up patch 385274 7 webkit.review.bot 2011-04-13 14:59:11 -0700 Attachment 89469 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/API/C/WKAPICast.h:190: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Source/WebKit2/UIProcess/API/C/WKPreferences.cpp:34: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 385294 8 89476 enrica 2011-04-13 15:18:36 -0700 Created attachment 89476 Patch4 385297 9 89476 mitz 2011-04-13 15:21:00 -0700 Comment on attachment 89476 Patch4 View in context: https://bugs.webkit.org/attachment.cgi?id=89476&action=review > Source/WebKit2/UIProcess/API/C/WKAPICast.h:46 > +#include <WebCore/Settings.h> Strange that this is needed here. > Source/WebKit2/UIProcess/API/C/WKPreferences.cpp:34 > +#include <WebCore/Settings.h> Ditto. 385298 10 webkit.review.bot 2011-04-13 15:21:09 -0700 Attachment 89476 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/API/C/WKAPICast.h:190: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Source/WebKit2/UIProcess/API/C/WKAPICast.h:209: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Source/WebKit2/UIProcess/API/C/WKPreferences.cpp:34: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 3 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 385318 11 enrica 2011-04-13 15:41:25 -0700 http://trac.webkit.org/changeset/83778. Addressed style issues before landing. 89444 2011-04-13 13:36:34 -0700 2011-04-13 13:48:46 -0700 Patch editableclicks.txt text/plain 5463 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzU3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTMgIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBMaW5rcyBhcmUgY2xpY2thYmxlIHdoZW4g YSBjb250ZW50RWRpdGFibGUgaXMgc2V0IHRvIHRydWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODQ3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0v OTI1Njc5Mz4KKyAgICAgICAgCisgICAgICAgIEFkZGVkIHN1cHBvcnQgZm9yIGVkaXRhYmxlIGxp bmsgYmVoYXZpb3IgcHJvcGVydHkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNT dG9yZS5jcHA6CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZl cmVuY2VzU2V0RWRpdGFibGVMaW5rQmVoYXZpb3IpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dEVkaXRhYmxlTGlua0JlaGF2aW9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKwogMjAx MS0wNC0xMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2 ICsyOCw3IEBACiAKICNpbmNsdWRlICJGb250U21vb3RoaW5nTGV2ZWwuaCIKICNpbmNsdWRlICJX ZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1NldHRpbmdzLmg+CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmgJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtODcsNiArODcsNyBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhEZWZhdWx0Rm9udFNpemUsIGRlZmF1bHRG b250U2l6ZSwgVUludDMyLCB1aW50MzJfdCwgMTYpIFwKICAgICBtYWNybyhEZWZhdWx0Rml4ZWRG b250U2l6ZSwgZGVmYXVsdEZpeGVkRm9udFNpemUsIFVJbnQzMiwgdWludDMyX3QsIDEzKSBcCiAg ICAgbWFjcm8oUERGRGlzcGxheU1vZGUsIHBkZkRpc3BsYXlNb2RlLCBVSW50MzIsIHVpbnQzMl90 LCAxKSBcCisgICAgbWFjcm8oRWRpdGFibGVMaW5rQmVoYXZpb3IsIGVkaXRhYmxlTGlua0JlaGF2 aW9yLCBVSW50MzIsIHVpbnQzMl90LCBXZWJDb3JlOjpFZGl0YWJsZUxpbmtOZXZlckxpdmUpIFwK ICAgICBcCiAKICNpZiBQTEFURk9STShXSU4pCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiA4MzY2NSkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjYxLDYgKzI2MSwxNiBAQCB1aW50MzJfdCBXS1ByZWZlcmVuY2VzR2V0TWluaW11 bUZvbnRTaXplCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm1pbmltdW1Gb250 U2l6ZSgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRFZGl0YWJsZUxpbmtCZWhhdmlvcihX S1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBXS0VkaXRhYmxlTGlua0JlaGF2aW9yIGJl aGF2aW9yKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEVkaXRhYmxlTGlua0Jl aGF2aW9yKGJlaGF2aW9yKTsKK30KKworV0tFZGl0YWJsZUxpbmtCZWhhdmlvciBXS1ByZWZlcmVu Y2VzR2V0RWRpdGFibGVMaW5rQmVoYXZpb3IoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl ZikKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V0tFZGl0YWJsZUxpbmtCZWhhdmlvcj4odG9J bXBsKHByZWZlcmVuY2VzUmVmKS0+ZWRpdGFibGVMaW5rQmVoYXZpb3IoKSk7Cit9CisKIHZvaWQg V0tQcmVmZXJlbmNlc1NldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYsIFdLU3RyaW5nUmVmIG5hbWUpCiB7CiAgICAgdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUodG9XVEZTdHJpbmcobmFtZSkpOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXNQcml2YXRlLmgJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDEw ICs0MywyMyBAQCBlbnVtIFdLRm9udFNtb290aGluZ0xldmVsIHsKIH07CiB0eXBlZGVmIGVudW0g V0tGb250U21vb3RoaW5nTGV2ZWwgV0tGb250U21vb3RoaW5nTGV2ZWw7CiAKK2VudW0gV0tFZGl0 YWJsZUxpbmtCZWhhdmlvciB7CisgICAgV0tFZGl0YWJsZUxpbmtEZWZhdWx0QmVoYXZpb3IsCisg ICAgV0tFZGl0YWJsZUxpbmtBbHdheXNMaXZlLAorICAgIFdLRWRpdGFibGVMaW5rT25seUxpdmVX aXRoU2hpZnRLZXksCisgICAgV0tFZGl0YWJsZUxpbmtMaXZlV2hlbk5vdEZvY3VzZWQsCisgICAg V0tFZGl0YWJsZUxpbmtOZXZlckxpdmUKK307Cit0eXBlZGVmIGVudW0gV0tFZGl0YWJsZUxpbmtC ZWhhdmlvciBXS0VkaXRhYmxlTGlua0JlaGF2aW9yOworCiAvLyBEZWZhdWx0cyB0byBrV0tGb250 U21vb3RoaW5nTGV2ZWxNZWRpdW0uCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0Rm9u dFNtb290aGluZ0xldmVsKFdLUHJlZmVyZW5jZXNSZWYsIFdLRm9udFNtb290aGluZ0xldmVsKTsK IFdLX0VYUE9SVCBXS0ZvbnRTbW9vdGhpbmdMZXZlbCBXS1ByZWZlcmVuY2VzR2V0Rm9udFNtb290 aGluZ0xldmVsKFdLUHJlZmVyZW5jZXNSZWYpOwogCisvLyBEZWZhdWx0cyB0byBFZGl0YWJsZUxp bmtOZXZlckxpdmUuCitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0RWRpdGFibGVMaW5r QmVoYXZpb3IoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgV0tFZGl0YWJsZUxpbmtC ZWhhdmlvcik7CitXS19FWFBPUlQgV0tFZGl0YWJsZUxpbmtCZWhhdmlvciBXS1ByZWZlcmVuY2Vz R2V0RWRpdGFibGVMaW5rQmVoYXZpb3IoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7 ICAgCisgICAgCiAvLyBEZWZhdWx0cyB0byBmYWxzZS4KIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVy ZW5jZXNTZXRBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYsIGJvb2wp OwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJs ZWQoV0tQcmVmZXJlbmNlc1JlZik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiA4MzY2NSkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM4OSw2 ICsxMzg5LDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZQogICAg IHNldHRpbmdzLT5zZXRNaW5pbXVtTG9naWNhbEZvbnRTaXplKHN0b3JlLmdldFVJbnQzMlZhbHVl Rm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjptaW5pbXVtTG9naWNhbEZvbnRTaXplS2V5KCkpKTsK ICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZvbnRTaXplKHN0b3JlLmdldFVJbnQzMlZhbHVlRm9y S2V5KFdlYlByZWZlcmVuY2VzS2V5OjpkZWZhdWx0Rm9udFNpemVLZXkoKSkpOwogICAgIHNldHRp bmdzLT5zZXREZWZhdWx0Rml4ZWRGb250U2l6ZShzdG9yZS5nZXRVSW50MzJWYWx1ZUZvcktleShX ZWJQcmVmZXJlbmNlc0tleTo6ZGVmYXVsdEZpeGVkRm9udFNpemVLZXkoKSkpOworICAgIHNldHRp bmdzLT5zZXRFZGl0YWJsZUxpbmtCZWhhdmlvcihzdGF0aWNfY2FzdDxXZWJDb3JlOjpFZGl0YWJs ZUxpbmtCZWhhdmlvcj4oc3RvcmUuZ2V0VUludDMyVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6OmVkaXRhYmxlTGlua0JlaGF2aW9yS2V5KCkpKSk7CiAKICAgICBzZXR0aW5ncy0+c2V0QWNj ZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlBy ZWZlcmVuY2VzS2V5OjphY2NlbGVyYXRlZENvbXBvc2l0aW5nRW5hYmxlZEtleSgpKSAmJiBMYXll clRyZWVIb3N0OjpzdXBwb3J0c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7CiAgICAgc2V0dGlu Z3MtPnNldEFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5OjphY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkS2V5KCkpICYmIExh eWVyVHJlZUhvc3Q6OnN1cHBvcnRzQWNjZWxlcmF0ZWRDb21wb3NpdGluZygpKTsK 89447 2011-04-13 13:48:46 -0700 2011-04-13 14:24:11 -0700 Patch2 editableclicks.txt text/plain 5500 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzU3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTMgIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBMaW5rcyBhcmUgY2xpY2thYmxlIHdoZW4g YSBjb250ZW50RWRpdGFibGUgaXMgc2V0IHRvIHRydWUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODQ3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0v OTI1Njc5Mz4KKyAgICAgICAgCisgICAgICAgIEFkZGVkIHN1cHBvcnQgZm9yIGVkaXRhYmxlIGxp bmsgYmVoYXZpb3IgcHJvcGVydHkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNT dG9yZS5jcHA6CisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZl cmVuY2VzU2V0RWRpdGFibGVMaW5rQmVoYXZpb3IpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dEVkaXRhYmxlTGlua0JlaGF2aW9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKToKKwogMjAx MS0wNC0xMiAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJlZmVyZW5jZXNTdG9yZS5jcHAJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktp dDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2 ICsyOCw3IEBACiAKICNpbmNsdWRlICJGb250U21vb3RoaW5nTGV2ZWwuaCIKICNpbmNsdWRlICJX ZWJDb3JlQXJndW1lbnRDb2RlcnMuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1NldHRpbmdzLmg+CiAK IG5hbWVzcGFjZSBXZWJLaXQgewogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJl ZmVyZW5jZXNTdG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQ cmVmZXJlbmNlc1N0b3JlLmgJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByZWZlcmVuY2VzU3RvcmUuaAkod29ya2luZyBjb3B5KQpAQCAtODcsNiArODcsNyBA QCBuYW1lc3BhY2UgV2ViS2l0IHsKICAgICBtYWNybyhEZWZhdWx0Rm9udFNpemUsIGRlZmF1bHRG b250U2l6ZSwgVUludDMyLCB1aW50MzJfdCwgMTYpIFwKICAgICBtYWNybyhEZWZhdWx0Rml4ZWRG b250U2l6ZSwgZGVmYXVsdEZpeGVkRm9udFNpemUsIFVJbnQzMiwgdWludDMyX3QsIDEzKSBcCiAg ICAgbWFjcm8oUERGRGlzcGxheU1vZGUsIHBkZkRpc3BsYXlNb2RlLCBVSW50MzIsIHVpbnQzMl90 LCAxKSBcCisgICAgbWFjcm8oRWRpdGFibGVMaW5rQmVoYXZpb3IsIGVkaXRhYmxlTGlua0JlaGF2 aW9yLCBVSW50MzIsIHVpbnQzMl90LCBXZWJDb3JlOjpFZGl0YWJsZUxpbmtOZXZlckxpdmUpIFwK ICAgICBcCiAKICNpZiBQTEFURk9STShXSU4pCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCShyZXZpc2lvbiA4MzY2NSkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjYxLDYgKzI2MSwxNiBAQCB1aW50MzJfdCBXS1ByZWZlcmVuY2VzR2V0TWluaW11 bUZvbnRTaXplCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm1pbmltdW1Gb250 U2l6ZSgpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRFZGl0YWJsZUxpbmtCZWhhdmlvcihX S1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBXS0VkaXRhYmxlTGlua0JlaGF2aW9yIGJl aGF2aW9yKQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEVkaXRhYmxlTGlua0Jl aGF2aW9yKGJlaGF2aW9yKTsKK30KKworV0tFZGl0YWJsZUxpbmtCZWhhdmlvciBXS1ByZWZlcmVu Y2VzR2V0RWRpdGFibGVMaW5rQmVoYXZpb3IoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1Jl ZikKK3sKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V0tFZGl0YWJsZUxpbmtCZWhhdmlvcj4odG9J bXBsKHByZWZlcmVuY2VzUmVmKS0+ZWRpdGFibGVMaW5rQmVoYXZpb3IoKSk7Cit9CisKIHZvaWQg V0tQcmVmZXJlbmNlc1NldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lKFdLUHJlZmVyZW5jZXNSZWYg cHJlZmVyZW5jZXNSZWYsIFdLU3RyaW5nUmVmIG5hbWUpCiB7CiAgICAgdG9JbXBsKHByZWZlcmVu Y2VzUmVmKS0+c2V0RGVmYXVsdFRleHRFbmNvZGluZ05hbWUodG9XVEZTdHJpbmcobmFtZSkpOwpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXNQcml2YXRlLmgJKHJldmlzaW9uIDgzNjY1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDEw ICs0MywyMyBAQCBlbnVtIFdLRm9udFNtb290aGluZ0xldmVsIHsKIH07CiB0eXBlZGVmIGVudW0g V0tGb250U21vb3RoaW5nTGV2ZWwgV0tGb250U21vb3RoaW5nTGV2ZWw7CiAKK2VudW0gV0tFZGl0 YWJsZUxpbmtCZWhhdmlvciB7CisgICAga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JEZWZhdWx0LAor ICAgIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yQWx3YXlzTGl2ZSwKKyAgICBrV0tFZGl0YWJsZUxp bmtCZWhhdmlvck9ubHlMaXZlV2l0aFNoaWZ0S2V5LAorICAgIGtXS0VkaXRhYmxlTGlua0JlaGF2 aW9yTGl2ZVdoZW5Ob3RGb2N1c2VkLAorICAgIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJM aXZlCit9OwordHlwZWRlZiBlbnVtIFdLRWRpdGFibGVMaW5rQmVoYXZpb3IgV0tFZGl0YWJsZUxp bmtCZWhhdmlvcjsKKwogLy8gRGVmYXVsdHMgdG8ga1dLRm9udFNtb290aGluZ0xldmVsTWVkaXVt LgogV0tfRVhQT1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEZvbnRTbW9vdGhpbmdMZXZlbChXS1By ZWZlcmVuY2VzUmVmLCBXS0ZvbnRTbW9vdGhpbmdMZXZlbCk7CiBXS19FWFBPUlQgV0tGb250U21v b3RoaW5nTGV2ZWwgV0tQcmVmZXJlbmNlc0dldEZvbnRTbW9vdGhpbmdMZXZlbChXS1ByZWZlcmVu Y2VzUmVmKTsKIAorLy8gRGVmYXVsdHMgdG8gRWRpdGFibGVMaW5rTmV2ZXJMaXZlLgorV0tfRVhQ T1JUIHZvaWQgV0tQcmVmZXJlbmNlc1NldEVkaXRhYmxlTGlua0JlaGF2aW9yKFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZW5jZXNSZWYsIFdLRWRpdGFibGVMaW5rQmVoYXZpb3IpOworV0tfRVhQT1JU IFdLRWRpdGFibGVMaW5rQmVoYXZpb3IgV0tQcmVmZXJlbmNlc0dldEVkaXRhYmxlTGlua0JlaGF2 aW9yKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpOyAgIAorICAgIAogLy8gRGVmYXVs dHMgdG8gZmFsc2UuCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0QWNjZWxlcmF0ZWRE cmF3aW5nRW5hYmxlZChXS1ByZWZlcmVuY2VzUmVmLCBib29sKTsKIFdLX0VYUE9SVCBib29sIFdL UHJlZmVyZW5jZXNHZXRBY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYp OwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAkocmV2aXNpb24gODM2NjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzODksNiArMTM4OSw3IEBAIHZvaWQgV2Vi UGFnZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2UKICAgICBzZXR0aW5ncy0+c2V0TWluaW11 bUxvZ2ljYWxGb250U2l6ZShzdG9yZS5nZXRVSW50MzJWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNl c0tleTo6bWluaW11bUxvZ2ljYWxGb250U2l6ZUtleSgpKSk7CiAgICAgc2V0dGluZ3MtPnNldERl ZmF1bHRGb250U2l6ZShzdG9yZS5nZXRVSW50MzJWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tl eTo6ZGVmYXVsdEZvbnRTaXplS2V5KCkpKTsKICAgICBzZXR0aW5ncy0+c2V0RGVmYXVsdEZpeGVk Rm9udFNpemUoc3RvcmUuZ2V0VUludDMyVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmRl ZmF1bHRGaXhlZEZvbnRTaXplS2V5KCkpKTsKKyAgICBzZXR0aW5ncy0+c2V0RWRpdGFibGVMaW5r QmVoYXZpb3Ioc3RhdGljX2Nhc3Q8V2ViQ29yZTo6RWRpdGFibGVMaW5rQmVoYXZpb3I+KHN0b3Jl LmdldFVJbnQzMlZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjplZGl0YWJsZUxpbmtCZWhh dmlvcktleSgpKSkpOwogCiAgICAgc2V0dGluZ3MtPnNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdF bmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6YWNjZWxl cmF0ZWRDb21wb3NpdGluZ0VuYWJsZWRLZXkoKSkgJiYgTGF5ZXJUcmVlSG9zdDo6c3VwcG9ydHNB Y2NlbGVyYXRlZENvbXBvc2l0aW5nKCkpOwogICAgIHNldHRpbmdzLT5zZXRBY2NlbGVyYXRlZERy YXdpbmdFbmFibGVkKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6 YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZEtleSgpKSAmJiBMYXllclRyZWVIb3N0OjpzdXBwb3J0 c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSk7Cg== 89469 2011-04-13 14:56:07 -0700 2011-04-13 15:18:36 -0700 Follow-up patch editlink2.txt text/plain 3038 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzcwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTMgIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTaG91bGQgbm90IHJlbHkgb24gV0tFZGl0YWJsZUxpbmtCZWhh dmlvciBiZWluZyBpbiBzeW5jaAorICAgICAgICB3aXRoIFdlYkNvcmU6OkVkaXRhYmxlTGlua0Jl aGF2aW9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTg0NzMKKworICAgICAgICBBZGRpbmcgY29udmVyc2lvbiByb3V0aW5lLgorICAgICAgICAKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tBUElDYXN0Lmg6CisgICAgICAgIChXZWJLaXQ6OnRv QVBJKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAg ICAgIChXS1ByZWZlcmVuY2VzR2V0RWRpdGFibGVMaW5rQmVoYXZpb3IpOgorCiAyMDExLTA0LTEz ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2F2 aW4gQmFycmFjbG91Z2guCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tB UElDYXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL QVBJQ2FzdC5oCShyZXZpc2lvbiA4Mzc2NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS0FQSUNhc3QuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1 ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJU eXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHJvdGVjdGlvblNwYWNlLmg+CisjaW5jbHVkZSA8 V2ViQ29yZS9TZXR0aW5ncy5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMTgzLDYgKzE4 NCwyNSBAQCBpbmxpbmUgV0tGb250U21vb3RoaW5nTGV2ZWwgdG9BUEkoRm9udFNtCiAgICAgcmV0 dXJuIGtXS0ZvbnRTbW9vdGhpbmdMZXZlbE1lZGl1bTsKIH0KIAoraW5saW5lIFdLRWRpdGFibGVM aW5rQmVoYXZpb3IgdG9BUEkoV2ViQ29yZTo6RWRpdGFibGVMaW5rQmVoYXZpb3IgYmVoYXZpb3Ip Cit7CisgICAgc3dpdGNoIChiZWhhdmlvcikgeworICAgICAgICBjYXNlIFdlYkNvcmU6OkVkaXRh YmxlTGlua0RlZmF1bHRCZWhhdmlvcjoKKyAgICAgICAgICAgIHJldHVybiBrV0tFZGl0YWJsZUxp bmtCZWhhdmlvckRlZmF1bHQ7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RWRpdGFibGVMaW5rQWx3 YXlzTGl2ZToKKyAgICAgICAgICAgIHJldHVybiBrV0tFZGl0YWJsZUxpbmtCZWhhdmlvckFsd2F5 c0xpdmU7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RWRpdGFibGVMaW5rT25seUxpdmVXaXRoU2hp ZnRLZXk6CisgICAgICAgICAgICByZXR1cm4ga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JPbmx5TGl2 ZVdpdGhTaGlmdEtleTsKKyAgICAgICAgY2FzZSBXZWJDb3JlOjpFZGl0YWJsZUxpbmtMaXZlV2hl bk5vdEZvY3VzZWQ6CisgICAgICAgICAgICByZXR1cm4ga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JM aXZlV2hlbk5vdEZvY3VzZWQ7CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RWRpdGFibGVMaW5rTmV2 ZXJMaXZlOgorICAgICAgICAgICAgcmV0dXJuIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJM aXZlOworICAgIH0KKyAgICAKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4g a1dLRWRpdGFibGVMaW5rQmVoYXZpb3JOZXZlckxpdmU7Cit9CisgICAgCiBpbmxpbmUgV0tQcm90 ZWN0aW9uU3BhY2VTZXJ2ZXJUeXBlIHRvQVBJKFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZVNlcnZl clR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHJldmlzaW9uIDgzNzY2 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMu aCIKICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4K KyNpbmNsdWRlIDxXZWJDb3JlL1NldHRpbmdzLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7 CiAKQEAgLTI2OCw3ICsyNjksNyBAQCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRFZGl0YWJsZUxpbmtC ZWhhdmlvCiAKIFdLRWRpdGFibGVMaW5rQmVoYXZpb3IgV0tQcmVmZXJlbmNlc0dldEVkaXRhYmxl TGlua0JlaGF2aW9yKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCiB7Ci0gICAgcmV0 dXJuIHN0YXRpY19jYXN0PFdLRWRpdGFibGVMaW5rQmVoYXZpb3I+KHRvSW1wbChwcmVmZXJlbmNl c1JlZiktPmVkaXRhYmxlTGlua0JlaGF2aW9yKCkpOworICAgIHJldHVybiB0b0FQSShzdGF0aWNf Y2FzdDxXZWJDb3JlOjpFZGl0YWJsZUxpbmtCZWhhdmlvcj4odG9JbXBsKHByZWZlcmVuY2VzUmVm KS0+ZWRpdGFibGVMaW5rQmVoYXZpb3IoKSkpOwogfQogCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRE ZWZhdWx0VGV4dEVuY29kaW5nTmFtZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBX S1N0cmluZ1JlZiBuYW1lKQo= 89476 2011-04-13 15:18:36 -0700 2011-04-13 15:21:00 -0700 Patch4 editlink2.txt text/plain 4328 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzczKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDQtMTMgIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBTaG91bGQgbm90IHJlbHkgb24gV0tFZGl0YWJsZUxpbmtCZWhh dmlvciBiZWluZyBpbiBzeW5jaAorICAgICAgICB3aXRoIFdlYkNvcmU6OkVkaXRhYmxlTGlua0Jl aGF2aW9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTg0NzMKKworICAgICAgICBBZGRpbmcgY29udmVyc2lvbiByb3V0aW5lcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaDoKKyAgICAgICAgKFdlYktpdDo6dG9BUEkpOgor ICAgICAgICAoV2ViS2l0Ojp0b0VkaXRhYmxlTGlua0JlaGF2aW9yKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6CisgICAgICAgIChXS1ByZWZlcmVuY2VzU2V0 RWRpdGFibGVMaW5rQmVoYXZpb3IpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dldEVkaXRhYmxl TGlua0JlaGF2aW9yKToKKwogMjAxMS0wNC0xMyAgU3RldmUgRmFsa2VuYnVyZyAgPHNmYWxrZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tBUElDYXN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQVBJQ2FzdC5oCShyZXZpc2lvbiA4Mzc2NSkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaAkod29ya2luZyBj b3B5KQpAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ3JlZGVudGlhbC5oPgog I2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJUeXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUv UHJvdGVjdGlvblNwYWNlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9TZXR0aW5ncy5oPgogCiBuYW1l c3BhY2UgV2ViS2l0IHsKIApAQCAtMTgzLDYgKzE4NCw0NCBAQCBpbmxpbmUgV0tGb250U21vb3Ro aW5nTGV2ZWwgdG9BUEkoRm9udFNtCiAgICAgcmV0dXJuIGtXS0ZvbnRTbW9vdGhpbmdMZXZlbE1l ZGl1bTsKIH0KIAoraW5saW5lIFdLRWRpdGFibGVMaW5rQmVoYXZpb3IgdG9BUEkoV2ViQ29yZTo6 RWRpdGFibGVMaW5rQmVoYXZpb3IgYmVoYXZpb3IpCit7CisgICAgc3dpdGNoIChiZWhhdmlvcikg eworICAgICAgICBjYXNlIFdlYkNvcmU6OkVkaXRhYmxlTGlua0RlZmF1bHRCZWhhdmlvcjoKKyAg ICAgICAgICAgIHJldHVybiBrV0tFZGl0YWJsZUxpbmtCZWhhdmlvckRlZmF1bHQ7CisgICAgICAg IGNhc2UgV2ViQ29yZTo6RWRpdGFibGVMaW5rQWx3YXlzTGl2ZToKKyAgICAgICAgICAgIHJldHVy biBrV0tFZGl0YWJsZUxpbmtCZWhhdmlvckFsd2F5c0xpdmU7CisgICAgICAgIGNhc2UgV2ViQ29y ZTo6RWRpdGFibGVMaW5rT25seUxpdmVXaXRoU2hpZnRLZXk6CisgICAgICAgICAgICByZXR1cm4g a1dLRWRpdGFibGVMaW5rQmVoYXZpb3JPbmx5TGl2ZVdpdGhTaGlmdEtleTsKKyAgICAgICAgY2Fz ZSBXZWJDb3JlOjpFZGl0YWJsZUxpbmtMaXZlV2hlbk5vdEZvY3VzZWQ6CisgICAgICAgICAgICBy ZXR1cm4ga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JMaXZlV2hlbk5vdEZvY3VzZWQ7CisgICAgICAg IGNhc2UgV2ViQ29yZTo6RWRpdGFibGVMaW5rTmV2ZXJMaXZlOgorICAgICAgICAgICAgcmV0dXJu IGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJMaXZlOworICAgIH0KKyAgICAKKyAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4ga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JOZXZl ckxpdmU7Cit9CisKK2lubGluZSBXZWJDb3JlOjpFZGl0YWJsZUxpbmtCZWhhdmlvciB0b0VkaXRh YmxlTGlua0JlaGF2aW9yKFdLRWRpdGFibGVMaW5rQmVoYXZpb3Igd2tCZWhhdmlvcikKK3sKKyAg ICBzd2l0Y2ggKHdrQmVoYXZpb3IpIHsKKyAgICAgICAgY2FzZSBrV0tFZGl0YWJsZUxpbmtCZWhh dmlvckRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6RWRpdGFibGVMaW5rRGVm YXVsdEJlaGF2aW9yOworICAgICAgICBjYXNlIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yQWx3YXlz TGl2ZToKKyAgICAgICAgICAgIHJldHVybiBXZWJDb3JlOjpFZGl0YWJsZUxpbmtBbHdheXNMaXZl OworICAgICAgICBjYXNlIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yT25seUxpdmVXaXRoU2hpZnRL ZXk6CisgICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6RWRpdGFibGVMaW5rT25seUxpdmVXaXRo U2hpZnRLZXk7CisgICAgICAgIGNhc2Uga1dLRWRpdGFibGVMaW5rQmVoYXZpb3JMaXZlV2hlbk5v dEZvY3VzZWQ6CisgICAgICAgICAgICByZXR1cm4gV2ViQ29yZTo6RWRpdGFibGVMaW5rTGl2ZVdo ZW5Ob3RGb2N1c2VkOworICAgICAgICBjYXNlIGtXS0VkaXRhYmxlTGlua0JlaGF2aW9yTmV2ZXJM aXZlOgorICAgICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkVkaXRhYmxlTGlua05ldmVyTGl2ZTsK KyAgICB9CisgICAgCisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIFdlYkNv cmU6OkVkaXRhYmxlTGlua05ldmVyTGl2ZTsKK30KKyAgICAKIGlubGluZSBXS1Byb3RlY3Rpb25T cGFjZVNlcnZlclR5cGUgdG9BUEkoV2ViQ29yZTo6UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZSB0 eXBlKQogewogICAgIHN3aXRjaCAodHlwZSkgewpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gODM3NjYpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNlcy5oIgogI2lu Y2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1 ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIApAQCAt MjYxLDE0ICsyNjIsMTQgQEAgdWludDMyX3QgV0tQcmVmZXJlbmNlc0dldE1pbmltdW1Gb250U2l6 ZQogICAgIHJldHVybiB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5taW5pbXVtRm9udFNpemUoKTsK IH0KIAotdm9pZCBXS1ByZWZlcmVuY2VzU2V0RWRpdGFibGVMaW5rQmVoYXZpb3IoV0tQcmVmZXJl bmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgV0tFZGl0YWJsZUxpbmtCZWhhdmlvciBiZWhhdmlvcikK K3ZvaWQgV0tQcmVmZXJlbmNlc1NldEVkaXRhYmxlTGlua0JlaGF2aW9yKFdLUHJlZmVyZW5jZXNS ZWYgcHJlZmVyZW5jZXNSZWYsIFdLRWRpdGFibGVMaW5rQmVoYXZpb3Igd2tCZWhhdmlvcikKIHsK LSAgICB0b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRFZGl0YWJsZUxpbmtCZWhhdmlvcihiZWhh dmlvcik7CisgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0RWRpdGFibGVMaW5rQmVoYXZp b3IodG9FZGl0YWJsZUxpbmtCZWhhdmlvcih3a0JlaGF2aW9yKSk7CiB9CiAKIFdLRWRpdGFibGVM aW5rQmVoYXZpb3IgV0tQcmVmZXJlbmNlc0dldEVkaXRhYmxlTGlua0JlaGF2aW9yKFdLUHJlZmVy ZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCiB7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFdLRWRp dGFibGVMaW5rQmVoYXZpb3I+KHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmVkaXRhYmxlTGlua0Jl aGF2aW9yKCkpOworICAgIHJldHVybiB0b0FQSShzdGF0aWNfY2FzdDxXZWJDb3JlOjpFZGl0YWJs ZUxpbmtCZWhhdmlvcj4odG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+ZWRpdGFibGVMaW5rQmVoYXZp b3IoKSkpOwogfQogCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXREZWZhdWx0VGV4dEVuY29kaW5nTmFt ZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBXS1N0cmluZ1JlZiBuYW1lKQo=