178271 2017-10-13 11:07:12 -0700 Remove Editor::simplifyMarkup 2017-10-31 17:41:27 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen darin webkit-bug-importer wenson_hsieh oldest_to_newest 1360099 0 achristensen 2017-10-13 11:07:12 -0700 Remove Editor::simplifyMarkup 1360100 1 323708 achristensen 2017-10-13 11:08:33 -0700 Created attachment 323708 Patch 1360106 2 achristensen 2017-10-13 11:13:04 -0700 This was used in Mountain Lion, Mavericks, and Yosemite, but not since then. 1360113 3 323708 wenson_hsieh 2017-10-13 11:20:11 -0700 Comment on attachment 323708 Patch I think it would be good to mention <rdar://problem/10726177>, and the fact that Mail stopped using this SPI long ago, in the ChangeLog. 1360118 4 achristensen 2017-10-13 11:23:28 -0700 http://trac.webkit.org/r223291 1360119 5 webkit-bug-importer 2017-10-13 11:24:17 -0700 <rdar://problem/34981927> 1360568 6 323708 darin 2017-10-15 08:34:55 -0700 Comment on attachment 323708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323708&action=review > Source/WebKitLegacy/mac/WebView/WebView.mm:8535 > - (void)_simplifyMarkup:(DOMNode *)startNode endNode:(DOMNode *)endNode > { > - Frame* coreFrame = core([self mainFrame]); > - if (!coreFrame || !startNode) > - return; > - Node* coreStartNode= core(startNode); > - if (&coreStartNode->document() != coreFrame->document()) > - return; > - return coreFrame->editor().simplifyMarkup(coreStartNode, core(endNode)); > } What is the plan here? When will we remove the method too and not just its implementation? 1366707 7 achristensen 2017-10-31 17:41:27 -0700 (In reply to Darin Adler from comment #6) > What is the plan here? When will we remove the method too and not just its > implementation? We reverted this change. Dan wants to keep using this method. 323708 2017-10-13 11:08:33 -0700 2017-10-13 11:20:11 -0700 Patch bug-178271-20171013110832.patch text/plain 13567 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMzI4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE3LTEwLTEzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIEVk aXRvcjo6c2ltcGxpZnlNYXJrdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3ODI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFuIEFQSSB0ZXN0IGJlY2FtZSBmbGFreSwgYW5kIGl0IHR1cm5zIG91dCB0 aGlzIGlzbid0IHVzZWQgYW55d2hlcmUsIHNvIGxldCdzIHJlbW92ZSBpdCEKKworICAgICAgICAq IGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6c2ltcGxpZnlN YXJrdXApOiBEZWxldGVkLgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6CisKIDIwMTctMTAt MTMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUGVyZm9ybWFu Y2U6IGRvIHBpeGVsIGNvbmZvcm1hbmNlIGFuZCB0ZXh0dXJpbmcgaW4gYSBzaW5nbGUgc3RlcC4K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDIyMzI3OSkKKysrIFNv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQxNSwy NCArMTQxNSw2IEBAIHZvaWQgRWRpdG9yOjpwZXJmb3JtRGVsZXRlKCkKICAgICBzZXRTdGFydE5l d0tpbGxSaW5nU2VxdWVuY2UoZmFsc2UpOwogfQogCi12b2lkIEVkaXRvcjo6c2ltcGxpZnlNYXJr dXAoTm9kZSogc3RhcnROb2RlLCBOb2RlKiBlbmROb2RlKQotewotICAgIGlmICghc3RhcnROb2Rl KQotICAgICAgICByZXR1cm47Ci0gICAgaWYgKGVuZE5vZGUpIHsKLSAgICAgICAgaWYgKCZzdGFy dE5vZGUtPmRvY3VtZW50KCkgIT0gJmVuZE5vZGUtPmRvY3VtZW50KCkpCi0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIC8vIGNoZWNrIGlmIHN0YXJ0IG5vZGUgaXMgYmVmb3JlIGVuZE5vZGUK LSAgICAgICAgTm9kZSogbm9kZSA9IHN0YXJ0Tm9kZTsKLSAgICAgICAgd2hpbGUgKG5vZGUgJiYg bm9kZSAhPSBlbmROb2RlKQotICAgICAgICAgICAgbm9kZSA9IE5vZGVUcmF2ZXJzYWw6Om5leHQo Km5vZGUpOwotICAgICAgICBpZiAoIW5vZGUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgfQot ICAgIAotICAgIFNpbXBsaWZ5TWFya3VwQ29tbWFuZDo6Y3JlYXRlKGRvY3VtZW50KCksIHN0YXJ0 Tm9kZSwgZW5kTm9kZSA/IE5vZGVUcmF2ZXJzYWw6Om5leHQoKmVuZE5vZGUpIDogbnVsbHB0cikt PmFwcGx5KCk7Ci19Ci0KIHZvaWQgRWRpdG9yOjpjb3B5VVJMKGNvbnN0IFVSTCYgdXJsLCBjb25z dCBTdHJpbmcmIHRpdGxlKQogewogICAgIGNvcHlVUkwodXJsLCB0aXRsZSwgKlBhc3RlYm9hcmQ6 OmNyZWF0ZUZvckNvcHlBbmRQYXN0ZSgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAko cmV2aXNpb24gMjIzMjc5KQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtNDI4LDggKzQyOCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHVwZGF0ZU1h cmtlcnNGb3JXb3Jkc0FmZmVjdGVkQnlFZGl0aW5nKGJvb2wgb25seUhhbmRsZVdvcmRzQ29udGFp bmluZ1NlbGVjdGlvbik7CiAgICAgdm9pZCBkZWxldGVkQXV0b2NvcnJlY3Rpb25BdFBvc2l0aW9u KGNvbnN0IFBvc2l0aW9uJiwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFN0cmluZyk7CiAgICAgCi0g ICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzaW1wbGlmeU1hcmt1cChOb2RlKiBzdGFydE5vZGUsIE5v ZGUqIGVuZE5vZGUpOwotCiAgICAgRWRpdG9yUGFyYWdyYXBoU2VwYXJhdG9yIGRlZmF1bHRQYXJh Z3JhcGhTZXBhcmF0b3IoKSBjb25zdCB7IHJldHVybiBtX2RlZmF1bHRQYXJhZ3JhcGhTZXBhcmF0 b3I7IH0KICAgICB2b2lkIHNldERlZmF1bHRQYXJhZ3JhcGhTZXBhcmF0b3IoRWRpdG9yUGFyYWdy YXBoU2VwYXJhdG9yIHNlcGFyYXRvcikgeyBtX2RlZmF1bHRQYXJhZ3JhcGhTZXBhcmF0b3IgPSBz ZXBhcmF0b3I7IH0KICAgICBWZWN0b3I8U3RyaW5nPiBkaWN0YXRpb25BbHRlcm5hdGl2ZXNGb3JN YXJrZXIoY29uc3QgRG9jdW1lbnRNYXJrZXImKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kv bWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFu Z2VMb2cJKHJldmlzaW9uIDIyMzI3OSkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTEwLTEzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIEVk aXRvcjo6c2ltcGxpZnlNYXJrdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3ODI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9z aW1wbGlmeU1hcmt1cDplbmROb2RlOl0pOgorCiAyMDE3LTEwLTEyICBDaHJpcyBEdW1leiAgPGNk dW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW01hY10gQWRkIHN1cHBvcnQgZm9yIE1vdXNlRXZl bnQuYnV0dG9ucwpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQkocmV2aXNpb24gMjIzMjc5KQorKysgU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmll dy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC04NTMyLDEzICs4NTMyLDYgQEAgLSAoQk9P TClfc2VsZWN0aW9uSXNBbGwKIAogLSAodm9pZClfc2ltcGxpZnlNYXJrdXA6KERPTU5vZGUgKilz dGFydE5vZGUgZW5kTm9kZTooRE9NTm9kZSAqKWVuZE5vZGUKIHsKLSAgICBGcmFtZSogY29yZUZy YW1lID0gY29yZShbc2VsZiBtYWluRnJhbWVdKTsKLSAgICBpZiAoIWNvcmVGcmFtZSB8fCAhc3Rh cnROb2RlKQotICAgICAgICByZXR1cm47Ci0gICAgTm9kZSogY29yZVN0YXJ0Tm9kZT0gY29yZShz dGFydE5vZGUpOwotICAgIGlmICgmY29yZVN0YXJ0Tm9kZS0+ZG9jdW1lbnQoKSAhPSBjb3JlRnJh bWUtPmRvY3VtZW50KCkpCi0gICAgICAgIHJldHVybjsKLSAgICByZXR1cm4gY29yZUZyYW1lLT5l ZGl0b3IoKS5zaW1wbGlmeU1hcmt1cChjb3JlU3RhcnROb2RlLCBjb3JlKGVuZE5vZGUpKTsgICAg CiB9CiAKIEBlbmQKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDIyMzI4OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBj b3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTEwLTEzICBBbGV4IENocmlzdGVuc2VuICA8YWNo cmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmVtb3ZlIEVkaXRvcjo6c2ltcGxpZnlN YXJrdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU2ltcGxpZnlNYXJrdXAubW06IFJlbW92 ZWQuCisKIDIwMTctMTAtMTEgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25o YUBjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgW0dMaWJdIFdlYktpdE5hdmlnYXRpb25BY3Rp b24gc2hvdWxkIHRlbGwgd2hldGhlciBpdCBpcyBhIHJlZGlyZWN0CkluZGV4OiBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2pl Y3QucGJ4cHJvagkocmV2aXNpb24gMjIzMjc5KQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTQw OSw3ICs0MDksNiBAQAogCQk3Q0NFN0VDQTFBNDExQTdFMDA0NDdDNEMgLyogUmVuZGVyZWRJbWFn ZUZyb21ET01SYW5nZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDM3MjJDODY4MTQ2MUUwM0UwMEM0NUQwMCAvKiBSZW5kZXJlZEltYWdlRnJvbURPTVJh bmdlLm1tICovOyB9OwogCQk3Q0NFN0VDQjFBNDExQTdFMDA0NDdDNEMgLyogU2V0QW5kVXBkYXRl Q2FjaGVNb2RlbC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDI2MTUxNkQ1MTVCMEU2MDUwMEEyQzIwMSAvKiBTZXRBbmRVcGRhdGVDYWNoZU1vZGVsLm1t ICovOyB9OwogCQk3Q0NFN0VDQzFBNDExQTdFMDA0NDdDNEMgLyogU2V0RG9jdW1lbnRVUkkubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1MkI4Q0Y5NTE1 ODY4Q0YwMDAyODEwNTMgLyogU2V0RG9jdW1lbnRVUkkubW0gKi87IH07Ci0JCTdDQ0U3RUNEMUE0 MTFBN0UwMDQ0N0M0QyAvKiBTaW1wbGlmeU1hcmt1cC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEM1NDBGNzc1MTUyRTREQTAwMEE0MEM4QyAvKiBTaW1w bGlmeU1hcmt1cC5tbSAqLzsgfTsKIAkJN0NDRTdFQ0UxQTQxMUE3RTAwNDQ3QzRDIC8qIFN0b3BM b2FkaW5nRnJvbURpZEZpbmlzaExvYWRpbmcubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAyOTE4NjFGRDE3QkQ0REM3MDBENEU0MUUgLyogU3RvcExvYWRp bmdGcm9tRGlkRmluaXNoTG9hZGluZy5tbSAqLzsgfTsKIAkJN0NDRTdFQ0YxQTQxMUE3RTAwNDQ3 QzRDIC8qIFN0b3BMb2FkaW5nRnJvbURpZFJlY2VpdmVSZXNwb25zZS5tbSBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEUxOTRFMUJBMTc3RTUxNDUwMDlDNEQ0 RSAvKiBTdG9wTG9hZGluZ0Zyb21EaWRSZWNlaXZlUmVzcG9uc2UubW0gKi87IH07CiAJCTdDQ0U3 RUQwMUE0MTFBN0UwMDQ0N0M0QyAvKiBTdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0RnJvbVN0 cmluZy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3 OTlBRDM5MTQxMjBBNDMwMDVFQjBDNiAvKiBTdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0RnJv bVN0cmluZy5tbSAqLzsgfTsKQEAgLTE2NjQsNyArMTY2Myw2IEBACiAJCUM1MDdFOEE2MTRDNjU0 NUIwMDVENkIzQiAvKiBJbnNwZWN0b3JCYXIubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5v YmpjcHA7IHBhdGggPSBJbnNwZWN0b3JCYXIubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUM1MTAxQzRFMTc2QjhCQjkwMEVFOUIxNSAvKiBmaW5kUmFuZ2VzLmh0bWwgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSB0ZXh0Lmh0bWw7IHBhdGggPSBmaW5kUmFuZ2VzLmh0bWw7IHNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7IH07CiAJCUM1MUFGQjk4MTY5RjQ5RkYwMDlDQ0Y2NiAvKiBGaW5kTWF0Y2hlcy5tbSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IEZpbmRNYXRjaGVzLm1tOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwotCQlDNTQwRjc3NTE1MkU0REEwMDBBNDBDOEMgLyogU2lt cGxpZnlNYXJrdXAubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBT aW1wbGlmeU1hcmt1cC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQzU0MEY3ODMx NTJFNUE3ODAwQTQwQzhDIC8qIHZlcmJvc2VNYXJrdXAuaHRtbCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHRleHQuaHRt bDsgcGF0aCA9IHZlcmJvc2VNYXJrdXAuaHRtbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJQzU0MjM3RUQxNkI4OTU1ODAwRTYzOEZDIC8qIFBhc3RlYm9hcmROb3RpZmljYXRpb25zX0J1 bmRsZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQYXN0ZWJvYXJk Tm90aWZpY2F0aW9uc19CdW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlD NTQyMzdFRTE2Qjg5NTU4MDBFNjM4RkMgLyogUGFzdGVib2FyZE5vdGlmaWNhdGlvbnMubW0gKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBQYXN0ZWJvYXJkTm90aWZpY2F0 aW9ucy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTI3NzksNyArMjc3Nyw2IEBA CiAJCQkJMzcyMkM4NjgxNDYxRTAzRTAwQzQ1RDAwIC8qIFJlbmRlcmVkSW1hZ2VGcm9tRE9NUmFu Z2UubW0gKi8sCiAJCQkJMjYxNTE2RDUxNUIwRTYwNTAwQTJDMjAxIC8qIFNldEFuZFVwZGF0ZUNh Y2hlTW9kZWwubW0gKi8sCiAJCQkJNTJCOENGOTUxNTg2OENGMDAwMjgxMDUzIC8qIFNldERvY3Vt ZW50VVJJLm1tICovLAotCQkJCUM1NDBGNzc1MTUyRTREQTAwMEE0MEM4QyAvKiBTaW1wbGlmeU1h cmt1cC5tbSAqLywKIAkJCQkyOTE4NjFGRDE3QkQ0REM3MDBENEU0MUUgLyogU3RvcExvYWRpbmdG cm9tRGlkRmluaXNoTG9hZGluZy5tbSAqLywKIAkJCQlFMTk0RTFCQTE3N0U1MTQ1MDA5QzRENEUg LyogU3RvcExvYWRpbmdGcm9tRGlkUmVjZWl2ZVJlc3BvbnNlLm1tICovLAogCQkJCTM3OTlBRDM5 MTQxMjBBNDMwMDVFQjBDNiAvKiBTdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0RnJvbVN0cmlu Zy5tbSAqLywKQEAgLTM0MzcsNyArMzQzNCw2IEBACiAJCQkJN0NDRTdGMTQxQTQxMUFFNjAwNDQ3 QzRDIC8qIFNob3VsZEtlZXBDdXJyZW50QmFja0ZvcndhcmRMaXN0SXRlbUluTGlzdC5jcHAgaW4g U291cmNlcyAqLywKIAkJCQkzN0JDQTYxQzFCNTk2QkE5MDAyMDEyQ0EgLyogU2hvdWxkT3BlbkV4 dGVybmFsVVJMc0luTmV3V2luZG93QWN0aW9ucy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDODNF MEM1MUQwQTY1NDYwMEZFQkNGMyAvKiBTaHJpbmtUb0ZpdC5tbSBpbiBTb3VyY2VzICovLAotCQkJ CTdDQ0U3RUNEMUE0MTFBN0UwMDQ0N0M0QyAvKiBTaW1wbGlmeU1hcmt1cC5tbSBpbiBTb3VyY2Vz ICovLAogCQkJCTJERkY3QjZEMURBNDg3QUYwMDgxNDYxNCAvKiBTbmFwc2hvdFN0b3JlLm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJMEY0RkZBOUUxRUQzQUE4NTAwRjcxMTFGIC8qIFNuYXBzaG90Vmlh UmVuZGVySW5Db250ZXh0Lm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJN0NDRTdGMTUxQTQxMUFFNjAw NDQ3QzRDIC8qIFNwYWNlYmFyU2Nyb2xsaW5nLmNwcCBpbiBTb3VyY2VzICovLApJbmRleDogVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU2ltcGxpZnlNYXJrdXAubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9tYWMvU2ltcGxpZnlNYXJrdXAubW0JKHJldmlz aW9uIDIyMzI3OSkKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1NpbXBsaWZ5TWFy a3VwLm1tCShub25leGlzdGVudCkKQEAgLTEsMTExICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQg KEMpIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91 dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxv d2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAq IDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJv dmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9v ciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAq IFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJV VE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMs IElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElF UyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVS UE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMg Q09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5j bHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAiUGxhdGZvcm1VdGlsaXRpZXMuaCIKLSNpbmNsdWRl ICJQbGF0Zm9ybVdlYlZpZXcuaCIKLSNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+Ci0KLSNpbXBv cnQgPFdlYktpdC9ET00uaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJWaWV3UHJpdmF0ZS5oPgotCi1A aW50ZXJmYWNlIFNpbXBsaWZ5TWFya3VwVGVzdCA6IE5TT2JqZWN0IDxXZWJGcmFtZUxvYWREZWxl Z2F0ZT4gewotfQotQGVuZAotCi1zdGF0aWMgYm9vbCBkaWRGaW5pc2hMb2FkOwotCi1AaW1wbGVt ZW50YXRpb24gU2ltcGxpZnlNYXJrdXBUZXN0Ci0KLS0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAq KXNlbmRlciBkaWRGaW5pc2hMb2FkRm9yRnJhbWU6KFdlYkZyYW1lICopZnJhbWUKLXsKLSAgICBk aWRGaW5pc2hMb2FkID0gdHJ1ZTsKLX0KLUBlbmQKLQotbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkg ewotCi1URVNUKFdlYktpdExlZ2FjeSwgU2ltcGxpZnlNYXJrdXBUZXN0KQotewotICAgIFJldGFp blB0cjxXZWJWaWV3PiB3ZWJWaWV3MSA9IGFkb3B0TlMoW1tXZWJWaWV3IGFsbG9jXSBpbml0V2l0 aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMTIwLCAyMDApIGZyYW1lTmFtZTpuaWwgZ3JvdXBOYW1l Om5pbF0pOwotICAgIFJldGFpblB0cjxXZWJWaWV3PiB3ZWJWaWV3MiA9IGFkb3B0TlMoW1tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgMTIwLCAyMDApIGZyYW1l TmFtZTpuaWwgZ3JvdXBOYW1lOm5pbF0pOwotICAgIFJldGFpblB0cjxTaW1wbGlmeU1hcmt1cFRl c3Q+IHRlc3RDb250cm9sbGVyID0gYWRvcHROUyhbU2ltcGxpZnlNYXJrdXBUZXN0IG5ld10pOwot ICAgIAotICAgIHdlYlZpZXcxLmdldCgpLmZyYW1lTG9hZERlbGVnYXRlID0gdGVzdENvbnRyb2xs ZXIuZ2V0KCk7Ci0gICAgW1t3ZWJWaWV3MS5nZXQoKSBtYWluRnJhbWVdIGxvYWRSZXF1ZXN0OltO U1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JS ZXNvdXJjZTpAInZlcmJvc2VNYXJrdXAiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rv cnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07Ci0gICAgCi0gICAgVXRpbDo6cnVuKCZk aWRGaW5pc2hMb2FkKTsKLSAgICBkaWRGaW5pc2hMb2FkID0gZmFsc2U7Ci0gCi0gICAgd2ViVmll dzIuZ2V0KCkuZnJhbWVMb2FkRGVsZWdhdGUgPSB0ZXN0Q29udHJvbGxlci5nZXQoKTsKLSAgICBb W3dlYlZpZXcyLmdldCgpIG1haW5GcmFtZV0gbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1 ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAidmVyYm9z ZU1hcmt1cCIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRB UEkucmVzb3VyY2VzIl1dXTsKLSAgICAKLSAgICBVdGlsOjpydW4oJmRpZEZpbmlzaExvYWQpOwot ICAgIGRpZEZpbmlzaExvYWQgPSBmYWxzZTsKLQotICAgIERPTURvY3VtZW50ICpkb2N1bWVudDEg PSB3ZWJWaWV3MS5nZXQoKS5tYWluRnJhbWVEb2N1bWVudDsKLSAgICBOU1N0cmluZyogbWFya3Vw QmVmb3JlID0gW1tkb2N1bWVudDEgYm9keV0gaW5uZXJIVE1MXTsKLSAgICBET01Eb2N1bWVudCAq ZG9jdW1lbnQyID0gd2ViVmlldzIuZ2V0KCkubWFpbkZyYW1lRG9jdW1lbnQ7Ci0gICAgCi0gICAg Ly8gSWYgc3RhcnQgaXMgYWZ0ZXIgZW5kLCBub3RoaW5nIGlzIGRvbmUKLSAgICBET01Ob2RlICpz dGFydCA9IFtkb2N1bWVudDEgZ2V0RWxlbWVudEJ5SWQ6QCJ0ZXN0MiJdOwotICAgIERPTU5vZGUg KmVuZCA9IFtkb2N1bWVudDEgZ2V0RWxlbWVudEJ5SWQ6QCJ0ZXN0MSJdOwotCi0gICAgW3dlYlZp ZXcxLmdldCgpIF9zaW1wbGlmeU1hcmt1cDpbZG9jdW1lbnQxIGJvZHldIGVuZE5vZGU6ZW5kXTsK LSAgICBOU1N0cmluZyogbWFya3VwQWZ0ZXIgPSBbW2RvY3VtZW50MSBib2R5XSBpbm5lckhUTUxd OwotCi0gICAgRVhQRUNUX1dLX1NUUkVRKG1hcmt1cEJlZm9yZSwgbWFya3VwQWZ0ZXIpOwotICAg IEVYUEVDVF9FUShbbWFya3VwQmVmb3JlIGxlbmd0aF0sIFttYXJrdXBBZnRlciBsZW5ndGhdKTsK LQotICAgIC8vIElmIHRoZSB0d28gbm9kZXMgYXJlIG5vdCBpbiB0aGUgc2FtZSB3ZWJWaWV3LCBu b3RoaW5nIGlzIGRvbmUuCi0gICAgc3RhcnQgPSBbZG9jdW1lbnQxIGdldEVsZW1lbnRCeUlkOkAi dGVzdDEiXTsKLSAgICBlbmQgPSBbZG9jdW1lbnQyIGdldEVsZW1lbnRCeUlkOkAidGVzdDIiXTsK LSAgICBbd2ViVmlldzEuZ2V0KCkgX3NpbXBsaWZ5TWFya3VwOnN0YXJ0IGVuZE5vZGU6ZW5kXTsK LSAgICBtYXJrdXBBZnRlciA9IFtbZG9jdW1lbnQxIGJvZHldIGlubmVySFRNTF07Ci0gICAgCi0g ICAgRVhQRUNUX1dLX1NUUkVRKG1hcmt1cEJlZm9yZSwgbWFya3VwQWZ0ZXIpOwotICAgIEVYUEVD VF9FUShbbWFya3VwQmVmb3JlIGxlbmd0aF0sIFttYXJrdXBBZnRlciBsZW5ndGhdKTsKLQotICAg IC8vIElmIHRoZSB0d28gbm9kZXMgYXJlIG5vdCBpbiB0aGUgc2FtZSBkb2N1bWVudCwgbm90aGlu ZyBpcyBkb25lLgotICAgIERPTUhUTUxGcmFtZUVsZW1lbnQqIGZyYW1lID0gKERPTUhUTUxGcmFt ZUVsZW1lbnQgKilbZG9jdW1lbnQxIGdldEVsZW1lbnRCeUlkOkAidGVzdDMiXTsKLSAgICBlbmQg PSBbW2ZyYW1lIGNvbnRlbnREb2N1bWVudF0gZmlyc3RDaGlsZF07Ci0gICAgCi0gICAgW3dlYlZp ZXcxLmdldCgpIF9zaW1wbGlmeU1hcmt1cDpzdGFydCBlbmROb2RlOmVuZF07Ci0gICAgbWFya3Vw QWZ0ZXIgPSBbW2RvY3VtZW50MSBib2R5XSBpbm5lckhUTUxdOwotICAgIAotICAgIEVYUEVDVF9X S19TVFJFUShtYXJrdXBCZWZvcmUsIG1hcmt1cEFmdGVyKTsKLSAgICBFWFBFQ1RfRVEoW21hcmt1 cEJlZm9yZSBsZW5ndGhdLCBbbWFya3VwQWZ0ZXIgbGVuZ3RoXSk7Ci0KLSAgICAvLyBJZiB0aGUg bm9kZXMgYXJlIGluIHRoZSBzYW1lIHdlYlZpZXcsIHNhbWUgZG9jdW1lbnQgYW5kIGluIHRoZSBy aWdodCBvcmRlciwKLSAgICAvLyB3ZSBzaG91bGQgaGF2ZSBhIHNpbXBsaWZpZWQgbWFya3VwLgot ICAgIFt3ZWJWaWV3MS5nZXQoKSBfc2ltcGxpZnlNYXJrdXA6W2RvY3VtZW50MSBib2R5XSBlbmRO b2RlOm5pbF07Ci0gICAgbWFya3VwQWZ0ZXIgPSBbW2RvY3VtZW50MSBib2R5XSBpbm5lckhUTUxd OwotICAgIC8vIFdlIG9ubHkgdmVyaWZ5IHRoYXQgdGhlIG1hcmt1cCBoYXMgY2hhbmdlZCBhbmQg dGhhdCBpdCBpcyBsZXNzIHZlcmJvc2UKLSAgICAvLyB0aGVuIHRoZSBvcmlnaW5hbCB2ZXJzaW9u LgotICAgIC8vIFRoZSBhY2N1cmFjeSBvZiB0aGUgb3BlcmF0aW9uIGlzIHRlc3RlZCBieSB0aGUg RFJUIHRlc3RzIGFscmVhZHkuCi0gICAgRVhQRUNUX0dUKFttYXJrdXBCZWZvcmUgbGVuZ3RoXSwg W21hcmt1cEFmdGVyIGxlbmd0aF0pOwotfQotCi19IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJ Cg==