175417 2017-08-10 01:40:42 -0700 Text renderer updates should be done by RenderTreeUpdater 2017-08-10 08:35:36 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 163848 1 koivisto webkit-unassigned bfulgham buildbot cdumez commit-queue dbates esprehn+autocc kangil.han kling ryanhaddad simon.fraser webkit-bug-importer zalan oldest_to_newest 1337351 0 koivisto 2017-08-10 01:40:42 -0700 Currently Text does some direct render tree mutations. 1337354 1 317797 koivisto 2017-08-10 01:49:15 -0700 Created attachment 317797 patch 1337364 2 317797 kling 2017-08-10 02:49:38 -0700 Comment on attachment 317797 patch r=me 1337370 3 317797 commit-queue 2017-08-10 03:20:56 -0700 Comment on attachment 317797 patch Clearing flags on attachment: 317797 Committed r220523: <http://trac.webkit.org/changeset/220523> 1337371 4 commit-queue 2017-08-10 03:20:58 -0700 All reviewed patches have been landed. Closing bug. 1337372 5 webkit-bug-importer 2017-08-10 03:22:14 -0700 <rdar://problem/33824787> 1337430 6 ryanhaddad 2017-08-10 08:35:36 -0700 (In reply to WebKit Commit Bot from comment #3) > Comment on attachment 317797 [details] > patch > > Clearing flags on attachment: 317797 > > Committed r220523: <http://trac.webkit.org/changeset/220523> This change broke the Windows build (as EWS predicted): https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/3582 317797 2017-08-10 01:49:15 -0700 2017-08-10 03:20:56 -0700 patch text-update-via-rendertreeupdater.patch text/plain 9809 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMDUyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDE3LTA4LTEwICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBUZXh0IHJlbmRlcmVyIHVwZGF0 ZXMgc2hvdWxkIGJlIGRvbmUgYnkgUmVuZGVyVHJlZVVwZGF0ZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTQxNworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCByZW5kZXIgdHJlZSBtdXRhdGlvbnMg c2hvdWxkIGJlIGRvbmUgYnkgUmVuZGVyVHJlZVVwZGF0ZXIuIEN1cnJlbnRseQorICAgICAgICBU ZXh0Ojp1cGRhdGVSZW5kZXJlckFmdGVyQ29udGVudENoYW5nZSBjYWxscyBSZW5kZXJUZXh0Ojpz ZXRUZXh0V2l0aE9mZnNldCBkaXJlY3RseS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlVGV4dFJlbmRlcmVyKToKKworICAg ICAgICAgICAgQWRkIHJhbmdlIGFyZ3VtZW50LgorCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6 CisgICAgICAgICogZG9tL1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dDo6dXBkYXRl UmVuZGVyZXJBZnRlckNvbnRlbnRDaGFuZ2UpOgorCisgICAgICAgICAgICBSZW1vdmUgY2FsbCB0 byBzZXRUZXh0V2l0aE9mZnNldCBhbmQgcGFzcyB0aGUgcmFuZ2UgdG8gdXBkYXRlVGV4dFJlbmRl cmVyCisKKyAgICAgICAgKiBzdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlUmVuZGVyVHJlZSk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlVGV4dFJlbmRlcmVyKToKKworICAgICAg ICAgICAgQ2FsbCBzZXRUZXh0V2l0aE9mZnNldCBoZXJlLgorCisgICAgICAgICogc3R5bGUvUmVu ZGVyVHJlZVVwZGF0ZXIuaDoKKyAgICAgICAgKiBzdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6VHJlZVJlc29sdmVyOjpyZXNvbHZlQ29tcG9zZWRU cmVlKToKKyAgICAgICAgKiBzdHlsZS9TdHlsZVVwZGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZTo6VXBkYXRlOjp0ZXh0VXBkYXRlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlOjpVcGRhdGU6OmFkZFRleHQpOgorCisgICAgICAgICAgICBBZGQgVGV4dFVwZGF0ZSBzdHJ1 Y3Qgc2ltaWxhciB0byBFbGVtZW50VXBkYXRlIHRvIHBhc3MgdGhlIHJhbmdlIHRvIHRoZSBSZW5k ZXJUcmVlVXBkYXRlci4KKworICAgICAgICAqIHN0eWxlL1N0eWxlVXBkYXRlLmg6CisKIDIwMTct MDgtMTAgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQgR1RLKyBidWlsZCBmaXggZm9yIEVOQUJMRV9HTEVTMj1PTi4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIwNDQ3KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg2OCwxMyArMTg2OCwxMyBAQCB2b2lk IERvY3VtZW50OjpyZXNvbHZlU3R5bGUoUmVzb2x2ZVN0eWxlCiAgICAgLy8gRklYTUU6IElkZWFs bHkgd2Ugd291bGQgQVNTRVJUKCFuZWVkc1N0eWxlUmVjYWxjKCkpIGhlcmUgYnV0IHdlIGhhdmUg c29tZSBjYXNlcyB3aGVyZSBpdCBpcyBub3QgdHJ1ZS4KIH0KIAotdm9pZCBEb2N1bWVudDo6dXBk YXRlVGV4dFJlbmRlcmVyKFRleHQmIHRleHQpCit2b2lkIERvY3VtZW50Ojp1cGRhdGVUZXh0UmVu ZGVyZXIoVGV4dCYgdGV4dCwgdW5zaWduZWQgb2Zmc2V0T2ZSZXBsYWNlZFRleHQsIHVuc2lnbmVk IGxlbmd0aE9mUmVwbGFjZWRUZXh0KQogewogICAgIEFTU0VSVCghbV9pblJlbmRlclRyZWVVcGRh dGUpOwogICAgIFNldEZvclNjb3BlPGJvb2w+IGluUmVuZGVyVHJlZVVwZGF0ZShtX2luUmVuZGVy VHJlZVVwZGF0ZSwgdHJ1ZSk7CiAKICAgICBhdXRvIHRleHRVcGRhdGUgPSBzdGQ6Om1ha2VfdW5p cXVlPFN0eWxlOjpVcGRhdGU+KCp0aGlzKTsKLSAgICB0ZXh0VXBkYXRlLT5hZGRUZXh0KHRleHQp OworICAgIHRleHRVcGRhdGUtPmFkZFRleHQodGV4dCwgeyBvZmZzZXRPZlJlcGxhY2VkVGV4dCwg bGVuZ3RoT2ZSZXBsYWNlZFRleHQgfSk7CiAKICAgICBSZW5kZXJUcmVlVXBkYXRlciByZW5kZXJU cmVlVXBkYXRlcigqdGhpcyk7CiAgICAgcmVuZGVyVHJlZVVwZGF0ZXIuY29tbWl0KFdURk1vdmUo dGV4dFVwZGF0ZSkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHJldmlzaW9uIDIyMDQ0NykK KysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjM3 LDcgKzEyMzcsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpblN0eWxlUmVjYWxjKCkgY29uc3QgeyBy ZXR1cm4gbV9pblN0eWxlUmVjYWxjOyB9CiAgICAgYm9vbCBpblJlbmRlclRyZWVVcGRhdGUoKSBj b25zdCB7IHJldHVybiBtX2luUmVuZGVyVHJlZVVwZGF0ZTsgfQogCi0gICAgdm9pZCB1cGRhdGVU ZXh0UmVuZGVyZXIoVGV4dCYpOworICAgIHZvaWQgdXBkYXRlVGV4dFJlbmRlcmVyKFRleHQmLCB1 bnNpZ25lZCBvZmZzZXRPZlJlcGxhY2VkVGV4dCwgdW5zaWduZWQgbGVuZ3RoT2ZSZXBsYWNlZFRl eHQpOwogCiAgICAgLy8gUmV0dXJuIGEgTG9jYWxlIGZvciB0aGUgZGVmYXVsdCBsb2NhbGUgaWYg dGhlIGFyZ3VtZW50IGlzIG51bGwgb3IgZW1wdHkuCiAgICAgTG9jYWxlJiBnZXRDYWNoZWRMb2Nh bGUoY29uc3QgQXRvbWljU3RyaW5nJiBsb2NhbGUgPSBudWxsQXRvbSgpKTsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9UZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20v VGV4dC5jcHAJKHJldmlzaW9uIDIyMDQ0NykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9UZXh0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjE3LDEwICsyMTcsNyBAQCB2b2lkIFRleHQ6OnVwZGF0ZVJl bmRlcmVyQWZ0ZXJDb250ZW50Q2hhCiAgICAgaWYgKHN0eWxlVmFsaWRpdHkoKSA+PSBTdHlsZTo6 VmFsaWRpdHk6OlN1YnRyZWVBbmRSZW5kZXJlcnNJbnZhbGlkKQogICAgICAgICByZXR1cm47CiAK LSAgICBkb2N1bWVudCgpLnVwZGF0ZVRleHRSZW5kZXJlcigqdGhpcyk7Ci0KLSAgICBpZiAoYXV0 byogcmVuZGVyZXIgPSB0aGlzLT5yZW5kZXJlcigpKQotICAgICAgICByZW5kZXJlci0+c2V0VGV4 dFdpdGhPZmZzZXQoZGF0YSgpLCBvZmZzZXRPZlJlcGxhY2VkRGF0YSwgbGVuZ3RoT2ZSZXBsYWNl ZERhdGEpOworICAgIGRvY3VtZW50KCkudXBkYXRlVGV4dFJlbmRlcmVyKCp0aGlzLCBvZmZzZXRP ZlJlcGxhY2VkRGF0YSwgbGVuZ3RoT2ZSZXBsYWNlZERhdGEpOwogfQogCiAjaWYgRU5BQkxFKFRS RUVfREVCVUdHSU5HKQpJbmRleDogU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0 ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVVcGRh dGVyLmNwcAkocmV2aXNpb24gMjIwNDQ3KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVy VHJlZVVwZGF0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsOCArMTY0LDkgQEAgdm9pZCBS ZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlUmVuZGVyVHJlZQogCiAgICAgICAgIGlmIChpczxUZXh0 Pihub2RlKSkgewogICAgICAgICAgICAgYXV0byYgdGV4dCA9IGRvd25jYXN0PFRleHQ+KG5vZGUp OwotICAgICAgICAgICAgaWYgKHBhcmVudCgpLnN0eWxlQ2hhbmdlID09IFN0eWxlOjpEZXRhY2gg fHwgbV9zdHlsZVVwZGF0ZS0+dGV4dFVwZGF0ZSh0ZXh0KSB8fCBtX2ludmFsaWRhdGVkV2hpdGVz cGFjZU9ubHlUZXh0U2libGluZ3MuY29udGFpbnMoJnRleHQpKQotICAgICAgICAgICAgICAgIHVw ZGF0ZVRleHRSZW5kZXJlcih0ZXh0KTsKKyAgICAgICAgICAgIGF1dG8qIHRleHRVcGRhdGUgPSBt X3N0eWxlVXBkYXRlLT50ZXh0VXBkYXRlKHRleHQpOworICAgICAgICAgICAgaWYgKHBhcmVudCgp LnN0eWxlQ2hhbmdlID09IFN0eWxlOjpEZXRhY2ggfHwgdGV4dFVwZGF0ZSB8fCBtX2ludmFsaWRh dGVkV2hpdGVzcGFjZU9ubHlUZXh0U2libGluZ3MuY29udGFpbnMoJnRleHQpKQorICAgICAgICAg ICAgICAgIHVwZGF0ZVRleHRSZW5kZXJlcih0ZXh0LCB0ZXh0VXBkYXRlKTsKIAogICAgICAgICAg ICAgaXQudHJhdmVyc2VOZXh0U2tpcHBpbmdDaGlsZHJlbigpOwogICAgICAgICAgICAgY29udGlu dWU7CkBAIC00NDMsMTMgKzQ0NCwxNiBAQCBzdGF0aWMgdm9pZCBjcmVhdGVUZXh0UmVuZGVyZXIo VGV4dCYgdGV4CiAgICAgcmVuZGVyVHJlZVBvc2l0aW9uLmluc2VydCgqbmV3UmVuZGVyZXIubGVh a1B0cigpKTsKIH0KIAotdm9pZCBSZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlVGV4dFJlbmRlcmVy KFRleHQmIHRleHQpCit2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVUZXh0UmVuZGVyZXIo VGV4dCYgdGV4dCwgY29uc3QgU3R5bGU6OlRleHRVcGRhdGUqIHRleHRVcGRhdGUpCiB7Ci0gICAg Ym9vbCBoYXNSZW5kZXJlciA9IHRleHQucmVuZGVyZXIoKTsKKyAgICBhdXRvKiBleGlzdGluZ1Jl bmRlcmVyID0gdGV4dC5yZW5kZXJlcigpOwogICAgIGJvb2wgbmVlZHNSZW5kZXJlciA9IHRleHRS ZW5kZXJlcklzTmVlZGVkKHRleHQsIHJlbmRlclRyZWVQb3NpdGlvbigpKTsKLSAgICBpZiAoaGFz UmVuZGVyZXIpIHsKLSAgICAgICAgaWYgKG5lZWRzUmVuZGVyZXIpCisgICAgaWYgKGV4aXN0aW5n UmVuZGVyZXIpIHsKKyAgICAgICAgaWYgKG5lZWRzUmVuZGVyZXIpIHsKKyAgICAgICAgICAgIGlm ICh0ZXh0VXBkYXRlKQorICAgICAgICAgICAgICAgIGV4aXN0aW5nUmVuZGVyZXItPnNldFRleHRX aXRoT2Zmc2V0KHRleHQuZGF0YSgpLCB0ZXh0VXBkYXRlLT5vZmZzZXQsIHRleHRVcGRhdGUtPmxl bmd0aCk7CiAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICAgICAgdGVhckRvd25S ZW5kZXJlcih0ZXh0KTsKICAgICAgICAgaW52YWxpZGF0ZVdoaXRlc3BhY2VPbmx5VGV4dFNpYmxp bmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZCh0ZXh0KTsKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291 cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5oCShyZXZpc2lvbiAyMjA0NDcpCisr KyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5oCSh3b3JraW5nIGNvcHkp CkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZVJl bmRlclRyZWUoQ29udGFpbmVyTm9kZSYgcm9vdCk7Ci0gICAgdm9pZCB1cGRhdGVUZXh0UmVuZGVy ZXIoVGV4dCYpOworICAgIHZvaWQgdXBkYXRlVGV4dFJlbmRlcmVyKFRleHQmLCBjb25zdCBTdHls ZTo6VGV4dFVwZGF0ZSopOwogICAgIHZvaWQgdXBkYXRlRWxlbWVudFJlbmRlcmVyKEVsZW1lbnQm LCBjb25zdCBTdHlsZTo6RWxlbWVudFVwZGF0ZSYpOwogICAgIHZvaWQgY3JlYXRlUmVuZGVyZXIo RWxlbWVudCYsIFJlbmRlclN0eWxlJiYpOwogICAgIHZvaWQgaW52YWxpZGF0ZVdoaXRlc3BhY2VP bmx5VGV4dFNpYmxpbmdzQWZ0ZXJBdHRhY2hJZk5lZWRlZChOb2RlJik7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCShyZXZpc2lvbiAyMjA0NDcpCisr KyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQwNiw3ICs0MDYsNyBAQCB2b2lkIFRyZWVSZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2Vk VHJlZSgpCiAgICAgICAgIGlmIChpczxUZXh0Pihub2RlKSkgewogICAgICAgICAgICAgYXV0byYg dGV4dCA9IGRvd25jYXN0PFRleHQ+KG5vZGUpOwogICAgICAgICAgICAgaWYgKHRleHQuc3R5bGVW YWxpZGl0eSgpID49IFZhbGlkaXR5OjpTdWJ0cmVlQW5kUmVuZGVyZXJzSW52YWxpZCAmJiBwYXJl bnQuY2hhbmdlICE9IERldGFjaCkKLSAgICAgICAgICAgICAgICBtX3VwZGF0ZS0+YWRkVGV4dCh0 ZXh0LCBwYXJlbnQuZWxlbWVudCk7CisgICAgICAgICAgICAgICAgbV91cGRhdGUtPmFkZFRleHQo dGV4dCwgcGFyZW50LmVsZW1lbnQsIHsgfSk7CiAKICAgICAgICAgICAgIHRleHQuc2V0SGFzVmFs aWRTdHlsZSgpOwogICAgICAgICAgICAgaXQudHJhdmVyc2VOZXh0U2tpcHBpbmdDaGlsZHJlbigp OwpJbmRleDogU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVVcGRhdGUuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlVXBkYXRlLmNwcAkocmV2aXNpb24gMjIwNDQ3 KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVVcGRhdGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01Nyw5ICs1NywxMiBAQCBFbGVtZW50VXBkYXRlKiBVcGRhdGU6OmVsZW1lbnRVcGRhdGUo Y29uCiAgICAgcmV0dXJuICZpdC0+dmFsdWU7CiB9CiAKLWJvb2wgVXBkYXRlOjp0ZXh0VXBkYXRl KGNvbnN0IFRleHQmIHRleHQpIGNvbnN0Citjb25zdCBUZXh0VXBkYXRlKiBVcGRhdGU6OnRleHRV cGRhdGUoY29uc3QgVGV4dCYgdGV4dCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV90ZXh0cy5jb250 YWlucygmdGV4dCk7CisgICAgYXV0byBpdCA9IG1fdGV4dHMuZmluZCgmdGV4dCk7CisgICAgaWYg KGl0ID09IG1fdGV4dHMuZW5kKCkpCisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIHJldHVy biAmaXQtPnZhbHVlOwogfQogCiBjb25zdCBSZW5kZXJTdHlsZSogVXBkYXRlOjplbGVtZW50U3R5 bGUoY29uc3QgRWxlbWVudCYgZWxlbWVudCkgY29uc3QKQEAgLTkxLDE4ICs5NCwxOCBAQCB2b2lk IFVwZGF0ZTo6YWRkRWxlbWVudChFbGVtZW50JiBlbGVtZW50CiAgICAgbV9lbGVtZW50cy5hZGQo JmVsZW1lbnQsIFdURk1vdmUoZWxlbWVudFVwZGF0ZSkpOwogfQogCi12b2lkIFVwZGF0ZTo6YWRk VGV4dChUZXh0JiB0ZXh0LCBFbGVtZW50KiBwYXJlbnQpCit2b2lkIFVwZGF0ZTo6YWRkVGV4dChU ZXh0JiB0ZXh0LCBFbGVtZW50KiBwYXJlbnQsIFRleHRVcGRhdGUmJiB0ZXh0VXBkYXRlKQogewog ICAgIEFTU0VSVCghbV90ZXh0cy5jb250YWlucygmdGV4dCkpOwogICAgIEFTU0VSVChjb21wb3Nl ZFRyZWVBbmNlc3RvcnModGV4dCkuZmlyc3QoKSA9PSBwYXJlbnQpOwogCiAgICAgYWRkUG9zc2li bGVSb290KHBhcmVudCk7Ci0gICAgbV90ZXh0cy5hZGQoJnRleHQpOworICAgIG1fdGV4dHMuYWRk KCZ0ZXh0LCBXVEZNb3ZlKHRleHRVcGRhdGUpKTsKIH0KIAotdm9pZCBVcGRhdGU6OmFkZFRleHQo VGV4dCYgdGV4dCkKK3ZvaWQgVXBkYXRlOjphZGRUZXh0KFRleHQmIHRleHQsIFRleHRVcGRhdGUm JiB0ZXh0VXBkYXRlKQogewotICAgIGFkZFRleHQodGV4dCwgY29tcG9zZWRUcmVlQW5jZXN0b3Jz KHRleHQpLmZpcnN0KCkpOworICAgIGFkZFRleHQodGV4dCwgY29tcG9zZWRUcmVlQW5jZXN0b3Jz KHRleHQpLmZpcnN0KCksIFdURk1vdmUodGV4dFVwZGF0ZSkpOwogfQogCiB2b2lkIFVwZGF0ZTo6 YWRkUG9zc2libGVSb290KEVsZW1lbnQqIGVsZW1lbnQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9z dHlsZS9TdHlsZVVwZGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlVXBkYXRlLmgJKHJldmlzaW9uIDIyMDQ0NykKKysrIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlVXBkYXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYgKzU0LDExIEBAIHN0cnVjdCBFbGVt ZW50VXBkYXRlIHsKICAgICBib29sIHJlY29tcG9zaXRlTGF5ZXIgeyBmYWxzZSB9OwogfTsKIAor c3RydWN0IFRleHRVcGRhdGUgeworICAgIHVuc2lnbmVkIG9mZnNldCB7IDAgfTsKKyAgICB1bnNp Z25lZCBsZW5ndGggeyBzdGQ6Om51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4KCkgfTsKK307 CisKIGNsYXNzIFVwZGF0ZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6 CkBAIC02NCw3ICs2OSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBFbGVtZW50VXBkYXRlKiBlbGVt ZW50VXBkYXRlKGNvbnN0IEVsZW1lbnQmKSBjb25zdDsKICAgICBFbGVtZW50VXBkYXRlKiBlbGVt ZW50VXBkYXRlKGNvbnN0IEVsZW1lbnQmKTsKIAotICAgIGJvb2wgdGV4dFVwZGF0ZShjb25zdCBU ZXh0JikgY29uc3Q7CisgICAgY29uc3QgVGV4dFVwZGF0ZSogdGV4dFVwZGF0ZShjb25zdCBUZXh0 JikgY29uc3Q7CiAKICAgICBjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlKGNvbnN0IEVs ZW1lbnQmKSBjb25zdDsKICAgICBSZW5kZXJTdHlsZSogZWxlbWVudFN0eWxlKGNvbnN0IEVsZW1l bnQmKTsKQEAgLTc0LDggKzc5LDggQEAgcHVibGljOgogICAgIHVuc2lnbmVkIHNpemUoKSBjb25z dCB7IHJldHVybiBtX2VsZW1lbnRzLnNpemUoKSArIG1fdGV4dHMuc2l6ZSgpOyB9CiAKICAgICB2 b2lkIGFkZEVsZW1lbnQoRWxlbWVudCYsIEVsZW1lbnQqIHBhcmVudCwgRWxlbWVudFVwZGF0ZSYm KTsKLSAgICB2b2lkIGFkZFRleHQoVGV4dCYsIEVsZW1lbnQqIHBhcmVudCk7Ci0gICAgdm9pZCBh ZGRUZXh0KFRleHQmKTsKKyAgICB2b2lkIGFkZFRleHQoVGV4dCYsIEVsZW1lbnQqIHBhcmVudCwg VGV4dFVwZGF0ZSYmKTsKKyAgICB2b2lkIGFkZFRleHQoVGV4dCYsIFRleHRVcGRhdGUmJik7CiAK IHByaXZhdGU6CiAgICAgdm9pZCBhZGRQb3NzaWJsZVJvb3QoRWxlbWVudCopOwpAQCAtODMsNyAr ODgsNyBAQCBwcml2YXRlOgogICAgIERvY3VtZW50JiBtX2RvY3VtZW50OwogICAgIExpc3RIYXNo U2V0PENvbnRhaW5lck5vZGUqPiBtX3Jvb3RzOwogICAgIEhhc2hNYXA8Y29uc3QgRWxlbWVudCos IEVsZW1lbnRVcGRhdGU+IG1fZWxlbWVudHM7Ci0gICAgSGFzaFNldDxjb25zdCBUZXh0Kj4gbV90 ZXh0czsKKyAgICBIYXNoTWFwPGNvbnN0IFRleHQqLCBUZXh0VXBkYXRlPiBtX3RleHRzOwogfTsK IAogfQo=