169049 2017-03-01 11:39:55 -0800 Rename recalcStyle to resolveStyle and clean up the signature 2017-03-01 23:01:55 -0800 1 1 1 Unclassified WebKit DOM WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned achristensen cdumez commit-queue dbates esprehn+autocc japhet kangil.han oldest_to_newest 1282365 0 koivisto 2017-03-01 11:39:55 -0800 Make naming more consistent and replace an overly generic enum parameter. 1282389 1 303097 koivisto 2017-03-01 12:47:14 -0800 Created attachment 303097 patch 1282394 2 commit-queue 2017-03-01 12:49:27 -0800 Attachment 303097 did not pass style-queue: ERROR: Source/WebCore/dom/Document.cpp:5042: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1282594 3 303097 sam 2017-03-01 20:11:53 -0800 Comment on attachment 303097 patch rs = me 1282629 4 koivisto 2017-03-01 22:18:35 -0800 https://trac.webkit.org/changeset/213266 1282643 5 achristensen 2017-03-01 23:01:55 -0800 r213268 303097 2017-03-01 12:47:14 -0800 2017-03-01 20:11:53 -0800 patch stylerecalc-rename.patch text/plain 11831 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzIzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE3LTAzLTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgcmVjYWxjU3R5bGUg dG8gcmVzb2x2ZVN0eWxlIGFuZCBjbGVhbiB1cCB0aGUgc2lnbmF0dXJlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkwNDkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHRvIG1vZGVybiBuYW1pbmcu CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnJlc29sdmVTdHlsZSk6CisKKyAgICAgICAgICAgIE9ubHkgdHdvIG9mIHRoZSBwb3NzaWJs ZSB2YWx1ZXMgYXJlIHVzZWQgc28gcGFzcyBpbiBhIHR3by12YWx1ZSBlbnVtLgorCisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6dXBkYXRlU3R5bGVJZk5lZWRlZCk6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzKToKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpjcmVhdGVSZW5kZXJUcmVlKToKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OndlYmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50OjpyZWNhbGNTdHlsZSk6IERlbGV0ZWQuCisgICAgICAgICogZG9tL0Rv Y3VtZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yT3ZlcmxheTo6dXBkYXRlKToKKyAgICAgICAgKiBsb2Fk ZXIvRG9jdW1lbnRXcml0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRXcml0ZXI6 OnJlcG9ydERhdGFSZWNlaXZlZCk6CisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpGcmFtZTo6c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyk6CisgICAgICAgICog cGFnZS9QYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6OnNldFBhZ2VTY2FsZUZhY3Rv cik6CisgICAgICAgICogc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6UGFyZW50OjpQYXJlbnQpOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGU6OlRyZWVSZXNvbHZlcjo6cmVzb2x2ZSk6CisKKyAgICAgICAgICAgIFJlbW92 ZSB0aGUgYXJndW1lbnQsIERvY3VtZW50IGludmFsaWRhdGVzIHRoZSBkb2N1bWVudCBlbGVtZW50 IGlmIGV2ZXJ5dGhpbmcgbmVlZHMgdG8gYmUgcmUtcmVzb2x2ZWQuCisKKyAgICAgICAgKiBzdHls ZS9TdHlsZVRyZWVSZXNvbHZlci5oOgorCiAyMDE3LTAzLTAxICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9uJ3QgY2FsbCBsaWJ3ZWJydGMg ZnVuY3Rpb25zIGlmIGxpYndlYnJ0Yy5keWxpYiBkb2Vzbid0IGV4aXN0IHdoaWxlIHRlc3RpbmcK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjEzMjI0KQorKysgU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTczNyw3ICsxNzM3 LDcgQEAgYm9vbCBEb2N1bWVudDo6aGFzUGVuZGluZ0ZvcmNlZFN0eWxlUmVjYQogICAgIHJldHVy biBtX3N0eWxlUmVjYWxjVGltZXIuaXNBY3RpdmUoKSAmJiBtX3BlbmRpbmdTdHlsZVJlY2FsY1No b3VsZEZvcmNlOwogfQogCi12b2lkIERvY3VtZW50OjpyZWNhbGNTdHlsZShTdHlsZTo6Q2hhbmdl IGNoYW5nZSkKK3ZvaWQgRG9jdW1lbnQ6OnJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGVUeXBlIHR5 cGUpCiB7CiAgICAgQVNTRVJUKCF2aWV3KCkgfHwgIXZpZXcoKS0+aXNQYWludGluZygpKTsKIApA QCAtMTc3OCw5ICsxNzc4LDkgQEAgdm9pZCBEb2N1bWVudDo6cmVjYWxjU3R5bGUoU3R5bGU6OkNo YW5nZQogICAgICAgICBXaWRnZXRIaWVyYXJjaHlVcGRhdGVzU3VzcGVuc2lvblNjb3BlIHN1c3Bl bmRXaWRnZXRIaWVyYXJjaHlVcGRhdGVzOwogCiAgICAgICAgIGlmIChtX3BlbmRpbmdTdHlsZVJl Y2FsY1Nob3VsZEZvcmNlKQotICAgICAgICAgICAgY2hhbmdlID0gU3R5bGU6OkZvcmNlOworICAg ICAgICAgICAgdHlwZSA9IFJlc29sdmVTdHlsZVR5cGU6OlJlYnVpbGQ7CiAKLSAgICAgICAgaWYg KGNoYW5nZSA9PSBTdHlsZTo6Rm9yY2UpIHsKKyAgICAgICAgaWYgKHR5cGUgPT0gUmVzb2x2ZVN0 eWxlVHlwZTo6UmVidWlsZCkgewogICAgICAgICAgICAgLy8gVGhpcyBtYXkgZ2V0IHNldCBhZ2Fp biBkdXJpbmcgc3R5bGUgcmVzb2x2ZS4KICAgICAgICAgICAgIG1faGFzTm9kZXNXaXRoUGxhY2Vo b2xkZXJTdHlsZSA9IGZhbHNlOwogCkBAIC0xNzk0LDEwICsxNzk0LDEzIEBAIHZvaWQgRG9jdW1l bnQ6OnJlY2FsY1N0eWxlKFN0eWxlOjpDaGFuZ2UKICAgICAgICAgICAgIGF1dG8gZG9jdW1lbnRD aGFuZ2UgPSBTdHlsZTo6ZGV0ZXJtaW5lQ2hhbmdlKGRvY3VtZW50U3R5bGUsIG1fcmVuZGVyVmll dy0+c3R5bGUoKSk7CiAgICAgICAgICAgICBpZiAoZG9jdW1lbnRDaGFuZ2UgIT0gU3R5bGU6Ok5v Q2hhbmdlKQogICAgICAgICAgICAgICAgIHJlbmRlclZpZXcoKS0+c2V0U3R5bGUoV1RGTW92ZShk b2N1bWVudFN0eWxlKSk7CisKKyAgICAgICAgICAgIGlmIChhdXRvKiBkb2N1bWVudEVsZW1lbnQg PSB0aGlzLT5kb2N1bWVudEVsZW1lbnQoKSkKKyAgICAgICAgICAgICAgICBkb2N1bWVudEVsZW1l bnQtPmludmFsaWRhdGVTdHlsZUZvclN1YnRyZWUoKTsKICAgICAgICAgfQogCiAgICAgICAgIFN0 eWxlOjpUcmVlUmVzb2x2ZXIgcmVzb2x2ZXIoKnRoaXMpOwotICAgICAgICBhdXRvIHN0eWxlVXBk YXRlID0gcmVzb2x2ZXIucmVzb2x2ZShjaGFuZ2UpOworICAgICAgICBhdXRvIHN0eWxlVXBkYXRl ID0gcmVzb2x2ZXIucmVzb2x2ZSgpOwogCiAgICAgICAgIG1fbGFzdFN0eWxlVXBkYXRlU2l6ZUZv clRlc3RpbmcgPSBzdHlsZVVwZGF0ZSA/IHN0eWxlVXBkYXRlLT5zaXplKCkgOiAwOwogCkBAIC0x ODY3LDcgKzE4NzAsNyBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVTdHlsZUlmTmVlZGVkKCkKICAg ICBpZiAoIW5lZWRzU3R5bGVSZWNhbGMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgcmVjYWxj U3R5bGUoKTsKKyAgICByZXNvbHZlU3R5bGUoKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6dXBkYXRl TGF5b3V0KCkKQEAgLTE5MTcsMTIgKzE5MjAsMTIgQEAgdm9pZCBEb2N1bWVudDo6dXBkYXRlTGF5 b3V0SWdub3JlUGVuZGluZwogICAgICAgICBpZiAoYm9keUVsZW1lbnQgJiYgIWJvZHlFbGVtZW50 LT5yZW5kZXJlcigpICYmIG1fcGVuZGluZ1NoZWV0TGF5b3V0ID09IE5vTGF5b3V0V2l0aFBlbmRp bmdTaGVldHMpIHsKICAgICAgICAgICAgIG1fcGVuZGluZ1NoZWV0TGF5b3V0ID0gRGlkTGF5b3V0 V2l0aFBlbmRpbmdTaGVldHM7CiAgICAgICAgICAgICBzdHlsZVNjb3BlKCkuZGlkQ2hhbmdlQWN0 aXZlU3R5bGVTaGVldENhbmRpZGF0ZXMoKTsKLSAgICAgICAgICAgIHJlY2FsY1N0eWxlKFN0eWxl OjpGb3JjZSk7CisgICAgICAgICAgICByZXNvbHZlU3R5bGUoUmVzb2x2ZVN0eWxlVHlwZTo6UmVi dWlsZCk7CiAgICAgICAgIH0gZWxzZSBpZiAobV9oYXNOb2Rlc1dpdGhQbGFjZWhvbGRlclN0eWxl KQogICAgICAgICAgICAgLy8gSWYgbmV3IG5vZGVzIGhhdmUgYmVlbiBhZGRlZCBvciBzdHlsZSBy ZWNhbGMgaGFzIGJlZW4gZG9uZSB3aXRoIHN0eWxlIHNoZWV0cyBzdGlsbCBwZW5kaW5nLCBzb21l IG5vZGVzIAogICAgICAgICAgICAgLy8gbWF5IG5vdCBoYXZlIGhhZCB0aGVpciByZWFsIHN0eWxl IGNhbGN1bGF0ZWQgeWV0LiBOb3JtYWxseSB0aGlzIGdldHMgY2xlYW5lZCB3aGVuIHN0eWxlIHNo ZWV0cyBhcnJpdmUgCiAgICAgICAgICAgICAvLyBidXQgaGVyZSB3ZSBuZWVkIHVwLXRvLWRhdGUg c3R5bGUgaW1tZWRpYXRlbHkuCi0gICAgICAgICAgICByZWNhbGNTdHlsZShTdHlsZTo6Rm9yY2Up OworICAgICAgICAgICAgcmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGU6OlJlYnVpbGQpOwog ICAgIH0KIAogICAgIHVwZGF0ZUxheW91dCgpOwpAQCAtMjEzNSw3ICsyMTM4LDcgQEAgdm9pZCBE b2N1bWVudDo6Y3JlYXRlUmVuZGVyVHJlZSgpCiAKICAgICByZW5kZXJWaWV3KCktPnNldElzSW5X aW5kb3codHJ1ZSk7CiAKLSAgICByZWNhbGNTdHlsZShTdHlsZTo6Rm9yY2UpOworICAgIHJlc29s dmVTdHlsZShSZXNvbHZlU3R5bGVUeXBlOjpSZWJ1aWxkKTsKIH0KIAogdm9pZCBEb2N1bWVudDo6 ZGlkQmVjb21lQ3VycmVudERvY3VtZW50SW5GcmFtZSgpCkBAIC01MDM2LDcgKzUwMzksNyBAQCB2 b2lkIERvY3VtZW50OjpmaW5pc2hlZFBhcnNpbmcoKQogICAgIGlmIChSZWZQdHI8RnJhbWU+IGYg PSBmcmFtZSgpKSB7CiAgICAgICAgIC8vIEZyYW1lTG9hZGVyOjpmaW5pc2hlZFBhcnNpbmcoKSBt aWdodCBlbmQgdXAgY2FsbGluZyBEb2N1bWVudDo6aW1wbGljaXRDbG9zZSgpIGlmIGFsbAogICAg ICAgICAvLyByZXNvdXJjZSBsb2FkcyBhcmUgY29tcGxldGUuIEhUTUxPYmplY3RFbGVtZW50cyBj YW4gc3RhcnQgbG9hZGluZyB0aGVpciByZXNvdXJjZXMgZnJvbQotICAgICAgICAvLyBwb3N0IGF0 dGFjaCBjYWxsYmFja3MgdHJpZ2dlcmVkIGJ5IHJlY2FsY1N0eWxlKCkuICBUaGlzIG1lYW5zIGlm IHdlIHBhcnNlIG91dCBhbiA8b2JqZWN0PgorICAgICAgICAvLyBwb3N0IGF0dGFjaCBjYWxsYmFj a3MgdHJpZ2dlcmVkIGJ5IHJlc29sdmVTdHlsZSgpLiAgVGhpcyBtZWFucyBpZiB3ZSBwYXJzZSBv dXQgYW4gPG9iamVjdD4KICAgICAgICAgLy8gdGFnIGFuZCB0aGVuIHJlYWNoIHRoZSBlbmQgb2Yg dGhlIGRvY3VtZW50IHdpdGhvdXQgdXBkYXRpbmcgc3R5bGVzLCB3ZSBtaWdodCBub3QgaGF2ZSB5 ZXQKICAgICAgICAgLy8gc3RhcnRlZCB0aGUgcmVzb3VyY2UgbG9hZCBhbmQgbWlnaHQgZmlyZSB0 aGUgd2luZG93IGxvYWQgZXZlbnQgdG9vIGVhcmx5LiAgVG8gYXZvaWQgdGhpcwogICAgICAgICAv LyB3ZSBmb3JjZSB0aGUgc3R5bGVzIHRvIGJlIHVwIHRvIGRhdGUgYmVmb3JlIGNhbGxpbmcgRnJh bWVMb2FkZXI6OmZpbmlzaGVkUGFyc2luZygpLgpAQCAtNTgyMCw3ICs1ODIzLDcgQEAgdm9pZCBE b2N1bWVudDo6d2Via2l0V2lsbEVudGVyRnVsbFNjcmVlbgogCiAgICAgbV9mdWxsU2NyZWVuRWxl bWVudC0+c2V0Q29udGFpbnNGdWxsU2NyZWVuRWxlbWVudE9uQW5jZXN0b3JzQ3Jvc3NpbmdGcmFt ZUJvdW5kYXJpZXModHJ1ZSk7CiAKLSAgICByZWNhbGNTdHlsZShTdHlsZTo6Rm9yY2UpOworICAg IHJlc29sdmVTdHlsZShSZXNvbHZlU3R5bGVUeXBlOjpSZWJ1aWxkKTsKIH0KIAogdm9pZCBEb2N1 bWVudDo6d2Via2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KikKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5oCShyZXZpc2lvbiAyMTMyMjQpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUg IlJlbmRlclB0ci5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCIKICNpbmNs dWRlICJTdHJpbmdXaXRoRGlyZWN0aW9uLmgiCi0jaW5jbHVkZSAiU3R5bGVDaGFuZ2UuaCIKICNp bmNsdWRlICJTdXBwbGVtZW50YWJsZS5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJjZURlY29kZXIu aCIKICNpbmNsdWRlICJUaW1lci5oIgpAQCAtNTIxLDcgKzUyMCw4IEBAIHB1YmxpYzoKICAgICBX RUJDT1JFX0VYUE9SVCBSZWY8Q1NTU3R5bGVEZWNsYXJhdGlvbj4gY3JlYXRlQ1NTU3R5bGVEZWNs YXJhdGlvbigpOwogICAgIFJlZjxUZXh0PiBjcmVhdGVFZGl0aW5nVGV4dE5vZGUoY29uc3QgU3Ry aW5nJik7CiAKLSAgICB2b2lkIHJlY2FsY1N0eWxlKFN0eWxlOjpDaGFuZ2UgPSBTdHlsZTo6Tm9D aGFuZ2UpOworICAgIGVudW0gY2xhc3MgUmVzb2x2ZVN0eWxlVHlwZSB7IE5vcm1hbCwgUmVidWls ZCB9OworICAgIHZvaWQgcmVzb2x2ZVN0eWxlKFJlc29sdmVTdHlsZVR5cGUgPSBSZXNvbHZlU3R5 bGVUeXBlOjpOb3JtYWwpOwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgdXBkYXRlU3R5bGVJZk5l ZWRlZCgpOwogICAgIGJvb2wgbmVlZHNTdHlsZVJlY2FsYygpIGNvbnN0OwogICAgIHVuc2lnbmVk IGxhc3RTdHlsZVVwZGF0ZVNpemVGb3JUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gbV9sYXN0U3R5 bGVVcGRhdGVTaXplRm9yVGVzdGluZzsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAkocmV2aXNpb24gMjEzMjI0KQorKysgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJsYXkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z NDIsNyArMzQyLDcgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQogICAgIGRyYXdQ YWludFJlY3RzKCk7CiAKICAgICAvLyBQb3NpdGlvbiBET00gZWxlbWVudHMuCi0gICAgb3Zlcmxh eVBhZ2UoKS0+bWFpbkZyYW1lKCkuZG9jdW1lbnQoKS0+cmVjYWxjU3R5bGUoU3R5bGU6OkZvcmNl KTsKKyAgICBvdmVybGF5UGFnZSgpLT5tYWluRnJhbWUoKS5kb2N1bWVudCgpLT5yZXNvbHZlU3R5 bGUoRG9jdW1lbnQ6OlJlc29sdmVTdHlsZVR5cGU6OlJlYnVpbGQpOwogICAgIGlmIChvdmVybGF5 Vmlldy0+bmVlZHNMYXlvdXQoKSkKICAgICAgICAgb3ZlcmxheVZpZXctPmxheW91dCgpOwogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAJKHJldmlzaW9uIDIx MzIyNCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIzNiw3ICsyMzYsNyBAQCB2b2lkIERvY3VtZW50V3JpdGVyOjpyZXBvcnRE YXRhUmVjZWl2ZWQoCiAgICAgbV9oYXNSZWNlaXZlZFNvbWVEYXRhID0gdHJ1ZTsKICAgICBpZiAo bV9kZWNvZGVyLT5lbmNvZGluZygpLnVzZXNWaXN1YWxPcmRlcmluZygpKQogICAgICAgICBtX2Zy YW1lLT5kb2N1bWVudCgpLT5zZXRWaXN1YWxseU9yZGVyZWQoKTsKLSAgICBtX2ZyYW1lLT5kb2N1 bWVudCgpLT5yZWNhbGNTdHlsZShTdHlsZTo6Rm9yY2UpOworICAgIG1fZnJhbWUtPmRvY3VtZW50 KCktPnJlc29sdmVTdHlsZShEb2N1bWVudDo6UmVzb2x2ZVN0eWxlVHlwZTo6UmVidWlsZCk7CiB9 CiAKIHZvaWQgRG9jdW1lbnRXcml0ZXI6OmFkZERhdGEoY29uc3QgY2hhciogYnl0ZXMsIHNpemVf dCBsZW5ndGgpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gMjEzMjI0KQorKysg U291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTk3OSw3ICs5 NzksNyBAQCB2b2lkIEZyYW1lOjpzZXRQYWdlQW5kVGV4dFpvb21GYWN0b3JzKGZsCiAgICAgbV9w YWdlWm9vbUZhY3RvciA9IHBhZ2Vab29tRmFjdG9yOwogICAgIG1fdGV4dFpvb21GYWN0b3IgPSB0 ZXh0Wm9vbUZhY3RvcjsKIAotICAgIGRvY3VtZW50LT5yZWNhbGNTdHlsZShTdHlsZTo6Rm9yY2Up OworICAgIGRvY3VtZW50LT5yZXNvbHZlU3R5bGUoRG9jdW1lbnQ6OlJlc29sdmVTdHlsZVR5cGU6 OlJlYnVpbGQpOwogCiAgICAgZm9yIChSZWZQdHI8RnJhbWU+IGNoaWxkID0gdHJlZSgpLmZpcnN0 Q2hpbGQoKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPnRyZWUoKS5uZXh0U2libGluZygpKQogICAg ICAgICBjaGlsZC0+c2V0UGFnZUFuZFRleHRab29tRmFjdG9ycyhtX3BhZ2Vab29tRmFjdG9yLCBt X3RleHRab29tRmFjdG9yKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkocmV2aXNpb24gMjEzMjI0 KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODU4 LDcgKzg1OCw3IEBAIHZvaWQgUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWwKICAg ICAgICAgaWYgKGRvY3VtZW50LT5yZW5kZXJWaWV3KCkpCiAgICAgICAgICAgICBkb2N1bWVudC0+ cmVuZGVyVmlldygpLT5zZXROZWVkc0xheW91dCgpOwogCi0gICAgICAgIGRvY3VtZW50LT5yZWNh bGNTdHlsZShTdHlsZTo6Rm9yY2UpOworICAgICAgICBkb2N1bWVudC0+cmVzb2x2ZVN0eWxlKERv Y3VtZW50OjpSZXNvbHZlU3R5bGVUeXBlOjpSZWJ1aWxkKTsKIAogICAgICAgICAvLyBUcmFuc2Zv cm0gY2hhbmdlIG9uIFJlbmRlclZpZXcgZG9lc24ndCB0cmlnZ2VyIHJlcGFpbnQgb24gbm9uLWNv bXBvc2l0ZWQgY29udGVudHMuCiAgICAgICAgIG1haW5GcmFtZSgpLnZpZXcoKS0+aW52YWxpZGF0 ZVJlY3QoSW50UmVjdChMYXlvdXRSZWN0OjppbmZpbml0ZVJlY3QoKSkpOwpJbmRleDogU291cmNl L1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N0eWxlL1N0eWxlVHJlZVJlc29sdmVyLmNwcAkocmV2aXNpb24gMjEzMjI0KQor KysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC05MiwxMCArOTIsOSBAQCBUcmVlUmVzb2x2ZXI6OlNjb3BlOjpTY29wZShTaGFkb3dS b290JiBzCiB7CiB9CiAKLVRyZWVSZXNvbHZlcjo6UGFyZW50OjpQYXJlbnQoRG9jdW1lbnQmIGRv Y3VtZW50LCBDaGFuZ2UgY2hhbmdlKQorVHJlZVJlc29sdmVyOjpQYXJlbnQ6OlBhcmVudChEb2N1 bWVudCYgZG9jdW1lbnQpCiAgICAgOiBlbGVtZW50KG51bGxwdHIpCiAgICAgLCBzdHlsZSgqZG9j dW1lbnQucmVuZGVyU3R5bGUoKSkKLSAgICAsIGNoYW5nZShjaGFuZ2UpCiB7CiB9CiAKQEAgLTQ1 Miw3ICs0NTEsNyBAQCB2b2lkIFRyZWVSZXNvbHZlcjo6cmVzb2x2ZUNvbXBvc2VkVHJlZSgpCiAg ICAgcG9wUGFyZW50c1RvRGVwdGgoMSk7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxVcGRhdGU+IFRy ZWVSZXNvbHZlcjo6cmVzb2x2ZShDaGFuZ2UgY2hhbmdlKQorc3RkOjp1bmlxdWVfcHRyPFVwZGF0 ZT4gVHJlZVJlc29sdmVyOjpyZXNvbHZlKCkKIHsKICAgICBhdXRvJiByZW5kZXJWaWV3ID0gKm1f ZG9jdW1lbnQucmVuZGVyVmlldygpOwogCkBAIC00NjEsMTIgKzQ2MCwxMiBAQCBzdGQ6OnVuaXF1 ZV9wdHI8VXBkYXRlPiBUcmVlUmVzb2x2ZXI6OnJlCiAgICAgICAgIG1fZG9jdW1lbnQuc3R5bGVT Y29wZSgpLnJlc29sdmVyKCk7CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KLSAgICBp ZiAoY2hhbmdlICE9IEZvcmNlICYmICFkb2N1bWVudEVsZW1lbnQtPmNoaWxkTmVlZHNTdHlsZVJl Y2FsYygpICYmICFkb2N1bWVudEVsZW1lbnQtPm5lZWRzU3R5bGVSZWNhbGMoKSkKKyAgICBpZiAo IWRvY3VtZW50RWxlbWVudC0+Y2hpbGROZWVkc1N0eWxlUmVjYWxjKCkgJiYgIWRvY3VtZW50RWxl bWVudC0+bmVlZHNTdHlsZVJlY2FsYygpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAg IG1fdXBkYXRlID0gc3RkOjptYWtlX3VuaXF1ZTxVcGRhdGU+KG1fZG9jdW1lbnQpOwogICAgIG1f c2NvcGVTdGFjay5hcHBlbmQoYWRvcHRSZWYoKm5ldyBTY29wZShtX2RvY3VtZW50KSkpOwotICAg IG1fcGFyZW50U3RhY2suYXBwZW5kKFBhcmVudChtX2RvY3VtZW50LCBjaGFuZ2UpKTsKKyAgICBt X3BhcmVudFN0YWNrLmFwcGVuZChQYXJlbnQobV9kb2N1bWVudCkpOwogCiAgICAgLy8gUHNldWRv IGVsZW1lbnQgcmVtb3ZhbCBhbmQgc2ltaWxhciBtYXkgb25seSB3b3JrIHdpdGggdGhlc2UgZmxh Z3Mgc3RpbGwgc2V0LiBSZXNldCB0aGVtIGFmdGVyIHRoZSBzdHlsZSByZWNhbGMuCiAgICAgcmVu ZGVyVmlldy5zZXRVc2VzRmlyc3RMaW5lUnVsZXMocmVuZGVyVmlldy51c2VzRmlyc3RMaW5lUnVs ZXMoKSB8fCBzY29wZSgpLnN0eWxlUmVzb2x2ZXIudXNlc0ZpcnN0TGluZVJ1bGVzKCkpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVUcmVlUmVzb2x2ZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCShyZXZpc2lvbiAyMTMy MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVRyZWVSZXNvbHZlci5oCSh3b3JraW5n IGNvcHkpCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKICAgICBUcmVlUmVzb2x2ZXIoRG9jdW1l bnQmKTsKICAgICB+VHJlZVJlc29sdmVyKCk7CiAKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8VXBkYXRl PiByZXNvbHZlKENoYW5nZSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPFVwZGF0ZT4gcmVzb2x2ZSgp OwogCiAgICAgc3RhdGljIEVsZW1lbnRVcGRhdGUgY3JlYXRlQW5pbWF0ZWRFbGVtZW50VXBkYXRl KHN0ZDo6dW5pcXVlX3B0cjxSZW5kZXJTdHlsZT4sIEVsZW1lbnQmLCBDaGFuZ2UgcGFyZW50Q2hh bmdlKTsKIApAQCAtNzYsMTEgKzc2LDExIEBAIHByaXZhdGU6CiAgICAgc3RydWN0IFBhcmVudCB7 CiAgICAgICAgIEVsZW1lbnQqIGVsZW1lbnQ7CiAgICAgICAgIGNvbnN0IFJlbmRlclN0eWxlJiBz dHlsZTsKLSAgICAgICAgQ2hhbmdlIGNoYW5nZTsKKyAgICAgICAgQ2hhbmdlIGNoYW5nZSB7IE5v Q2hhbmdlIH07CiAgICAgICAgIGJvb2wgZGlkUHVzaFNjb3BlIHsgZmFsc2UgfTsKICAgICAgICAg Ym9vbCBlbGVtZW50TmVlZGluZ1N0eWxlUmVjYWxjQWZmZWN0c05leHRTaWJsaW5nRWxlbWVudFN0 eWxlIHsgZmFsc2UgfTsKIAotICAgICAgICBQYXJlbnQoRG9jdW1lbnQmLCBDaGFuZ2UpOworICAg ICAgICBQYXJlbnQoRG9jdW1lbnQmKTsKICAgICAgICAgUGFyZW50KEVsZW1lbnQmLCBjb25zdCBS ZW5kZXJTdHlsZSYsIENoYW5nZSk7CiAgICAgfTsKIAo=