164839 2016-11-16 15:31:05 -0800 Use more references for Document::removeFocusedNodeOfSubtree() 2016-11-16 16:36:07 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez cdumez cmarcelo commit-queue dbates esprehn+autocc japhet kangil.han oldest_to_newest 1252058 0 cdumez 2016-11-16 15:31:05 -0800 Use more references for Document::removeFocusedNodeOfSubtree(). 1252070 1 294989 cdumez 2016-11-16 15:43:43 -0800 Created attachment 294989 Patch 1252101 2 294989 commit-queue 2016-11-16 16:36:02 -0800 Comment on attachment 294989 Patch Clearing flags on attachment: 294989 Committed r208826: <http://trac.webkit.org/changeset/208826> 1252102 3 commit-queue 2016-11-16 16:36:07 -0800 All reviewed patches have been landed. Closing bug. 294989 2016-11-16 15:43:43 -0800 2016-11-16 16:36:02 -0800 Patch bug-164839-20161116154339.patch text/plain 8814 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA4ODA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTAzNWMwMWEwZGFiZDk2 ZDg4MTNkM2IyNDJiYWE2M2JiMjQ0NDE2NC4uYjIxODk4ZWY1MTE0NmVjNWZjYWM5ZDgwNmYyMTdm OGU0MjExNGMxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTExLTE2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIG1vcmUgcmVmZXJlbmNl cyBmb3IgRG9jdW1lbnQ6OnJlbW92ZUZvY3VzZWROb2RlT2ZTdWJ0cmVlKCkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDgzOQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBtb3JlIHJlZmVyZW5jZXMg Zm9yIERvY3VtZW50OjpyZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZSgpLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cywgbm8gV2ViLWV4cG9zZWQgYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICog ZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzTm9kZUluU3VidHJlZSk6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Om5vZGVDaGlsZHJlbldpbGxCZVJlbW92ZWQpOgor ICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Om5vZGVXaWxsQmVSZW1vdmVkKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpyZW1vdmVGb2N1c05hdmlnYXRpb25Ob2RlT2ZTdWJ0cmVlKToK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpyZW1vdmVGdWxsU2NyZWVuRWxlbWVudE9mU3Vi dHJlZSk6CisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisgICAgICAgICogZG9tL0VsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6cmVtb3ZlU2hhZG93Um9vdCk6CisgICAg ICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9h ZGVyOjpjbGVhcik6CisKIDIwMTYtMTEtMTYgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29t PgogCiAgICAgICAgIEFub3RoZXIgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5k ZXggMmQ4MjFkNTNiNzlkMzBjZDBlMmIxZmYxOTI5NjQxMmE2ZWNkYjk2Yy4uYmQ0MmJjMzYxOGIw ODQzZTM4NDhkYzlmNTJkZDQxY2ZhMTg4MDlmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBA IC0zNTMxLDI3ICszNTMxLDI0IEBAIHZvaWQgRG9jdW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlkQ2hh bmdlKCkKICAgICAgICAgYXVkaW9Qcm9kdWNlci0+cGFnZU11dGVkU3RhdGVEaWRDaGFuZ2UoKTsK IH0KIAotc3RhdGljIGJvb2wgaXNOb2RlSW5TdWJ0cmVlKE5vZGUqIG5vZGUsIE5vZGUqIGNvbnRh aW5lciwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSkKK3N0YXRpYyBib29sIGlzTm9kZUluU3VidHJl ZShOb2RlJiBub2RlLCBOb2RlJiBjb250YWluZXIsIGJvb2wgYW1vbmdDaGlsZHJlbk9ubHkpCiB7 Ci0gICAgYm9vbCBub2RlSW5TdWJ0cmVlID0gZmFsc2U7CiAgICAgaWYgKGFtb25nQ2hpbGRyZW5P bmx5KQotICAgICAgICBub2RlSW5TdWJ0cmVlID0gbm9kZS0+aXNEZXNjZW5kYW50T2YoY29udGFp bmVyKTsKKyAgICAgICAgcmV0dXJuIG5vZGUuaXNEZXNjZW5kYW50T2YoJmNvbnRhaW5lcik7CiAg ICAgZWxzZQotICAgICAgICBub2RlSW5TdWJ0cmVlID0gKG5vZGUgPT0gY29udGFpbmVyKSB8fCBu b2RlLT5pc0Rlc2NlbmRhbnRPZihjb250YWluZXIpOwotICAgIAotICAgIHJldHVybiBub2RlSW5T dWJ0cmVlOworICAgICAgICByZXR1cm4gJm5vZGUgPT0gJmNvbnRhaW5lciB8fCBub2RlLmlzRGVz Y2VuZGFudE9mKCZjb250YWluZXIpOwogfQogCi12b2lkIERvY3VtZW50OjpyZW1vdmVGb2N1c2Vk Tm9kZU9mU3VidHJlZShOb2RlKiBub2RlLCBib29sIGFtb25nQ2hpbGRyZW5Pbmx5KQordm9pZCBE b2N1bWVudDo6cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoTm9kZSYgbm9kZSwgYm9vbCBhbW9u Z0NoaWxkcmVuT25seSkKIHsKICAgICBpZiAoIW1fZm9jdXNlZEVsZW1lbnQgfHwgcGFnZUNhY2hl U3RhdGUoKSAhPSBOb3RJblBhZ2VDYWNoZSkgLy8gSWYgdGhlIGRvY3VtZW50IGlzIGluIHRoZSBw YWdlIGNhY2hlLCB0aGVuIHdlIGRvbid0IG5lZWQgdG8gY2xlYXIgb3V0IHRoZSBmb2N1c2VkIG5v ZGUuCiAgICAgICAgIHJldHVybjsKIAotICAgIEVsZW1lbnQqIGZvY3VzZWRFbGVtZW50ID0gbm9k ZS0+dHJlZVNjb3BlKCkuZm9jdXNlZEVsZW1lbnQoKTsKKyAgICBFbGVtZW50KiBmb2N1c2VkRWxl bWVudCA9IG5vZGUudHJlZVNjb3BlKCkuZm9jdXNlZEVsZW1lbnQoKTsKICAgICBpZiAoIWZvY3Vz ZWRFbGVtZW50KQogICAgICAgICByZXR1cm47CiAgICAgCi0gICAgaWYgKGlzTm9kZUluU3VidHJl ZShmb2N1c2VkRWxlbWVudCwgbm9kZSwgYW1vbmdDaGlsZHJlbk9ubHkpKSB7CisgICAgaWYgKGlz Tm9kZUluU3VidHJlZSgqZm9jdXNlZEVsZW1lbnQsIG5vZGUsIGFtb25nQ2hpbGRyZW5Pbmx5KSkg ewogICAgICAgICBzZXRGb2N1c2VkRWxlbWVudChudWxscHRyLCBGb2N1c0RpcmVjdGlvbk5vbmUs IEZvY3VzUmVtb3ZhbEV2ZW50c01vZGU6OkRvTm90RGlzcGF0Y2gpOwogICAgICAgICAvLyBTZXQg dGhlIGZvY3VzIG5hdmlnYXRpb24gc3RhcnRpbmcgbm9kZSB0byB0aGUgcHJldmlvdXMgZm9jdXNl ZCBlbGVtZW50IHNvIHRoYXQKICAgICAgICAgLy8gd2UgY2FuIGZhbGxiYWNrIHRvIHRoZSBzaWJs aW5ncyBvciBwYXJlbnQgbm9kZSBmb3IgdGhlIG5leHQgc2VhcmNoLgpAQCAtMzg5MCwxMSArMzg4 NywxMSBAQCB2b2lkIERvY3VtZW50Ojpub2RlQ2hpbGRyZW5XaWxsQmVSZW1vdmVkKENvbnRhaW5l ck5vZGUmIGNvbnRhaW5lcikKIHsKICAgICBOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb24gYXNzZXJ0 Tm9FdmVudERpc3BhdGNoOwogCi0gICAgcmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoJmNvbnRh aW5lciwgdHJ1ZSAvKiBhbW9uZ0NoaWxkcmVuT25seSAqLyk7CisgICAgcmVtb3ZlRm9jdXNlZE5v ZGVPZlN1YnRyZWUoY29udGFpbmVyLCB0cnVlIC8qIGFtb25nQ2hpbGRyZW5Pbmx5ICovKTsKICAg ICByZW1vdmVGb2N1c05hdmlnYXRpb25Ob2RlT2ZTdWJ0cmVlKGNvbnRhaW5lciwgdHJ1ZSAvKiBh bW9uZ0NoaWxkcmVuT25seSAqLyk7CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAg cmVtb3ZlRnVsbFNjcmVlbkVsZW1lbnRPZlN1YnRyZWUoJmNvbnRhaW5lciwgdHJ1ZSAvKiBhbW9u Z0NoaWxkcmVuT25seSAqLyk7CisgICAgcmVtb3ZlRnVsbFNjcmVlbkVsZW1lbnRPZlN1YnRyZWUo Y29udGFpbmVyLCB0cnVlIC8qIGFtb25nQ2hpbGRyZW5Pbmx5ICovKTsKICNlbmRpZgogCiAgICAg Zm9yIChhdXRvKiByYW5nZSA6IG1fcmFuZ2VzKQpAQCAtMzkxOSwzMSArMzkxNiwzMSBAQCB2b2lk IERvY3VtZW50Ojpub2RlQ2hpbGRyZW5XaWxsQmVSZW1vdmVkKENvbnRhaW5lck5vZGUmIGNvbnRh aW5lcikKICAgICB9CiB9CiAKLXZvaWQgRG9jdW1lbnQ6Om5vZGVXaWxsQmVSZW1vdmVkKE5vZGUm IG4pCit2b2lkIERvY3VtZW50Ojpub2RlV2lsbEJlUmVtb3ZlZChOb2RlJiBub2RlKQogewogICAg IE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbiBhc3NlcnROb0V2ZW50RGlzcGF0Y2g7CiAKLSAgICBy ZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZSgmbik7Ci0gICAgcmVtb3ZlRm9jdXNOYXZpZ2F0aW9u Tm9kZU9mU3VidHJlZShuKTsKKyAgICByZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZShub2RlKTsK KyAgICByZW1vdmVGb2N1c05hdmlnYXRpb25Ob2RlT2ZTdWJ0cmVlKG5vZGUpOwogCiAjaWYgRU5B QkxFKEZVTExTQ1JFRU5fQVBJKQotICAgIHJlbW92ZUZ1bGxTY3JlZW5FbGVtZW50T2ZTdWJ0cmVl KCZuKTsKKyAgICByZW1vdmVGdWxsU2NyZWVuRWxlbWVudE9mU3VidHJlZShub2RlKTsKICNlbmRp ZgogCiAgICAgZm9yIChhdXRvKiBpdCA6IG1fbm9kZUl0ZXJhdG9ycykKLSAgICAgICAgaXQtPm5v ZGVXaWxsQmVSZW1vdmVkKG4pOworICAgICAgICBpdC0+bm9kZVdpbGxCZVJlbW92ZWQobm9kZSk7 CiAKICAgICBmb3IgKGF1dG8qIHJhbmdlIDogbV9yYW5nZXMpCi0gICAgICAgIHJhbmdlLT5ub2Rl V2lsbEJlUmVtb3ZlZChuKTsKKyAgICAgICAgcmFuZ2UtPm5vZGVXaWxsQmVSZW1vdmVkKG5vZGUp OwogCiAgICAgaWYgKEZyYW1lKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCkpIHsKLSAgICAgICAgZnJh bWUtPmV2ZW50SGFuZGxlcigpLm5vZGVXaWxsQmVSZW1vdmVkKG4pOwotICAgICAgICBmcmFtZS0+ c2VsZWN0aW9uKCkubm9kZVdpbGxCZVJlbW92ZWQobik7Ci0gICAgICAgIGZyYW1lLT5wYWdlKCkt PmRyYWdDYXJldENvbnRyb2xsZXIoKS5ub2RlV2lsbEJlUmVtb3ZlZChuKTsKKyAgICAgICAgZnJh bWUtPmV2ZW50SGFuZGxlcigpLm5vZGVXaWxsQmVSZW1vdmVkKG5vZGUpOworICAgICAgICBmcmFt ZS0+c2VsZWN0aW9uKCkubm9kZVdpbGxCZVJlbW92ZWQobm9kZSk7CisgICAgICAgIGZyYW1lLT5w YWdlKCktPmRyYWdDYXJldENvbnRyb2xsZXIoKS5ub2RlV2lsbEJlUmVtb3ZlZChub2RlKTsKICAg ICB9CiAKLSAgICBpZiAoaXM8VGV4dD4obikpCi0gICAgICAgIG1fbWFya2Vycy0+cmVtb3ZlTWFy a2Vycygmbik7CisgICAgaWYgKGlzPFRleHQ+KG5vZGUpKQorICAgICAgICBtX21hcmtlcnMtPnJl bW92ZU1hcmtlcnMoJm5vZGUpOwogfQogCiBzdGF0aWMgTm9kZSogZmFsbGJhY2tGb2N1c05hdmln YXRpb25TdGFydGluZ05vZGVBZnRlclJlbW92YWwoTm9kZSYgbm9kZSkKQEAgLTM5NTYsNyArMzk1 Myw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZUZvY3VzTmF2aWdhdGlvbk5vZGVPZlN1YnRyZWUo Tm9kZSYgbm9kZSwgYm9vbCBhbW9uZ0NoaWxkcmVuCiAgICAgaWYgKCFtX2ZvY3VzTmF2aWdhdGlv blN0YXJ0aW5nTm9kZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGlzTm9kZUluU3VidHJl ZShtX2ZvY3VzTmF2aWdhdGlvblN0YXJ0aW5nTm9kZS5nZXQoKSwgJm5vZGUsIGFtb25nQ2hpbGRy ZW5Pbmx5KSkgeworICAgIGlmIChpc05vZGVJblN1YnRyZWUoKm1fZm9jdXNOYXZpZ2F0aW9uU3Rh cnRpbmdOb2RlLCBub2RlLCBhbW9uZ0NoaWxkcmVuT25seSkpIHsKICAgICAgICAgbV9mb2N1c05h dmlnYXRpb25TdGFydGluZ05vZGUgPSBhbW9uZ0NoaWxkcmVuT25seSA/ICZub2RlIDogZmFsbGJh Y2tGb2N1c05hdmlnYXRpb25TdGFydGluZ05vZGVBZnRlclJlbW92YWwobm9kZSk7CiAgICAgICAg IG1fZm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdOb2RlSXNSZW1vdmVkID0gdHJ1ZTsKICAgICB9CkBA IC01OTU5LDE2ICs1OTU2LDE2IEBAIHZvaWQgRG9jdW1lbnQ6OmZ1bGxTY3JlZW5FbGVtZW50UmVt b3ZlZCgpCiAgICAgd2Via2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogfQogCi12b2lkIERvY3VtZW50 OjpyZW1vdmVGdWxsU2NyZWVuRWxlbWVudE9mU3VidHJlZShOb2RlKiBub2RlLCBib29sIGFtb25n Q2hpbGRyZW5Pbmx5KQordm9pZCBEb2N1bWVudDo6cmVtb3ZlRnVsbFNjcmVlbkVsZW1lbnRPZlN1 YnRyZWUoTm9kZSYgbm9kZSwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSkKIHsKICAgICBpZiAoIW1f ZnVsbFNjcmVlbkVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBib29sIGVsZW1l bnRJblN1YnRyZWUgPSBmYWxzZTsKICAgICBpZiAoYW1vbmdDaGlsZHJlbk9ubHkpCi0gICAgICAg IGVsZW1lbnRJblN1YnRyZWUgPSBtX2Z1bGxTY3JlZW5FbGVtZW50LT5pc0Rlc2NlbmRhbnRPZihu b2RlKTsKKyAgICAgICAgZWxlbWVudEluU3VidHJlZSA9IG1fZnVsbFNjcmVlbkVsZW1lbnQtPmlz RGVzY2VuZGFudE9mKCZub2RlKTsKICAgICBlbHNlCi0gICAgICAgIGVsZW1lbnRJblN1YnRyZWUg PSAobV9mdWxsU2NyZWVuRWxlbWVudCA9PSBub2RlKSB8fCBtX2Z1bGxTY3JlZW5FbGVtZW50LT5p c0Rlc2NlbmRhbnRPZihub2RlKTsKKyAgICAgICAgZWxlbWVudEluU3VidHJlZSA9IChtX2Z1bGxT Y3JlZW5FbGVtZW50ID09ICZub2RlKSB8fCBtX2Z1bGxTY3JlZW5FbGVtZW50LT5pc0Rlc2NlbmRh bnRPZigmbm9kZSk7CiAgICAgCiAgICAgaWYgKGVsZW1lbnRJblN1YnRyZWUpCiAgICAgICAgIGZ1 bGxTY3JlZW5FbGVtZW50UmVtb3ZlZCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAppbmRleCAxMjljYmI1 ZGJhMWQxODY2OWZjN2Y4MmVkZTkxYWU0NTMxNDMxMmM1Li5hMzcxYjgxNzRkYzk1NTBlZDZmN2Mx MDVlZjQ4ZTI5YzMxYTJjYjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaApAQCAtNzA3LDcgKzcwNyw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEZvY3VzTmF2aWdhdGlvblN0YXJ0aW5nTm9kZShOb2Rl Kik7CiAgICAgRWxlbWVudCogZm9jdXNOYXZpZ2F0aW9uU3RhcnRpbmdOb2RlKEZvY3VzRGlyZWN0 aW9uKSBjb25zdDsKIAotICAgIHZvaWQgcmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoTm9kZSos IGJvb2wgYW1vbmdDaGlsZHJlbk9ubHkgPSBmYWxzZSk7CisgICAgdm9pZCByZW1vdmVGb2N1c2Vk Tm9kZU9mU3VidHJlZShOb2RlJiwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSA9IGZhbHNlKTsKICAg ICB2b2lkIGhvdmVyZWRFbGVtZW50RGlkRGV0YWNoKEVsZW1lbnQqKTsKICAgICB2b2lkIGVsZW1l bnRJbkFjdGl2ZUNoYWluRGlkRGV0YWNoKEVsZW1lbnQqKTsKIApAQCAtMTEwOSw3ICsxMTA5LDcg QEAgcHVibGljOgogICAgIHZvaWQgZnVsbFNjcmVlbkNoYW5nZURlbGF5VGltZXJGaXJlZCgpOwog ICAgIGJvb2wgZnVsbFNjcmVlbklzQWxsb3dlZEZvckVsZW1lbnQoRWxlbWVudCopIGNvbnN0Owog ICAgIHZvaWQgZnVsbFNjcmVlbkVsZW1lbnRSZW1vdmVkKCk7Ci0gICAgdm9pZCByZW1vdmVGdWxs U2NyZWVuRWxlbWVudE9mU3VidHJlZShOb2RlKiwgYm9vbCBhbW9uZ0NoaWxkcmVuT25seSA9IGZh bHNlKTsKKyAgICB2b2lkIHJlbW92ZUZ1bGxTY3JlZW5FbGVtZW50T2ZTdWJ0cmVlKE5vZGUmLCBi b29sIGFtb25nQ2hpbGRyZW5Pbmx5ID0gZmFsc2UpOwogICAgIGJvb2wgaXNBbmltYXRpbmdGdWxs U2NyZWVuKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRBbmltYXRpbmdGdWxs U2NyZWVuKGJvb2wpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggMjFlNzA4ODQ2OGVmMDJi ZDUzMzdkMDE3NGFiNzkxMWNmOWFhNTU1Mi4uYzk2NTJmNjRkMDViN2ViMjU2NjZmNzA1MGQxNDE3 OGIwMGQ1ODk4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTc2OCw3ICsxNzY4LDcgQEAg dm9pZCBFbGVtZW50OjpyZW1vdmVTaGFkb3dSb290KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUG9wU2hhZG93Um9vdCgqdGhpcywgKm9sZFJv b3QpOwotICAgIGRvY3VtZW50KCkucmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUob2xkUm9vdC5n ZXQoKSk7CisgICAgZG9jdW1lbnQoKS5yZW1vdmVGb2N1c2VkTm9kZU9mU3VidHJlZSgqb2xkUm9v dCk7CiAKICAgICBBU1NFUlQoIW9sZFJvb3QtPnJlbmRlcmVyKCkpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCBhMjNhZTMzMTAwNjZhNDllZTM2MjAwOWJmODZiNzY5 YzNiMmMwNDViLi5jNzg4M2FjYjFiMWZiZTUwYzI5ODE4YjZmNDY2NmQ5Y2U5NmU0MzlmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTU4Niw3ICs1ODYsNyBAQCB2b2lk IEZyYW1lTG9hZGVyOjpjbGVhcihEb2N1bWVudCogbmV3RG9jdW1lbnQsIGJvb2wgY2xlYXJXaW5k b3dQcm9wZXJ0aWVzLCBib29sCiAgICAgICAgIGJvb2wgaGFkTGl2aW5nUmVuZGVyVHJlZSA9IG1f ZnJhbWUuZG9jdW1lbnQoKS0+aGFzTGl2aW5nUmVuZGVyVHJlZSgpOwogICAgICAgICBtX2ZyYW1l LmRvY3VtZW50KCktPnByZXBhcmVGb3JEZXN0cnVjdGlvbigpOwogICAgICAgICBpZiAoaGFkTGl2 aW5nUmVuZGVyVHJlZSkKLSAgICAgICAgICAgIG1fZnJhbWUuZG9jdW1lbnQoKS0+cmVtb3ZlRm9j dXNlZE5vZGVPZlN1YnRyZWUobV9mcmFtZS5kb2N1bWVudCgpKTsKKyAgICAgICAgICAgIG1fZnJh bWUuZG9jdW1lbnQoKS0+cmVtb3ZlRm9jdXNlZE5vZGVPZlN1YnRyZWUoKm1fZnJhbWUuZG9jdW1l bnQoKSk7CiAgICAgfQogCiAgICAgLy8gRG8gdGhpcyBhZnRlciBkZXRhY2hpbmcgdGhlIGRvY3Vt ZW50IHNvIHRoYXQgdGhlIHVubG9hZCBldmVudCB3b3Jrcy4K