119099 2013-07-25 12:02:29 -0700 -[WebHTMLView attributedSubstringForProposedRange:actualRange:] does not include strikethrough attribute in the returned attributed string 2013-07-25 14:34:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam commit-queue oldest_to_newest 911721 0 sam 2013-07-25 12:02:29 -0700 -[WebHTMLView attributedSubstringForProposedRange:actualRange:] does not include strikethrough attribute in the returned attributed string 911724 1 207474 sam 2013-07-25 12:05:43 -0700 Created attachment 207474 Patch 911735 2 207474 enrica 2013-07-25 12:46:21 -0700 Comment on attachment 207474 Patch Looks good. 911750 3 sam 2013-07-25 13:51:44 -0700 Committed r153344: <http://trac.webkit.org/changeset/153344> 207474 2013-07-25 12:05:43 -0700 2013-07-25 14:34:37 -0700 Patch bug-119099-20130725120544.patch text/plain 12930 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzMzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA3LTI1ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgLVtXZWJIVE1MVmlldyBhdHRyaWJ1dGVk U3Vic3RyaW5nRm9yUHJvcG9zZWRSYW5nZTphY3R1YWxSYW5nZTpdIGRvZXMgbm90IGluY2x1ZGUg c3RyaWtldGhyb3VnaCBhdHRyaWJ1dGUgaW4gdGhlIHJldHVybmVkIGF0dHJpYnV0ZWQgc3RyaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkwOTkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0czoK KyAgICAgICAgICAgIEFQSSBUZXN0OiBBdHRyaWJ1dGVkU3RyaW5nVGVzdF9TdHJpa2V0aHJvdWdo CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRlci5tbToKKyAgICAgICAgKCtb V2ViSFRNTENvbnZlcnRlciBlZGl0aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZTpdKToKKyAg ICAgICAgU2V0IHRoZSBOU1N0cmlrZXRocm91Z2hTdHlsZUF0dHJpYnV0ZU5hbWUgYXR0cmlidXRl IHdoZW4gdGV4dC1kZWNvcmF0aW9uOiBsaW5lLXRocm91Z2ggaXMgc2Vlbi4KKwogMjAxMy0wNy0y NSAgQ2hyaXN0b3BoZSBEdW1leiAgPGNoLmR1bWV6QHNpc2Euc2Ftc3VuZy5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCBFRkwgYnVpbGQgZml4IGFmdGVyIHIxNTMzMTUuCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRlci5tbQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRlci5tbQkocmV2aXNpb24gMTUzMzMw KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0hUTUxDb252ZXJ0ZXIubW0JKHdvcmtp bmcgY29weSkKQEAgLTE2OTYsNiArMTY5Niw4IEBAICsgKE5TQXR0cmlidXRlZFN0cmluZyAqKWVk aXRpbmdBdHRyaWJ1dGUKICAgICAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gcmVuZGVyZXItPnN0 eWxlKCk7CiAgICAgICAgIGlmIChzdHlsZS0+dGV4dERlY29yYXRpb25zSW5FZmZlY3QoKSAmIFRl eHREZWNvcmF0aW9uVW5kZXJsaW5lKQogICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9iamVj dDpbTlNOdW1iZXIgbnVtYmVyV2l0aEludGVnZXI6TlNVbmRlcmxpbmVTdHlsZVNpbmdsZV0gZm9y S2V5Ok5TVW5kZXJsaW5lU3R5bGVBdHRyaWJ1dGVOYW1lXTsKKyAgICAgICAgaWYgKHN0eWxlLT50 ZXh0RGVjb3JhdGlvbnNJbkVmZmVjdCgpICYgVGV4dERlY29yYXRpb25MaW5lVGhyb3VnaCkKKyAg ICAgICAgICAgIFthdHRycy5nZXQoKSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhJbnRl Z2VyOk5TVW5kZXJsaW5lU3R5bGVTaW5nbGVdIGZvcktleTpOU1N0cmlrZXRocm91Z2hTdHlsZUF0 dHJpYnV0ZU5hbWVdOwogICAgICAgICBpZiAoTlNGb250ICpmb250ID0gc3R5bGUtPmZvbnQoKS5w cmltYXJ5Rm9udCgpLT5nZXROU0ZvbnQoKSkKICAgICAgICAgICAgIFthdHRycy5nZXQoKSBzZXRP YmplY3Q6Zm9udCBmb3JLZXk6TlNGb250QXR0cmlidXRlTmFtZV07CiAgICAgICAgIGVsc2UKSW5k ZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlz aW9uIDE1MzMzNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDI0IEBACisyMDEzLTA3LTI1ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgLVtXZWJIVE1MVmlldyBhdHRyaWJ1dGVkU3Vic3RyaW5nRm9yUHJvcG9zZWRSYW5nZTphY3R1 YWxSYW5nZTpdIGRvZXMgbm90IGluY2x1ZGUgc3RyaWtldGhyb3VnaCBhdHRyaWJ1dGUgaW4gdGhl IHJldHVybmVkIGF0dHJpYnV0ZWQgc3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTkwOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0 dHJpYnV0ZWRTdHJpbmcubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjphdHRyaWJ1dGVkU3Ry aW5nKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkF0dHJpYnV0ZWRTdHJpbmdUZXN0X0N1c3Rv bUZvbnQ6OmRpZExvYWRVUkwpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6QXR0cmlidXRlZFN0 cmluZ1Rlc3RfQ3VzdG9tRm9udDo6dXJsKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkF0dHJp YnV0ZWRTdHJpbmdUZXN0X0N1c3RvbUZvbnQ6OnJ1blRlc3QpOgorICAgICAgICAoVGVzdFdlYktp dEFQSTo6VEVTVF9GKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkF0dHJpYnV0ZWRTdHJpbmdU ZXN0X1N0cmlrZXRocm91Z2g6OmRpZExvYWRVUkwpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 QXR0cmlidXRlZFN0cmluZ1Rlc3RfU3RyaWtldGhyb3VnaDo6dXJsKToKKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OkF0dHJpYnV0ZWRTdHJpbmdUZXN0X1N0cmlrZXRocm91Z2g6OnJ1blRlc3QpOgor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdTdHJpa2V0 aHJvdWdoLmh0bWw6IEFkZGVkLgorICAgICAgICBBZGQgdGVzdHMgZm9yIGF0dHJpYnV0ZWQgc3Ry aW5ncyB3aXRoIHN0cmlrZXRocm91Z2guICBSZWZhY3RvciB0aGUgYXR0cmlidXRlZCBzdHJpbmcg dGVzdHMKKyAgICAgICAgdG8gbWFrZSBhZGRpbmcgbW9yZSBlYXNpZXIgaW4gdGhlIGZ1dHVyZS4K KwogMjAxMy0wNy0yMCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAg IGZvdXJ0aFRpZXI6IEZUTCBzaG91bGQgYmUgYWJsZSB0byBnZW5lcmF0ZSBMTFZNIElSIHRoYXQg dXNlcyBhbiBpbnRyaW5zaWMgZm9yIE9TUiBleGl0CkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agkocmV2aXNpb24gMTUzMzMwKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJ Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTEwMSw2ICsxMDEs NyBAQAogCQk3NkUxODJERDE1NDc1NjkxMDBGMUZBREQgLyogV2lsbFNlbmRTdWJtaXRFdmVudF9C dW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g NzZFMTgyREMxNTQ3NTY5MTAwRjFGQUREIC8qIFdpbGxTZW5kU3VibWl0RXZlbnRfQnVuZGxlLmNw cCAqLzsgfTsKIAkJNzZFMTgyREYxNTQ3NjdFNjAwRjFGQUREIC8qIGF1dG8tc3VibWl0dGluZy1m b3JtLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNzZFMTgyREUxNTQ3NUE4MzAwRjFGQUREIC8qIGF1dG8tc3VibWl0dGluZy1mb3JtLmh0 bWwgKi87IH07CiAJCTdDOEREQUFCMTczNURFRUUwMEVBNUFDMCAvKiBDbG9zZVRoZW5UZXJtaW5h dGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0M4 RERBQTkxNzM1REUxRDAwRUE1QUMwIC8qIENsb3NlVGhlblRlcm1pbmF0ZS5jcHAgKi87IH07CisJ CTdDOUVEOThCMTdBMTlGNEIwMEU0REMzMyAvKiBhdHRyaWJ1dGVkU3RyaW5nU3RyaWtldGhyb3Vn aC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDdDOUVEOThBMTdBMTlEMDYwMEU0REMzMyAvKiBhdHRyaWJ1dGVkU3RyaW5nU3RyaWtldGhy b3VnaC5odG1sICovOyB9OwogCQk3Q0ZCQ0FERjE3NDMyMzRGMDBCMkJGQ0YgLyogV2lsbExvYWQu Y3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NGQkNB REQxNzQzMjM0RjAwQjJCRkNGIC8qIFdpbGxMb2FkLmNwcCAqLzsgfTsKIAkJN0NGQkNBRTUxNzQz MjM4RjAwQjJCRkNGIC8qIFdpbGxMb2FkX0J1bmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0ZCQ0FFMzE3NDMyMzhFMDBCMkJGQ0YgLyogV2ls bExvYWRfQnVuZGxlLmNwcCAqLzsgfTsKIAkJODFCNTAxOTMxNDBGMjMyMzAwRDlFQjU4IC8qIFN0 cmluZ0J1aWxkZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gODFCNTAxOTIxNDBGMjMyMzAwRDlFQjU4IC8qIFN0cmluZ0J1aWxkZXIuY3BwICovOyB9 OwpAQCAtMjY3LDYgKzI2OCw3IEBACiAJCQkJMzc5MDI4QjkxNEZBQzI0QzAwN0U2QjQzIC8qIGFj Y2VwdHNGaXJzdE1vdXNlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMgKi8sCiAJCQkJQjU1RjExQkUx NTE5MUEwNjAwOTE1OTE2IC8qIEFoZW0udHRmIGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCUI1 NUYxMUI3MTUxN0QwMzMwMDkxNTkxNiAvKiBhdHRyaWJ1dGVkU3RyaW5nQ3VzdG9tRm9udC5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAorCQkJCTdDOUVEOThCMTdBMTlGNEIwMEU0REMzMyAvKiBh dHRyaWJ1dGVkU3RyaW5nU3RyaWtldGhyb3VnaC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLAog CQkJCTc2RTE4MkRGMTU0NzY3RTYwMEYxRkFERCAvKiBhdXRvLXN1Ym1pdHRpbmctZm9ybS5odG1s IGluIENvcHkgUmVzb3VyY2VzICovLAogCQkJCTI2REY1QTYzMTVBMkEyN0UwMDM2ODlDMiAvKiBD YW5jZWxMb2FkRnJvbVJlc291cmNlTG9hZERlbGVnYXRlLmh0bWwgaW4gQ29weSBSZXNvdXJjZXMg Ki8sCiAJCQkJNTE0MkIyNzMxNTE3QzhDODAwQzMyQjE5IC8qIENvbnRleHRNZW51Q2FuQ29weVVS TC5odG1sIGluIENvcHkgUmVzb3VyY2VzICovLApAQCAtNDAzLDYgKzQwNSw3IEBACiAJCTc2RTE4 MkRDMTU0NzU2OTEwMEYxRkFERCAvKiBXaWxsU2VuZFN1Ym1pdEV2ZW50X0J1bmRsZS5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXaWxsU2VuZFN1Ym1pdEV2ZW50X0J1 bmRsZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTc2RTE4MkRFMTU0NzVBODMw MEYxRkFERCAvKiBhdXRvLXN1Ym1pdHRpbmctZm9ybS5odG1sICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1s OyBwYXRoID0gImF1dG8tc3VibWl0dGluZy1mb3JtLmh0bWwiOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk3QzhEREFBOTE3MzVERTFEMDBFQTVBQzAgLyogQ2xvc2VUaGVuVGVybWluYXRl LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IENsb3NlVGhlblRlcm1pbmF0ZS5jcHA7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CisJCTdDOUVEOThBMTdBMTlEMDYwMEU0REMzMyAvKiBhdHRyaWJ1 dGVkU3RyaW5nU3RyaWtldGhyb3VnaC5odG1sICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5odG1sOyBwYXRoID0gYXR0cmlidXRlZFN0cmluZ1N0 cmlrZXRocm91Z2guaHRtbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NGQkNBREQx NzQzMjM0RjAwQjJCRkNGIC8qIFdpbGxMb2FkLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFdpbGxMb2FkLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ N0NGQkNBRTMxNzQzMjM4RTAwQjJCRkNGIC8qIFdpbGxMb2FkX0J1bmRsZS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXaWxsTG9hZF9CdW5kbGUuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk4MUI1MDE5MjE0MEYyMzIzMDBEOUVCNTggLyogU3RyaW5n QnVpbGRlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBTdHJpbmdC dWlsZGVyLmNwcDsgcGF0aCA9IFdURi9TdHJpbmdCdWlsZGVyLmNwcDsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTkyNSw2ICs5MjgsNyBAQAogCQlDMDdFNkNCMDEzRkQ3MzdDMDAzOEIy MkIgLyogUmVzb3VyY2VzICovID0gewogCQkJaXNhID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9 ICgKKwkJCQk3QzlFRDk4QTE3QTE5RDA2MDBFNERDMzMgLyogYXR0cmlidXRlZFN0cmluZ1N0cmlr ZXRocm91Z2guaHRtbCAqLywKIAkJCQlDMkNGOTc1ODE2Q0VDNjlFMDA1NEU5OUQgLyogSlNDb250 ZXh0QmFja0ZvcndhcmRDYWNoZTEuaHRtbCAqLywKIAkJCQlDMkNGOTc1OTE2Q0VDNjlFMDA1NEU5 OUQgLyogSlNDb250ZXh0QmFja0ZvcndhcmRDYWNoZTIuaHRtbCAqLywKIAkJCQkzNzkwMjhCODE0 RkFCRTQ5MDA3RTZCNDMgLyogYWNjZXB0c0ZpcnN0TW91c2UuaHRtbCAqLywKSW5kZXg6IFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL0F0dHJpYnV0ZWRTdHJpbmcubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvQXR0cmlidXRlZFN0cmluZy5tbQkocmV2 aXNpb24gMTUzMzMwKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvQXR0cmlidXRl ZFN0cmluZy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjMsNzEgKzIzLDkwIEBACiAgKiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2luY2x1ZGUgImNvbmZpZy5oIgotI2lu Y2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1XZWJWaWV3Lmgi Ci0jaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCAiY29uZmlnLmgiCisjaW1wb3J0 ICJUZXN0LmgiCiAKKyNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisjaW1wb3J0ICJQbGF0 Zm9ybVdlYlZpZXcuaCIKKyNpbXBvcnQgIldlYktpdEFnbm9zdGljVGVzdC5oIgorI2ltcG9ydCA8 d3RmL1JldGFpblB0ci5oPgogCi1AaW50ZXJmYWNlIEF0dHJpYnV0ZWRTdHJpbmdUZXN0IDogTlNP YmplY3QgeworbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgeworCitzdGF0aWMgTlNBdHRyaWJ1dGVk U3RyaW5nICphdHRyaWJ1dGVkU3RyaW5nKFdlYlZpZXcgKndlYlZpZXcsIE5TUmFuZ2UgcmFuZ2Up Cit7CisgICAgcmV0dXJuIFsoTlNWaWV3IDxOU1RleHRJbnB1dD4gKilbW1t3ZWJWaWV3IG1haW5G cmFtZV0gZnJhbWVWaWV3XSBkb2N1bWVudFZpZXddIGF0dHJpYnV0ZWRTdWJzdHJpbmdGcm9tUmFu Z2U6cmFuZ2VdOworfQorCitzdGF0aWMgTlNBdHRyaWJ1dGVkU3RyaW5nICphdHRyaWJ1dGVkU3Ry aW5nKFdLVmlldyAqd2tWaWV3LCBOU1JhbmdlIHJhbmdlKQoreworICAgIE5TUmFuZ2UgYWN0dWFs UmFuZ2U7CisgICAgcmV0dXJuIFt3a1ZpZXcgYXR0cmlidXRlZFN1YnN0cmluZ0ZvclByb3Bvc2Vk UmFuZ2U6cmFuZ2UgYWN0dWFsUmFuZ2U6JmFjdHVhbFJhbmdlXTsKIH0KLUBlbmQKIAotc3RhdGlj IGJvb2wgZGlkRmluaXNoTG9hZDsKIAotQGltcGxlbWVudGF0aW9uIEF0dHJpYnV0ZWRTdHJpbmdU ZXN0CitjbGFzcyBBdHRyaWJ1dGVkU3RyaW5nVGVzdF9DdXN0b21Gb250IDogcHVibGljIFdlYktp dEFnbm9zdGljVGVzdCB7CitwdWJsaWM6CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIFZpZXc+IHZv aWQgcnVuVGVzdChWaWV3KTsKKworICAgIC8vIFdlYktpdEFnbm9zdGljVGVzdAorICAgIHZpcnR1 YWwgdm9pZCBkaWRMb2FkVVJMKFdlYlZpZXcgKndlYlZpZXcpIHsgcnVuVGVzdCh3ZWJWaWV3KTsg fQorICAgIHZpcnR1YWwgdm9pZCBkaWRMb2FkVVJMKFdLVmlldyAqd2tWaWV3KSB7IHJ1blRlc3Qo d2tWaWV3KTsgfQogCi0tICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIgZGlkRmluaXNo TG9hZEZvckZyYW1lOihXZWJGcmFtZSAqKWZyYW1lCisgICAgdmlydHVhbCBOU1VSTCAqdXJsKCkg Y29uc3QgeyByZXR1cm4gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImF0 dHJpYnV0ZWRTdHJpbmdDdXN0b21Gb250IiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0 b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXTsgfQorfTsKKwordGVtcGxhdGUgPHR5cGVu YW1lIFZpZXc+Cit2b2lkIEF0dHJpYnV0ZWRTdHJpbmdUZXN0X0N1c3RvbUZvbnQ6OnJ1blRlc3Qo VmlldyB2aWV3KQogewotICAgIGRpZEZpbmlzaExvYWQgPSB0cnVlOworICAgIE5TQXR0cmlidXRl ZFN0cmluZyAqYXR0clN0cmluZyA9IGF0dHJpYnV0ZWRTdHJpbmcodmlldywgTlNNYWtlUmFuZ2Uo MCwgNSkpOworICAgIEVYUEVDVF9XS19TVFJFUSgiTG9yZW0iLCBbYXR0clN0cmluZyBzdHJpbmdd KTsKIH0KLUBlbmQKIAotbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewogCi1zdGF0aWMgdm9pZCBk aWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNv bnN0IHZvaWQqKQorVEVTVF9GKEF0dHJpYnV0ZWRTdHJpbmdUZXN0X0N1c3RvbUZvbnQsIFdlYktp dCkKIHsKLSAgICBkaWRGaW5pc2hMb2FkID0gdHJ1ZTsKKyAgICBydW5XZWJLaXQxVGVzdCgpOwog fQogCi1URVNUKFdlYktpdDEsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQorVEVTVF9GKEF0dHJpYnV0 ZWRTdHJpbmdUZXN0X0N1c3RvbUZvbnQsIFdlYktpdDIpCiB7Ci0gICAgUmV0YWluUHRyPFdlYlZp ZXc+IHdlYlZpZXcgPSBhZG9wdE5TKFtbV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01h a2VSZWN0KDAsIDAsIDEyMCwgMjAwKSBmcmFtZU5hbWU6bmlsIGdyb3VwTmFtZTpuaWxdKTsKLSAg ICBSZXRhaW5QdHI8QXR0cmlidXRlZFN0cmluZ1Rlc3Q+IHRlc3RDb250cm9sbGVyID0gYWRvcHRO UyhbQXR0cmlidXRlZFN0cmluZ1Rlc3QgbmV3XSk7Ci0gICAgCi0gICAgd2ViVmlldy5nZXQoKS5m cmFtZUxvYWREZWxlZ2F0ZSA9IHRlc3RDb250cm9sbGVyLmdldCgpOwotICAgIFtbd2ViVmlldy5n ZXQoKSBtYWluRnJhbWVdIGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6 W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAImF0dHJpYnV0ZWRTdHJpbmdD dXN0b21Gb250IiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktp dEFQSS5yZXNvdXJjZXMiXV1dOwotICAgIAotICAgIFV0aWw6OnJ1bigmZGlkRmluaXNoTG9hZCk7 Ci0gICAgZGlkRmluaXNoTG9hZCA9IGZhbHNlOwotICAgICAgICAKLSAgICBOU0F0dHJpYnV0ZWRT dHJpbmcgKmF0dHJTdHJpbmcgPSBbKE5TVmlldyA8TlNUZXh0SW5wdXQ+ICopW1tbd2ViVmlldy5n ZXQoKSBtYWluRnJhbWVdIGZyYW1lVmlld10gZG9jdW1lbnRWaWV3XSBhdHRyaWJ1dGVkU3Vic3Ry aW5nRnJvbVJhbmdlOk5TTWFrZVJhbmdlKDAsIDUpXTsKLQotICAgIEVYUEVDVF9XS19TVFJFUSgi TG9yZW0iLCBbYXR0clN0cmluZyBzdHJpbmddKTsKKyAgICBydW5XZWJLaXQyVGVzdCgpOwogfQog Ci1URVNUKFdlYktpdDIsIEF0dHJpYnV0ZWRTdHJpbmdUZXN0KQorY2xhc3MgQXR0cmlidXRlZFN0 cmluZ1Rlc3RfU3RyaWtldGhyb3VnaCA6IHB1YmxpYyBXZWJLaXRBZ25vc3RpY1Rlc3QgeworcHVi bGljOgorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBWaWV3PiB2b2lkIHJ1blRlc3QoVmlldyk7CisK KyAgICAvLyBXZWJLaXRBZ25vc3RpY1Rlc3QKKyAgICB2aXJ0dWFsIHZvaWQgZGlkTG9hZFVSTChX ZWJWaWV3ICp3ZWJWaWV3KSB7IHJ1blRlc3Qod2ViVmlldyk7IH0KKyAgICB2aXJ0dWFsIHZvaWQg ZGlkTG9hZFVSTChXS1ZpZXcgKndrVmlldykgeyBydW5UZXN0KHdrVmlldyk7IH0KKworICAgIHZp cnR1YWwgTlNVUkwgKnVybCgpIGNvbnN0IHsgcmV0dXJuIFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g VVJMRm9yUmVzb3VyY2U6QCJhdHRyaWJ1dGVkU3RyaW5nU3RyaWtldGhyb3VnaCIgd2l0aEV4dGVu c2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07IH0K K307CisKK3RlbXBsYXRlIDx0eXBlbmFtZSBWaWV3Pgordm9pZCBBdHRyaWJ1dGVkU3RyaW5nVGVz dF9TdHJpa2V0aHJvdWdoOjpydW5UZXN0KFZpZXcgdmlldykKIHsKLSAgICBXS1JldGFpblB0cjxX S0NvbnRleHRSZWY+IGNvbnRleHQoQWRvcHRXSywgV0tDb250ZXh0Q3JlYXRlKCkpOwotICAgIFBs YXRmb3JtV2ViVmlldyB3ZWJWaWV3KGNvbnRleHQuZ2V0KCkpOwotICAgIAotICAgIFdLUGFnZUxv YWRlckNsaWVudCBsb2FkZXJDbGllbnQ7Ci0gICAgbWVtc2V0KCZsb2FkZXJDbGllbnQsIDAsIHNp emVvZihsb2FkZXJDbGllbnQpKTsKLSAgICBsb2FkZXJDbGllbnQudmVyc2lvbiA9IDA7Ci0gICAg bG9hZGVyQ2xpZW50LmRpZEZpbmlzaExvYWRGb3JGcmFtZSA9IGRpZEZpbmlzaExvYWRGb3JGcmFt ZTsKLSAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHdlYlZpZXcucGFnZSgpLCAmbG9hZGVy Q2xpZW50KTsKLSAgICAKLSAgICBXS1BhZ2VMb2FkVVJMKHdlYlZpZXcucGFnZSgpLCBhZG9wdFdL KFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJhdHRyaWJ1dGVkU3RyaW5nQ3VzdG9tRm9udCIs ICJodG1sIikpLmdldCgpKTsKKyAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJTdHJpbmcgPSBh dHRyaWJ1dGVkU3RyaW5nKHZpZXcsIE5TTWFrZVJhbmdlKDAsIDUpKTsKIAotICAgIFV0aWw6OnJ1 bigmZGlkRmluaXNoTG9hZCk7Ci0gICAgZGlkRmluaXNoTG9hZCA9IGZhbHNlOworICAgIEVYUEVD VF9XS19TVFJFUSgiTG9yZW0iLCBbYXR0clN0cmluZyBzdHJpbmddKTsKICAgICAKLSAgICBOU1Jh bmdlIHJhbmdlID0gTlNNYWtlUmFuZ2UoMCwgNSk7Ci0gICAgTlNSYW5nZSBhY3R1YWxSYW5nZTsK LSAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJTdHJpbmcgPSBbd2ViVmlldy5wbGF0Zm9ybVZp ZXcoKSBhdHRyaWJ1dGVkU3Vic3RyaW5nRm9yUHJvcG9zZWRSYW5nZTpyYW5nZSBhY3R1YWxSYW5n ZTomYWN0dWFsUmFuZ2VdOworICAgIE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyA9IFthdHRyU3Ry aW5nIGF0dHJpYnV0ZXNBdEluZGV4OjAgZWZmZWN0aXZlUmFuZ2U6MF07CisgICAgQVNTRVJUX05P VF9OVUxMKFthdHRyaWJ1dGVzIG9iamVjdEZvcktleTpOU1N0cmlrZXRocm91Z2hTdHlsZUF0dHJp YnV0ZU5hbWVdKTsKKyAgICBBU1NFUlRfVFJVRShbW2F0dHJpYnV0ZXMgb2JqZWN0Rm9yS2V5Ok5T U3RyaWtldGhyb3VnaFN0eWxlQXR0cmlidXRlTmFtZV0gaXNLaW5kT2ZDbGFzczpbTlNOdW1iZXIg Y2xhc3NdXSk7CisgICAgQVNTRVJUX0VRKE5TVW5kZXJsaW5lU3R5bGVTaW5nbGUsIFsoTlNOdW1i ZXIgKilbYXR0cmlidXRlcyBvYmplY3RGb3JLZXk6TlNTdHJpa2V0aHJvdWdoU3R5bGVBdHRyaWJ1 dGVOYW1lXSBpbnRWYWx1ZV0pOworfQogCi0gICAgRVhQRUNUX1dLX1NUUkVRKCJMb3JlbSIsIFth dHRyU3RyaW5nIHN0cmluZ10pOworVEVTVF9GKEF0dHJpYnV0ZWRTdHJpbmdUZXN0X1N0cmlrZXRo cm91Z2gsIFdlYktpdCkKK3sKKyAgICBydW5XZWJLaXQxVGVzdCgpOwogfQogCi0gICAgCitURVNU X0YoQXR0cmlidXRlZFN0cmluZ1Rlc3RfU3RyaWtldGhyb3VnaCwgV2ViS2l0MikKK3sKKyAgICBy dW5XZWJLaXQyVGVzdCgpOworfQorCisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKSW5k ZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdTdHJpa2V0 aHJvdWdoLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMv YXR0cmlidXRlZFN0cmluZ1N0cmlrZXRocm91Z2guaHRtbAkocmV2aXNpb24gMCkKKysrIFRvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL2F0dHJpYnV0ZWRTdHJpbmdTdHJpa2V0aHJvdWdoLmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMSBAQAorPGh0bWw+CisgICAgPGhlYWQ+Cisg ICAgICAgIDxzdHlsZT4KKyAgICAgICAgPC9zdHlsZT4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkg Y29udGVudGVkaXRhYmxlIHN0eWxlPSJ0ZXh0LWRlY29yYXRpb246IGxpbmUtdGhyb3VnaDsiPkxv cmVtIElwc3VtCisgICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBkb2N1bWVudC5ib2R5LmZv Y3VzKCk7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K