122699 2013-10-12 12:29:21 -0700 Move line dirtying code to RenderTextLineBoxes 2013-10-12 13:32:30 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 939111 0 koivisto 2013-10-12 12:29:21 -0700 move it move it 939112 1 214062 koivisto 2013-10-12 12:31:02 -0700 Created attachment 214062 patch 939116 2 koivisto 2013-10-12 13:32:30 -0700 https://trac.webkit.org/r157346 214062 2013-10-12 12:31:02 -0700 2013-10-12 12:36:02 -0700 patch rendertextlineboxes-dirty.patch text/plain 10356 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzM0NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTEyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGxpbmUgZGlydHlpbmcg Y29kZSB0byBSZW5kZXJUZXh0TGluZUJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI2OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRMaW5lQm94ZXM6OnJlbW92ZUFsbEZyb21QYXJl bnQpOgorICAgICAgICAKKyAgICAgICAgICAgIEFsc28gbW92ZWQgdGhlIHJlbW92YWwgbG9vcC4K KworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dExpbmVCb3hlczo6ZGlydHlBbGwpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dExpbmVCb3hlczo6ZGlydHlSYW5nZSk6CisKIDIwMTMt MTAtMTIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUg bW9yZSBjb2RlIHRvIFJlbmRlclRleHRMaW5lQm94ZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDE1NzM0NSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM5LDEzICsyMzks OCBAQCB2b2lkIFJlbmRlclRleHQ6OnN0eWxlRGlkQ2hhbmdlKFN0eWxlRGlmCiAKIHZvaWQgUmVu ZGVyVGV4dDo6cmVtb3ZlQW5kRGVzdHJveVRleHRCb3hlcygpCiB7Ci0gICAgaWYgKCFkb2N1bWVu dEJlaW5nRGVzdHJveWVkKCkpIHsKLSAgICAgICAgaWYgKGZpcnN0VGV4dEJveCgpKSB7Ci0gICAg ICAgICAgICBmb3IgKElubGluZVRleHRCb3gqIGJveCA9IGZpcnN0VGV4dEJveCgpOyBib3g7IGJv eCA9IGJveC0+bmV4dFRleHRCb3goKSkKLSAgICAgICAgICAgICAgICBib3gtPnJlbW92ZSgpOwot ICAgICAgICB9IGVsc2UgaWYgKHBhcmVudCgpKQotICAgICAgICAgICAgcGFyZW50KCktPmRpcnR5 TGluZXNGcm9tQ2hhbmdlZENoaWxkKHRoaXMpOwotICAgIH0KKyAgICBpZiAoIWRvY3VtZW50QmVp bmdEZXN0cm95ZWQoKSkKKyAgICAgICAgbV9saW5lQm94ZXMucmVtb3ZlQWxsRnJvbVBhcmVudCgq dGhpcyk7CiAgICAgbV9saW5lQm94ZXMuZGVsZXRlQWxsKCp0aGlzKTsKIH0KIApAQCAtMTEyNCw3 OSArMTExOSwxMiBAQCB2b2lkIFJlbmRlclRleHQ6OnNldFRleHRXaXRoT2Zmc2V0KGNvbnN0CiAg ICAgaWYgKCFmb3JjZSAmJiBtX3RleHQgPT0gdGV4dCkKICAgICAgICAgcmV0dXJuOwogCi0gICAg dW5zaWduZWQgb2xkTGVuID0gdGV4dExlbmd0aCgpOwotICAgIHVuc2lnbmVkIG5ld0xlbiA9IHRl eHQubGVuZ3RoKCk7Ci0gICAgaW50IGRlbHRhID0gbmV3TGVuIC0gb2xkTGVuOworICAgIGludCBk ZWx0YSA9IHRleHQubGVuZ3RoKCkgLSB0ZXh0TGVuZ3RoKCk7CiAgICAgdW5zaWduZWQgZW5kID0g bGVuID8gb2Zmc2V0ICsgbGVuIC0gMSA6IG9mZnNldDsKIAotICAgIFJvb3RJbmxpbmVCb3gqIGZp cnN0Um9vdEJveCA9IDA7Ci0gICAgUm9vdElubGluZUJveCogbGFzdFJvb3RCb3ggPSAwOwotCi0g ICAgYm9vbCBkaXJ0aWVkTGluZXMgPSBmYWxzZTsKLQotICAgIC8vIERpcnR5IGFsbCB0ZXh0IGJv eGVzIHRoYXQgaW5jbHVkZSBjaGFyYWN0ZXJzIGluIGJldHdlZW4gb2Zmc2V0IGFuZCBvZmZzZXQr bGVuLgotICAgIGZvciAoSW5saW5lVGV4dEJveCogY3VyciA9IGZpcnN0VGV4dEJveCgpOyBjdXJy OyBjdXJyID0gY3Vyci0+bmV4dFRleHRCb3goKSkgewotICAgICAgICAvLyBGSVhNRTogVGhpcyBz aG91bGRuJ3QgcmVseSBvbiB0aGUgZW5kIG9mIGEgZGlydHkgbGluZSBib3guIFNlZSBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyNjQKLSAgICAgICAgLy8gVGV4dCBy dW4gaXMgZW50aXJlbHkgYmVmb3JlIHRoZSBhZmZlY3RlZCByYW5nZS4KLSAgICAgICAgaWYgKGN1 cnItPmVuZCgpIDwgb2Zmc2V0KQotICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgLy8g VGV4dCBydW4gaXMgZW50aXJlbHkgYWZ0ZXIgdGhlIGFmZmVjdGVkIHJhbmdlLgotICAgICAgICBp ZiAoY3Vyci0+c3RhcnQoKSA+IGVuZCkgewotICAgICAgICAgICAgY3Vyci0+b2Zmc2V0UnVuKGRl bHRhKTsKLSAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gmIHJvb3RCb3ggPSBjdXJyLT5yb290KCk7 Ci0gICAgICAgICAgICBpZiAoIWZpcnN0Um9vdEJveCkgewotICAgICAgICAgICAgICAgIGZpcnN0 Um9vdEJveCA9ICZyb290Qm94OwotICAgICAgICAgICAgICAgIGlmICghZGlydGllZExpbmVzKSB7 Ci0gICAgICAgICAgICAgICAgICAgIC8vIFRoZSBhZmZlY3RlZCBhcmVhIHdhcyBpbiBiZXR3ZWVu IHR3byBydW5zLiBHbyBhaGVhZCBhbmQgbWFyayB0aGUgcm9vdCBib3ggb2YKLSAgICAgICAgICAg ICAgICAgICAgLy8gdGhlIHJ1biBhZnRlciB0aGUgYWZmZWN0ZWQgYXJlYSBhcyBkaXJ0eS4KLSAg ICAgICAgICAgICAgICAgICAgZmlyc3RSb290Qm94LT5tYXJrRGlydHkoKTsKLSAgICAgICAgICAg ICAgICAgICAgZGlydGllZExpbmVzID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBsYXN0Um9vdEJveCA9ICZyb290Qm94OwotICAgICAgICB9IGVs c2UgaWYgKGN1cnItPmVuZCgpID49IG9mZnNldCAmJiBjdXJyLT5lbmQoKSA8PSBlbmQpIHsKLSAg ICAgICAgICAgIC8vIFRleHQgcnVuIG92ZXJsYXBzIHdpdGggdGhlIGxlZnQgZW5kIG9mIHRoZSBh ZmZlY3RlZCByYW5nZS4KLSAgICAgICAgICAgIGN1cnItPmRpcnR5TGluZUJveGVzKCk7Ci0gICAg ICAgICAgICBkaXJ0aWVkTGluZXMgPSB0cnVlOwotICAgICAgICB9IGVsc2UgaWYgKGN1cnItPnN0 YXJ0KCkgPD0gb2Zmc2V0ICYmIGN1cnItPmVuZCgpID49IGVuZCkgewotICAgICAgICAgICAgLy8g VGV4dCBydW4gc3Vic3VtZXMgdGhlIGFmZmVjdGVkIHJhbmdlLgotICAgICAgICAgICAgY3Vyci0+ ZGlydHlMaW5lQm94ZXMoKTsKLSAgICAgICAgICAgIGRpcnRpZWRMaW5lcyA9IHRydWU7Ci0gICAg ICAgIH0gZWxzZSBpZiAoY3Vyci0+c3RhcnQoKSA8PSBlbmQgJiYgY3Vyci0+ZW5kKCkgPj0gZW5k KSB7Ci0gICAgICAgICAgICAvLyBUZXh0IHJ1biBvdmVybGFwcyB3aXRoIHJpZ2h0IGVuZCBvZiB0 aGUgYWZmZWN0ZWQgcmFuZ2UuCi0gICAgICAgICAgICBjdXJyLT5kaXJ0eUxpbmVCb3hlcygpOwot ICAgICAgICAgICAgZGlydGllZExpbmVzID0gdHJ1ZTsKLSAgICAgICAgfQotICAgIH0KLQotICAg IC8vIE5vdyB3ZSBoYXZlIHRvIHdhbGsgYWxsIG9mIHRoZSBjbGVhbiBsaW5lcyBhbmQgYWRqdXN0 IHRoZWlyIGNhY2hlZCBsaW5lIGJyZWFrIGluZm9ybWF0aW9uCi0gICAgLy8gdG8gcmVmbGVjdCBv dXIgdXBkYXRlZCBvZmZzZXRzLgotICAgIGlmIChsYXN0Um9vdEJveCkKLSAgICAgICAgbGFzdFJv b3RCb3ggPSBsYXN0Um9vdEJveC0+bmV4dFJvb3RCb3goKTsKLSAgICBpZiAoZmlyc3RSb290Qm94 KSB7Ci0gICAgICAgIFJvb3RJbmxpbmVCb3gqIHByZXYgPSBmaXJzdFJvb3RCb3gtPnByZXZSb290 Qm94KCk7Ci0gICAgICAgIGlmIChwcmV2KQotICAgICAgICAgICAgZmlyc3RSb290Qm94ID0gcHJl djsKLSAgICB9IGVsc2UgaWYgKGxhc3RUZXh0Qm94KCkpIHsKLSAgICAgICAgQVNTRVJUKCFsYXN0 Um9vdEJveCk7Ci0gICAgICAgIGZpcnN0Um9vdEJveCA9ICZsYXN0VGV4dEJveCgpLT5yb290KCk7 Ci0gICAgICAgIGZpcnN0Um9vdEJveC0+bWFya0RpcnR5KCk7Ci0gICAgICAgIGRpcnRpZWRMaW5l cyA9IHRydWU7Ci0gICAgfQotICAgIGZvciAoUm9vdElubGluZUJveCogY3VyciA9IGZpcnN0Um9v dEJveDsgY3VyciAmJiBjdXJyICE9IGxhc3RSb290Qm94OyBjdXJyID0gY3Vyci0+bmV4dFJvb3RC b3goKSkgewotICAgICAgICBpZiAoY3Vyci0+bGluZUJyZWFrT2JqKCkgPT0gdGhpcyAmJiBjdXJy LT5saW5lQnJlYWtQb3MoKSA+IGVuZCkKLSAgICAgICAgICAgIGN1cnItPnNldExpbmVCcmVha1Bv cyhjdXJyLT5saW5lQnJlYWtQb3MoKSArIGRlbHRhKTsKLSAgICB9Ci0KLSAgICAvLyBJZiB0aGUg dGV4dCBub2RlIGlzIGVtcHR5LCBkaXJ0eSB0aGUgbGluZSB3aGVyZSBuZXcgdGV4dCB3aWxsIGJl IGluc2VydGVkLgotICAgIGlmICghZmlyc3RUZXh0Qm94KCkgJiYgcGFyZW50KCkpIHsKLSAgICAg ICAgcGFyZW50KCktPmRpcnR5TGluZXNGcm9tQ2hhbmdlZENoaWxkKHRoaXMpOwotICAgICAgICBk aXJ0aWVkTGluZXMgPSB0cnVlOwotICAgIH0KKyAgICBtX2xpbmVzRGlydHkgPSBtX2xpbmVCb3hl cy5kaXJ0eVJhbmdlKCp0aGlzLCBvZmZzZXQsIGVuZCwgZGVsdGEpOwogCi0gICAgbV9saW5lc0Rp cnR5ID0gZGlydGllZExpbmVzOwotICAgIHNldFRleHQodGV4dCwgZm9yY2UgfHwgZGlydGllZExp bmVzKTsKKyAgICBzZXRUZXh0KHRleHQsIGZvcmNlIHx8IG1fbGluZXNEaXJ0eSk7CiB9CiAKIHZv aWQgUmVuZGVyVGV4dDo6dHJhbnNmb3JtVGV4dCgpCkBAIC0xMzM4LDEwICsxMjY2LDggQEAgdm9p ZCBSZW5kZXJUZXh0OjpkaXJ0eUxpbmVCb3hlcyhib29sIGZ1bAogewogICAgIGlmIChmdWxsTGF5 b3V0KQogICAgICAgICBtX2xpbmVCb3hlcy5kZWxldGVBbGwoKnRoaXMpOwotICAgIGVsc2UgaWYg KCFtX2xpbmVzRGlydHkpIHsKLSAgICAgICAgZm9yIChJbmxpbmVUZXh0Qm94KiBib3ggPSBmaXJz dFRleHRCb3goKTsgYm94OyBib3ggPSBib3gtPm5leHRUZXh0Qm94KCkpCi0gICAgICAgICAgICBi b3gtPmRpcnR5TGluZUJveGVzKCk7Ci0gICAgfQorICAgIGVsc2UgaWYgKCFtX2xpbmVzRGlydHkp CisgICAgICAgIG1fbGluZUJveGVzLmRpcnR5QWxsKCk7CiAgICAgbV9saW5lc0RpcnR5ID0gZmFs c2U7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0TGluZUJv eGVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dExpbmVCb3hlcy5jcHAJKHJldmlzaW9uIDE1NzM0NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUZXh0TGluZUJveGVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgs NyBAQAogCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveC5oIgogI2luY2x1ZGUgIlJlbmRlclN0eWxl LmgiCisjaW5jbHVkZSAiUm9vdElubGluZUJveC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTEwMyw2ICsxMDQsMTcgQEAgdm9pZCBSZW5kZXJUZXh0TGluZUJveGVzOjpyZW1vdmUoSW5s aW5lVAogICAgIGNoZWNrQ29uc2lzdGVuY3koKTsKIH0KIAordm9pZCBSZW5kZXJUZXh0TGluZUJv eGVzOjpyZW1vdmVBbGxGcm9tUGFyZW50KFJlbmRlclRleHQmIHJlbmRlcmVyKQoreworICAgIGlm ICghbV9maXJzdCkgeworICAgICAgICBpZiAocmVuZGVyZXIucGFyZW50KCkpCisgICAgICAgICAg ICByZW5kZXJlci5wYXJlbnQoKS0+ZGlydHlMaW5lc0Zyb21DaGFuZ2VkQ2hpbGQoJnJlbmRlcmVy KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICBmb3IgKGF1dG8gYm94ID0gbV9maXJzdDsg Ym94OyBib3ggPSBib3gtPm5leHRUZXh0Qm94KCkpCisgICAgICAgIGJveC0+cmVtb3ZlKCk7Cit9 CisKIHZvaWQgUmVuZGVyVGV4dExpbmVCb3hlczo6ZGVsZXRlQWxsKFJlbmRlclRleHQmIHJlbmRl cmVyKQogewogICAgIGlmICghbV9maXJzdCkKQEAgLTIxMiw2ICsyMjQsODcgQEAgaW50IFJlbmRl clRleHRMaW5lQm94ZXM6OmNhcmV0TWF4T2Zmc2V0KAogICAgIHJldHVybiBtYXhPZmZzZXQ7CiB9 CiAKK3ZvaWQgUmVuZGVyVGV4dExpbmVCb3hlczo6ZGlydHlBbGwoKQoreworICAgIGZvciAoYXV0 byBib3ggPSBtX2ZpcnN0OyBib3g7IGJveCA9IGJveC0+bmV4dFRleHRCb3goKSkKKyAgICAgICAg Ym94LT5kaXJ0eUxpbmVCb3hlcygpOworfQorCitib29sIFJlbmRlclRleHRMaW5lQm94ZXM6OmRp cnR5UmFuZ2UoUmVuZGVyVGV4dCYgcmVuZGVyZXIsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBl bmQsIGludCBsZW5ndGhEZWx0YSkKK3sKKyAgICBSb290SW5saW5lQm94KiBmaXJzdFJvb3RCb3gg PSBudWxscHRyOworICAgIFJvb3RJbmxpbmVCb3gqIGxhc3RSb290Qm94ID0gbnVsbHB0cjsKKwor ICAgIC8vIERpcnR5IGFsbCB0ZXh0IGJveGVzIHRoYXQgaW5jbHVkZSBjaGFyYWN0ZXJzIGluIGJl dHdlZW4gb2Zmc2V0IGFuZCBvZmZzZXQrbGVuLgorICAgIGJvb2wgZGlydGllZExpbmVzID0gZmFs c2U7CisgICAgZm9yIChhdXRvIGN1cnJlbnQgPSBtX2ZpcnN0OyBjdXJyZW50OyBjdXJyZW50ID0g Y3VycmVudC0+bmV4dFRleHRCb3goKSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBzaG91bGRu J3QgcmVseSBvbiB0aGUgZW5kIG9mIGEgZGlydHkgbGluZSBib3guIFNlZSBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyNjQKKyAgICAgICAgLy8gVGV4dCBydW4gaXMg ZW50aXJlbHkgYmVmb3JlIHRoZSBhZmZlY3RlZCByYW5nZS4KKyAgICAgICAgaWYgKGN1cnJlbnQt PmVuZCgpIDwgc3RhcnQpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgLy8gVGV4dCBy dW4gaXMgZW50aXJlbHkgYWZ0ZXIgdGhlIGFmZmVjdGVkIHJhbmdlLgorICAgICAgICBpZiAoY3Vy cmVudC0+c3RhcnQoKSA+IGVuZCkgeworICAgICAgICAgICAgY3VycmVudC0+b2Zmc2V0UnVuKGxl bmd0aERlbHRhKTsKKyAgICAgICAgICAgIGF1dG8mIHJvb3RCb3ggPSBjdXJyZW50LT5yb290KCk7 CisgICAgICAgICAgICBpZiAoIWZpcnN0Um9vdEJveCkgeworICAgICAgICAgICAgICAgIGZpcnN0 Um9vdEJveCA9ICZyb290Qm94OworICAgICAgICAgICAgICAgIGlmICghZGlydGllZExpbmVzKSB7 CisgICAgICAgICAgICAgICAgICAgIC8vIFRoZSBhZmZlY3RlZCBhcmVhIHdhcyBpbiBiZXR3ZWVu IHR3byBydW5zLiBHbyBhaGVhZCBhbmQgbWFyayB0aGUgcm9vdCBib3ggb2YKKyAgICAgICAgICAg ICAgICAgICAgLy8gdGhlIHJ1biBhZnRlciB0aGUgYWZmZWN0ZWQgYXJlYSBhcyBkaXJ0eS4KKyAg ICAgICAgICAgICAgICAgICAgZmlyc3RSb290Qm94LT5tYXJrRGlydHkoKTsKKyAgICAgICAgICAg ICAgICAgICAgZGlydGllZExpbmVzID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBsYXN0Um9vdEJveCA9ICZyb290Qm94OworICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGN1cnJlbnQtPmVuZCgpID49IHN0YXJ0 ICYmIGN1cnJlbnQtPmVuZCgpIDw9IGVuZCkgeworICAgICAgICAgICAgLy8gVGV4dCBydW4gb3Zl cmxhcHMgd2l0aCB0aGUgbGVmdCBlbmQgb2YgdGhlIGFmZmVjdGVkIHJhbmdlLgorICAgICAgICAg ICAgY3VycmVudC0+ZGlydHlMaW5lQm94ZXMoKTsKKyAgICAgICAgICAgIGRpcnRpZWRMaW5lcyA9 IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBpZiAoY3Vy cmVudC0+c3RhcnQoKSA8PSBzdGFydCAmJiBjdXJyZW50LT5lbmQoKSA+PSBlbmQpIHsKKyAgICAg ICAgICAgIC8vIFRleHQgcnVuIHN1YnN1bWVzIHRoZSBhZmZlY3RlZCByYW5nZS4KKyAgICAgICAg ICAgIGN1cnJlbnQtPmRpcnR5TGluZUJveGVzKCk7CisgICAgICAgICAgICBkaXJ0aWVkTGluZXMg PSB0cnVlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICAgICAgaWYgKGN1 cnJlbnQtPnN0YXJ0KCkgPD0gZW5kICYmIGN1cnJlbnQtPmVuZCgpID49IGVuZCkgeworICAgICAg ICAgICAgLy8gVGV4dCBydW4gb3ZlcmxhcHMgd2l0aCByaWdodCBlbmQgb2YgdGhlIGFmZmVjdGVk IHJhbmdlLgorICAgICAgICAgICAgY3VycmVudC0+ZGlydHlMaW5lQm94ZXMoKTsKKyAgICAgICAg ICAgIGRpcnRpZWRMaW5lcyA9IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQorICAgIH0KKworICAgIC8vIE5vdyB3ZSBoYXZlIHRvIHdhbGsgYWxsIG9mIHRoZSBjbGVhbiBs aW5lcyBhbmQgYWRqdXN0IHRoZWlyIGNhY2hlZCBsaW5lIGJyZWFrIGluZm9ybWF0aW9uCisgICAg Ly8gdG8gcmVmbGVjdCBvdXIgdXBkYXRlZCBvZmZzZXRzLgorICAgIGlmIChsYXN0Um9vdEJveCkK KyAgICAgICAgbGFzdFJvb3RCb3ggPSBsYXN0Um9vdEJveC0+bmV4dFJvb3RCb3goKTsKKyAgICBp ZiAoZmlyc3RSb290Qm94KSB7CisgICAgICAgIGF1dG8gcHJldmlvdXNSb290Qm94ID0gZmlyc3RS b290Qm94LT5wcmV2Um9vdEJveCgpOworICAgICAgICBpZiAocHJldmlvdXNSb290Qm94KQorICAg ICAgICAgICAgZmlyc3RSb290Qm94ID0gcHJldmlvdXNSb290Qm94OworICAgIH0gZWxzZSBpZiAo bV9sYXN0KSB7CisgICAgICAgIEFTU0VSVCghbGFzdFJvb3RCb3gpOworICAgICAgICBmaXJzdFJv b3RCb3ggPSAmbV9sYXN0LT5yb290KCk7CisgICAgICAgIGZpcnN0Um9vdEJveC0+bWFya0RpcnR5 KCk7CisgICAgICAgIGRpcnRpZWRMaW5lcyA9IHRydWU7CisgICAgfQorICAgIGZvciAoYXV0byBj dXJyZW50ID0gZmlyc3RSb290Qm94OyBjdXJyZW50ICYmIGN1cnJlbnQgIT0gbGFzdFJvb3RCb3g7 IGN1cnJlbnQgPSBjdXJyZW50LT5uZXh0Um9vdEJveCgpKSB7CisgICAgICAgIGlmIChjdXJyZW50 LT5saW5lQnJlYWtPYmooKSA9PSAmcmVuZGVyZXIgJiYgY3VycmVudC0+bGluZUJyZWFrUG9zKCkg PiBlbmQpCisgICAgICAgICAgICBjdXJyZW50LT5zZXRMaW5lQnJlYWtQb3MoY3VycmVudC0+bGlu ZUJyZWFrUG9zKCkgKyBsZW5ndGhEZWx0YSk7CisgICAgfQorICAgIAorICAgIC8vIElmIHRoZSB0 ZXh0IG5vZGUgaXMgZW1wdHksIGRpcnR5IHRoZSBsaW5lIHdoZXJlIG5ldyB0ZXh0IHdpbGwgYmUg aW5zZXJ0ZWQuCisgICAgaWYgKCFtX2ZpcnN0ICYmIHJlbmRlcmVyLnBhcmVudCgpKSB7CisgICAg ICAgIHJlbmRlcmVyLnBhcmVudCgpLT5kaXJ0eUxpbmVzRnJvbUNoYW5nZWRDaGlsZCgmcmVuZGVy ZXIpOworICAgICAgICBkaXJ0aWVkTGluZXMgPSB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZGly dGllZExpbmVzOworfQorCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogUmVuZGVyVGV4dExpbmVCb3hl czo6flJlbmRlclRleHRMaW5lQm94ZXMoKQogewpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRMaW5lQm94ZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5oCShyZXZpc2lvbiAxNTczNDUpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dExpbmVCb3hlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC00Nyw2ICs0Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGF0dGFjaChJbmxpbmVUZXh0Qm94 Jik7CiAgICAgdm9pZCByZW1vdmUoSW5saW5lVGV4dEJveCYpOwogCisgICAgdm9pZCByZW1vdmVB bGxGcm9tUGFyZW50KFJlbmRlclRleHQmKTsKICAgICB2b2lkIGRlbGV0ZUFsbChSZW5kZXJUZXh0 Jik7CiAKICAgICBJbmxpbmVUZXh0Qm94KiBmaW5kTmV4dChpbnQgb2Zmc2V0LCBpbnQmIHBvc2l0 aW9uKSBjb25zdDsKQEAgLTU4LDYgKzU5LDkgQEAgcHVibGljOgogICAgIEludFJlY3QgYm91bmRp bmdCb3goY29uc3QgUmVuZGVyVGV4dCYpIGNvbnN0OwogICAgIExheW91dFJlY3QgdmlzdWFsT3Zl cmZsb3dCb3VuZGluZ0JveChjb25zdCBSZW5kZXJUZXh0JikgY29uc3Q7CiAKKyAgICB2b2lkIGRp cnR5QWxsKCk7CisgICAgYm9vbCBkaXJ0eVJhbmdlKFJlbmRlclRleHQmLCB1bnNpZ25lZCBzdGFy dCwgdW5zaWduZWQgZW5kLCBpbnQgbGVuZ3RoRGVsdGEpOworCiAjaWYgIUFTU0VSVF9ESVNBQkxF RAogICAgIH5SZW5kZXJUZXh0TGluZUJveGVzKCk7CiAjZW5kaWYK