41581 2010-07-04 12:23:25 -0700 Add a very basic InTable insertion mode 2010-07-04 14:56:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41453 1 eric eric abarth oldest_to_newest 246435 0 eric 2010-07-04 12:23:25 -0700 Add a very basic InTable insertion mode 246436 1 60475 eric 2010-07-04 12:27:37 -0700 Created attachment 60475 Patch 246438 2 60475 abarth 2010-07-04 13:24:41 -0700 Comment on attachment 60475 Patch Thanks! I looked at doing this last night, but I'm glad you did it. :) WebCore/html/HTMLTreeBuilder.cpp:770 + insertElement(token); You want to use insertSelfClosingElement here instead. 246458 3 eric 2010-07-04 14:52:29 -0700 Oh, there is lots more to do. :) A bunch of simple changes on top of this patch would pass a whole bunch more tests (like handling "any other tag" in table mode). 246459 4 eric 2010-07-04 14:56:20 -0700 Committed r62469: <http://trac.webkit.org/changeset/62469> 60475 2010-07-04 12:27:37 -0700 2010-07-04 13:24:41 -0700 Patch bug-41581-20100704122711.patch text/plain 15113 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwYjdiNDM3ODJmYzA5NjNkNzdkODNkNWZkNmNjZTEyNzUyNTlmMTgzLi44Njc5NTg5 ZTExMWRmNTM1MjUwNDJjYTlkY2IyM2YyNTljNmIwODQxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDctMDQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHZlcnkgYmFzaWMgSW5U YWJsZSBpbnNlcnRpb24gbW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDE1ODEKKworICAgICAgICAqIGh0bWw1bGliL3J1bm5lci1leHBlY3RlZC1o dG1sNS50eHQ6CisgICAgICAgICAtIFVwZGF0ZSBleHBlY3RhdGlvbnMgbm93IHRoYXQgd2UgcGFz cyA2IG1vcmUgdGVzdHMuCisKIDIwMTAtMDctMDIgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLWh0bWw1LnR4dCBiL0xheW91dFRl c3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKaW5kZXggNWEzYjhkODY5NTE1 OTMyYjZkZDE2MmMwNGVmMTVkMmQxZTA0YmRjOS4uOGU0NTlmNjg3YjBhOWQ2NDAwMDBhMTJkY2Yy YjE2NjViN2ViNzJkZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4 cGVjdGVkLWh0bWw1LnR4dAorKysgYi9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0 ZWQtaHRtbDUudHh0CkBAIC0xMzE4LDYgKzEzMTgsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAg PGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxjb2xncm91cD4KIEV4cGVjdGVkOgogfCA8 aHRtbD4KIHwgICA8aGVhZD4KQEAgLTEzNDMsNiArMTM0NCw3IEBAIEdvdDoKIHwgICA8aGVhZD4K IHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KK3wgICAgICAgPHRib2R5PgogRXhwZWN0ZWQ6CiB8 IDxodG1sPgogfCAgIDxoZWFkPgpAQCAtMTM3MCw2ICsxMzcyLDcgQEAgR290OgogfCAgIDxoZWFk PgogfCAgIDxib2R5PgogfCAgICAgPHRhYmxlPgorfCAgICAgICA8Y29sZ3JvdXA+CiBFeHBlY3Rl ZDoKIHwgPGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC0xNTcwLDYgKzE1NzMsNyBAQCBHb3Q6CiB8ICAg PGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxjYXB0aW9uPgogRXhw ZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTIxMDMsMjAgKzIxMDcsMTQg QEAgcmVzb3VyY2VzL3Rlc3RzNi5kYXQ6CiAxNgogMTcKIDE5Ci0yMAotMjIKIDIzCiAyNAogMjYK IDI3Ci0yOAogMzAKIDMzCiAzNgogMzcKLTM4Ci00MAotNDEKIDQyCiA0NAogNDUKQEAgLTIyNjIs NiArMjI2MCw3IEBAIEdvdDoKIHwgICA8aGVhZD4KIHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4K K3wgICAgICAgPGNhcHRpb24+CiBFeHBlY3RlZDoKIHwgPGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC0y Mjc5LDYgKzIyNzgsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFi bGU+Cit8ICAgICAgIDxjYXB0aW9uPgogRXhwZWN0ZWQ6CiB8IDxodG1sPgogfCAgIDxoZWFkPgpA QCAtMjI5NCw0MSArMjI5NCwxNCBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAg ICA8dGFibGU+Ci1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18 ICAgICA8dGFibGU+CiB8ICAgICAgIDxjYXB0aW9uPgotfCAgICAgICAgIDxkaXY+Ci0KLVRlc3Qg MjAgb2YgNTEgaW4gcmVzb3VyY2VzL3Rlc3RzNi5kYXQgZmFpbGVkLiBJbnB1dDoKLTx0YWJsZT48 Y2FwdGlvbj48L3RhYmxlPgotR290OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4K LXwgICAgIDx0YWJsZT4KLUV4cGVjdGVkOgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9k eT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPGNhcHRpb24+Ci0KLVRlc3QgMjIgb2YgNTEgaW4g cmVzb3VyY2VzL3Rlc3RzNi5kYXQgZmFpbGVkLiBJbnB1dDoKLTx0YWJsZT48Y2FwdGlvbj48L2Jv ZHk+PC9jb2w+PC9jb2xncm91cD48L2h0bWw+PC90Ym9keT48L3RkPjwvdGZvb3Q+PC90aD48L3Ro ZWFkPjwvdHI+Ci1Hb3Q6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAg PHRhYmxlPgogRXhwZWN0ZWQ6CiB8IDxodG1sPgogfCAgIDxoZWFkPgogfCAgIDxib2R5PgogfCAg ICAgPHRhYmxlPgogfCAgICAgICA8Y2FwdGlvbj4KK3wgICAgICAgICA8ZGl2PgogCiBUZXN0IDIz IG9mIDUxIGluIHJlc291cmNlcy90ZXN0czYuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PGNh cHRpb24+PGRpdj48L2Rpdj4KQEAgLTIzMzcsNiArMjMxMCw3IEBAIEdvdDoKIHwgICA8aGVhZD4K IHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KK3wgICAgICAgPGNhcHRpb24+CiBFeHBlY3RlZDoK IHwgPGh0bWw+CiB8ICAgPGhlYWQ+CkBAIC0yMzY4LDYgKzIzNDIsNyBAQCBHb3Q6CiB8ICAgPGhl YWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxjb2xncm91cD4KIEV4cGVj dGVkOgogfCA8aHRtbD4KIHwgICA8aGVhZD4KQEAgLTIzODMsMjAgKzIzNTgsNiBAQCBHb3Q6CiBF eHBlY3RlZDoKIHwgPGNvbD4KIAotVGVzdCAyOCBvZiA1MSBpbiByZXNvdXJjZXMvdGVzdHM2LmRh dCBmYWlsZWQuIElucHV0OgotPHRhYmxlPjxjb2xncm91cD48L2NvbD4KLUdvdDoKLXwgPGh0bWw+ Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+Ci1FeHBlY3RlZDoKLXwgPGh0 bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8dGFibGU+Ci18ICAgICAgIDxjb2xn cm91cD4KLQogVGVzdCAzMCBvZiA1MSBpbiByZXNvdXJjZXMvdGVzdHM2LmRhdCBmYWlsZWQuIElu cHV0OgogPC9mcmFtZXNldD48ZnJhbWU+CiBHb3Q6CkBAIC0yNDQ5LDQ4ICsyNDEwLDYgQEAgR290 OgogRXhwZWN0ZWQ6CiB8IDx0cj4KIAotVGVzdCAzOCBvZiA1MSBpbiByZXNvdXJjZXMvdGVzdHM2 LmRhdCBmYWlsZWQuIElucHV0OgotPHRhYmxlPjx0Ym9keT48L3RoZWFkPgotR290OgotfCA8aHRt bD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLUV4cGVjdGVkOgotfCA8 aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPHRi b2R5PgotCi1UZXN0IDQwIG9mIDUxIGluIHJlc291cmNlcy90ZXN0czYuZGF0IGZhaWxlZC4gSW5w dXQ6Ci08dGFibGU+PHRib2R5PjwvYm9keT48L2NhcHRpb24+PC9jb2w+PC9jb2xncm91cD48L2h0 bWw+PC90ZD48L3RoPjwvdHI+Ci1Hb3Q6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5 PgotfCAgICAgPHRhYmxlPgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxi b2R5PgotfCAgICAgPHRhYmxlPgotfCAgICAgICA8dGJvZHk+Ci0KLVRlc3QgNDEgb2YgNTEgaW4g cmVzb3VyY2VzL3Rlc3RzNi5kYXQgZmFpbGVkLiBJbnB1dDoKLTx0YWJsZT48dGJvZHk+PC9kaXY+ Ci1Hb3Q6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHRhYmxlPgot RXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxoZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHRhYmxl PgotfCAgICAgICA8dGJvZHk+Ci0KIFRlc3QgNDIgb2YgNTEgaW4gcmVzb3VyY2VzL3Rlc3RzNi5k YXQgZmFpbGVkLiBJbnB1dDoKIDx0YWJsZT48dGFibGU+CiBHb3Q6CkBAIC0yNjYxLDYgKzI1ODAs OCBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAg IDxzdHlsZT4KK3wgICAgICAgICAiIDx0cj54ICIKIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRt bD4KIHwgPGh0bWw+CkBAIC0yNjc5LDYgKzI2MDAsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAg PGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURP Q1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zMjg2LDYgKzMyMDgsNyBAQCBHb3Q6CiB8ICAgPGhl YWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVk OgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zMzA3LDYgKzMyMzAsNyBAQCBHb3Q6 CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4K IEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zMzI5LDYgKzMyNTMs NyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAg IDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zMzUy LDYgKzMyNzcsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+ Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+ CkBAIC0zMzc3LDYgKzMzMDMsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAg ICA8dGFibGU+Cit8ICAgICAgIDxjYXB0aW9uPgogRXhwZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1s PgogfCA8aHRtbD4KQEAgLTM0MDAsNiArMzMyNyw3IEBAIEdvdDoKIHwgICA8aGVhZD4KIHwgICA8 Ym9keT4KIHwgICAgIDx0YWJsZT4KK3wgICAgICAgPGNhcHRpb24+CiBFeHBlY3RlZDoKIHwgPCFE T0NUWVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtMzQyNSw2ICszMzUzLDcgQEAgR290OgogfCAgIDxo ZWFkPgogfCAgIDxib2R5PgogfCAgICAgPHRhYmxlPgorfCAgICAgICA8Y2FwdGlvbj4KIEV4cGVj dGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zNDQ5LDYgKzMzNzgsNyBAQCBH b3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxjb2xn cm91cD4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zNzg4LDYg KzM3MTgsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8 ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBA IC0zODA5LDYgKzM3NDAsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8 dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwg PGh0bWw+CkBAIC0zODMxLDYgKzM3NjMsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+ CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUg aHRtbD4KIHwgPGh0bWw+CkBAIC0zODU0LDYgKzM3ODcsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8 ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDx0Ym9keT4KIEV4cGVjdGVkOgogfCA8 IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CkBAIC0zODc5LDYgKzM4MTMsNyBAQCBHb3Q6CiB8ICAg PGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxjYXB0aW9uPgogRXhw ZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTM5MDIsNiArMzgzNyw3IEBA IEdvdDoKIHwgICA8aGVhZD4KIHwgICA8Ym9keT4KIHwgICAgIDx0YWJsZT4KK3wgICAgICAgPGNh cHRpb24+CiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8IDxodG1sPgpAQCAtMzkyNyw2 ICszODYzLDcgQEAgR290OgogfCAgIDxoZWFkPgogfCAgIDxib2R5PgogfCAgICAgPHRhYmxlPgor fCAgICAgICA8Y2FwdGlvbj4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+ CkBAIC0zOTUxLDYgKzM4ODgsNyBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAgPGJvZHk+CiB8ICAg ICA8dGFibGU+Cit8ICAgICAgIDxjb2xncm91cD4KIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRt bD4KIHwgPGh0bWw+CkBAIC01MzYwLDYgKzUyOTgsOCBAQCBHb3Q6CiB8ICAgPGhlYWQ+CiB8ICAg PGJvZHk+CiB8ICAgICA8dGFibGU+Cit8ICAgICAgIDxzdHlsZT4KK3wgICAgICAgICAiIDx0cj54 ICIKIEV4cGVjdGVkOgogfCA8IURPQ1RZUEUgaHRtbD4KIHwgPGh0bWw+CmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZiZjcxOTY1NTA4OWJk NDBmYmRjMzQyODdiOWQyNmY4MDU5NDM2YTYuLjVkZGEwNjExZGYzYjdhMDI3NThhMzBhN2UwNWM2 Y2M1Y2YxYzZmNWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTAtMDctMDQgIEVyaWMgU2VpZGVsICA8ZXJp Y0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhIHZlcnkgYmFzaWMgSW5UYWJsZSBpbnNlcnRpb24gbW9kZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE1ODEKKworICAgICAgICBU aGVyZSBpcyBzdGlsbCBhIGJ1bmNoIG9mIGxvdy1oYW5naW5nIGZydWl0IGxlZnQgZm9yIHRoaXMK KyAgICAgICAgbW9kZSwgYnV0IGV2ZW4gdGhpcyBtb3N0LWJhc2ljIHN1cHBvcnQgbGV0cyB1cyBw YXNzIDYgbW9yZSB0ZXN0cy4gOikKKworICAgICAgICBJdCdzIGEgcHJvZ3Jlc3Npb24sIHNoaXAg aXQhIDopCisKKyAgICAgICAgKiBodG1sL0hUTUxFbGVtZW50U3RhY2suY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE5hbWVzOjppc1Njb3BlTWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxOYW1lczo6aXNMaXN0SXRlbVNjb3BlTWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxO YW1lczo6aXNUYWJsZVNjb3BlTWFya2VyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxFbGVtZW50 U3RhY2s6OnBvcFVudGlsVGFibGVTY29wZU1hcmtlcik6CisgICAgICAgICogaHRtbC9IVE1MRWxl bWVudFN0YWNrLmg6CisgICAgICAgICogaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OmFwcGVuZE1h cmtlcik6CisgICAgICAgICogaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0Lmg6CisgICAg ICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRy ZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWls ZGVyLmg6CisKIDIwMTAtMDctMDEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9o dG1sL0hUTUxFbGVtZW50U3RhY2suY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2su Y3BwCmluZGV4IDM4NjU4OTdiNDlkZWNlYzM2OGI4YTcwZjQ1YTlhNTcwYWFkNmJhMjUuLmMwMzQ4 Y2JjN2M1ZWRhMmEwM2JhM2MxODg0ZDljYjI3NGRmN2MwZjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9IVE1MRWxlbWVudFN0YWNrLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRT dGFjay5jcHAKQEAgLTM4LDYgKzM4LDM4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcg bmFtZXNwYWNlIEhUTUxOYW1lczsKIAorbmFtZXNwYWNlIHsKKworaW5saW5lIGJvb2wgaXNTY29w ZU1hcmtlcihFbGVtZW50KiBlbGVtZW50KQoreworICAgIHJldHVybiBlbGVtZW50LT5oYXNUYWdO YW1lKGFwcGxldFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShidXR0b25UYWcp CisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoY2FwdGlvblRhZykKKyNpZiBFTkFCTEUo U1ZHX0ZPUkVJR05fT0JKRUNUKQorICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKFNWR05h bWVzOjpmb3JlaWduT2JqZWN0VGFnKQorI2VuZGlmCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1Rh Z05hbWUoaHRtbFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShtYXJxdWVlVGFn KQorICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKG9iamVjdFRhZykKKyAgICAgICAgfHwg ZWxlbWVudC0+aGFzVGFnTmFtZSh0YWJsZVRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFn TmFtZSh0ZFRhZykKKyAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0aFRhZyk7Cit9CisK K2lubGluZSBib29sIGlzTGlzdEl0ZW1TY29wZU1hcmtlcihFbGVtZW50KiBlbGVtZW50KQorewor ICAgIHJldHVybiBpc1Njb3BlTWFya2VyKGVsZW1lbnQpCisgICAgICAgIHx8IGVsZW1lbnQtPmhh c1RhZ05hbWUob2xUYWcpCisgICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUodWxUYWcpOwor fQoraW5saW5lIGJvb2wgaXNUYWJsZVNjb3BlTWFya2VyKEVsZW1lbnQqIGVsZW1lbnQpCit7Cisg ICAgcmV0dXJuIGVsZW1lbnQtPmhhc1RhZ05hbWUoaHRtbFRhZykKKyAgICAgICAgfHwgZWxlbWVu dC0+aGFzVGFnTmFtZSh0YWJsZVRhZyk7Cit9CisKK30KKwogSFRNTEVsZW1lbnRTdGFjazo6RWxl bWVudFJlY29yZDo6RWxlbWVudFJlY29yZChQYXNzUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQsIFBh c3NPd25QdHI8RWxlbWVudFJlY29yZD4gbmV4dCkKICAgICA6IG1fZWxlbWVudChlbGVtZW50KQog ICAgICwgbV9uZXh0KG5leHQpCkBAIC0xMTEsNiArMTQzLDEzIEBAIHZvaWQgSFRNTEVsZW1lbnRT dGFjazo6cG9wVW50aWwoRWxlbWVudCogZWxlbWVudCkKICAgICAgICAgcG9wKCk7CiB9CiAKK3Zv aWQgSFRNTEVsZW1lbnRTdGFjazo6cG9wVW50aWxUYWJsZVNjb3BlTWFya2VyKCkKK3sKKyAgICAv LyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRp cGFnZS90b2tlbml6YXRpb24uaHRtbCNjbGVhci10aGUtc3RhY2stYmFjay10by1hLXRhYmxlLWNv bnRleHQKKyAgICB3aGlsZSAoIWlzVGFibGVTY29wZU1hcmtlcih0b3AoKSkpCisgICAgICAgIHBv cCgpOworfQorCiB2b2lkIEhUTUxFbGVtZW50U3RhY2s6OnB1c2hIVE1MSHRtbEVsZW1lbnQoUGFz c1JlZlB0cjxFbGVtZW50PiBlbGVtZW50KQogewogICAgIEFTU0VSVCghbV90b3ApOyAvLyA8aHRt bD4gc2hvdWxkIGFsd2F5cyBiZSB0aGUgYm90dG9tIG9mIHRoZSBzdGFjay4KQEAgLTIyOSwzOSAr MjY4LDYgQEAgYm9vbCBIVE1MRWxlbWVudFN0YWNrOjpjb250YWlucyhFbGVtZW50KiBlbGVtZW50 KSBjb25zdAogICAgIHJldHVybiAhIWZpbmQoZWxlbWVudCk7CiB9CiAKLW5hbWVzcGFjZSB7Ci0K LWlubGluZSBib29sIGlzU2NvcGVNYXJrZXIoRWxlbWVudCogZWxlbWVudCkKLXsKLSAgICByZXR1 cm4gZWxlbWVudC0+aGFzVGFnTmFtZShhcHBsZXRUYWcpCi0gICAgICAgIHx8IGVsZW1lbnQtPmhh c1RhZ05hbWUoYnV0dG9uVGFnKQotICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGNhcHRp b25UYWcpCi0gICAgICAgIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoaHRtbFRhZykKLSAgICAgICAg fHwgZWxlbWVudC0+aGFzVGFnTmFtZShtYXJxdWVlVGFnKQotICAgICAgICB8fCBlbGVtZW50LT5o YXNUYWdOYW1lKG9iamVjdFRhZykKLSAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0YWJs ZVRhZykKLSAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZSh0ZFRhZykKLSAgICAgICAgfHwg ZWxlbWVudC0+aGFzVGFnTmFtZSh0aFRhZykKLSNpZiBFTkFCTEUoU1ZHX0ZPUkVJR05fT0JKRUNU KQotICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKFNWR05hbWVzOjpmb3JlaWduT2JqZWN0 VGFnKQotI2VuZGlmCi0gICAgICAgIDsKLX0KLQotaW5saW5lIGJvb2wgaXNMaXN0SXRlbVNjb3Bl TWFya2VyKEVsZW1lbnQqIGVsZW1lbnQpCi17Ci0gICAgcmV0dXJuIGlzU2NvcGVNYXJrZXIoZWxl bWVudCkKLSAgICAgICAgfHwgZWxlbWVudC0+aGFzVGFnTmFtZShvbFRhZykKLSAgICAgICAgfHwg ZWxlbWVudC0+aGFzVGFnTmFtZSh1bFRhZyk7Ci19Ci1pbmxpbmUgYm9vbCBpc1RhYmxlU2NvcGVN YXJrZXIoRWxlbWVudCogZWxlbWVudCkKLXsKLSAgICByZXR1cm4gZWxlbWVudC0+aGFzVGFnTmFt ZShodG1sVGFnKQotICAgICAgICB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKHRhYmxlVGFnKTsKLX0K LQotfQotCiB0ZW1wbGF0ZSA8Ym9vbCBpc01hcmtlcihFbGVtZW50Kik+CiBib29sIGluU2NvcGVD b21tb24oSFRNTEVsZW1lbnRTdGFjazo6RWxlbWVudFJlY29yZCogdG9wLCBjb25zdCBBdG9taWNT dHJpbmcmIHRhcmdldFRhZykKIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVu dFN0YWNrLmggYi9XZWJDb3JlL2h0bWwvSFRNTEVsZW1lbnRTdGFjay5oCmluZGV4IGRmMjkwZDQ4 NDFlYjhkYzQ3ZTkxYTZlMDBlOTJiYzRkMzQyZGJiZmYuLjBlMmM3NzlkNTM5NDQwZmQyNjRlZmQ0 MGIxODg2ZjUzNDg5ZDRiZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRWxlbWVudFN0 YWNrLmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50U3RhY2suaApAQCAtODIsNiArODIs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3AoKTsKICAgICB2b2lkIHBvcFVudGlsKGNvbnN0IEF0 b21pY1N0cmluZyYgdGFnTmFtZSk7CiAgICAgdm9pZCBwb3BVbnRpbChFbGVtZW50Kik7CisgICAg dm9pZCBwb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsgLy8gImNsZWFyIHRoZSBzdGFjayBiYWNr IHRvIGEgdGFibGUgY29udGV4dCIgaW4gdGhlIHNwZWMuCiAgICAgdm9pZCBwb3BIVE1MSGVhZEVs ZW1lbnQoKTsKICAgICB2b2lkIHBvcEhUTUxCb2R5RWxlbWVudCgpOwogCmRpZmYgLS1naXQgYS9X ZWJDb3JlL2h0bWwvSFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5jcHAgYi9XZWJDb3JlL2h0bWwv SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5jcHAKaW5kZXggZjhlMWRkNWQ1OWFmZTA1ZTAxNDZh YTE2MDdhZWJhYmUzZGIyODljNC4uMDE5ODI2MThkNDY2MDIyOWY2Zjc5NTRhNzdkMThjMDEyN2Fk NDY2NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Qu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmNwcApAQCAt MTIxLDYgKzEyMSwxMSBAQCB2b2lkIEhUTUxGb3JtYXR0aW5nRWxlbWVudExpc3Q6OnJlbW92ZShF bGVtZW50KiBlbGVtZW50KQogICAgICAgICBtX2VudHJpZXMucmVtb3ZlKGluZGV4KTsKIH0KIAor dm9pZCBIVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0OjphcHBlbmRNYXJrZXIoKQoreworICAgIG1f ZW50cmllcy5hcHBlbmQoRW50cnk6Ok1hcmtlckVudHJ5KTsKK30KKwogdm9pZCBIVE1MRm9ybWF0 dGluZ0VsZW1lbnRMaXN0OjpjbGVhclRvTGFzdE1hcmtlcigpCiB7CiAgICAgd2hpbGUgKG1fZW50 cmllcy5zaXplKCkgJiYgIW1fZW50cmllcy5sYXN0KCkuaXNNYXJrZXIoKSkKZGlmZiAtLWdpdCBh L1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmggYi9XZWJDb3JlL2h0bWwv SFRNTEZvcm1hdHRpbmdFbGVtZW50TGlzdC5oCmluZGV4IGQ2MTNhODY0MDFkM2NmYzI3Y2Y5Yjgx ODUxNmI5Y2VjMjMzNzM2OTguLmRhMzBmNzViYjQ0YmJiMmY5ZjIyZGUxMjAzYTYxMmI0ZTBkMWRm NDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MRm9ybWF0dGluZ0VsZW1lbnRMaXN0LmgK KysrIGIvV2ViQ29yZS9odG1sL0hUTUxGb3JtYXR0aW5nRWxlbWVudExpc3QuaApAQCAtNzMsNiAr NzMsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBjb250YWlucyhFbGVtZW50Kik7CiAgICAgdm9pZCBh cHBlbmQoRWxlbWVudCopOwogICAgIHZvaWQgcmVtb3ZlKEVsZW1lbnQqKTsKKworICAgIHZvaWQg YXBwZW5kTWFya2VyKCk7CiAgICAgdm9pZCBjbGVhclRvTGFzdE1hcmtlcigpOwogCiAgICAgY29u c3QgRW50cnkmIG9wZXJhdG9yW10oc2l6ZV90IGkpIGNvbnN0IHsgcmV0dXJuIG1fZW50cmllc1tp XTsgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJD b3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRleCA4MTFhNTVlZjlkM2M2Yjk5ZDk2YzYx YWRkOTRhMzliNmU5NmRjYmViLi45ZjAyMWQxMTM4ZDMxZGY2ODhmMTI5M2Q1N2EyZTJlMTI5NzFk MmNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9X ZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcApAQCAtNzIyLDYgKzcyMiw1OCBAQCB2b2lk IEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiAgICAgICAgIHJlY29uc3RydWN0VGhlQWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCk7CiAgICAg ICAgIGluc2VydEVsZW1lbnQodG9rZW4pOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIEluVGFi bGVNb2RlOgorICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluVGFibGVNb2RlKTsK KyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBjYXB0aW9uVGFnKSB7CisgICAgICAgICAgICBt X29wZW5FbGVtZW50cy5wb3BVbnRpbFRhYmxlU2NvcGVNYXJrZXIoKTsKKyAgICAgICAgICAgIG1f YWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzLmFwcGVuZE1hcmtlcigpOworICAgICAgICAgICAgaW5z ZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJbkNhcHRp b25Nb2RlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcpIHsKKyAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBv cFVudGlsVGFibGVTY29wZU1hcmtlcigpOworICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tl bik7CisgICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJbkNvbHVtbkdyb3VwTW9kZTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09 IGNvbFRhZykgeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRib2R5VGFnIHx8 IHRva2VuLm5hbWUoKSA9PSB0Zm9vdFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGhlYWRUYWcpIHsK KyAgICAgICAgICAgIG1fb3BlbkVsZW1lbnRzLnBvcFVudGlsVGFibGVTY29wZU1hcmtlcigpOwor ICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBtX2luc2VydGlv bk1vZGUgPSBJblRhYmxlQm9keU1vZGU7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0ZFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGhU YWcgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7CisgICAgICAgICAgICBub3RJbXBsZW1lbnRl ZCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5u YW1lKCkgPT0gdGFibGVUYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBz dHlsZVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gc2NyaXB0VGFnKSB7CisgICAgICAgICAgICBwcm9j ZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gaW5wdXRUYWcpIHsKKyAgICAgICAgICAg IG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSBmb3JtVGFnKSB7CisgICAgICAgICAgICBwYXJzZUVycm9y KHRva2VuKTsKKyAgICAgICAgICAgIGlmIChtX2Zvcm1FbGVtZW50KQorICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAg bV9vcGVuRWxlbWVudHMucG9wKCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgcGFyc2VFcnJvcih0b2tlbik7CisgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgQWZ0ZXJCb2R5TW9kZToKICAgICBjYXNlIEFmdGVyQWZ0ZXJC b2R5TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckJvZHlNb2Rl IHx8IGluc2VydGlvbk1vZGUoKSA9PSBBZnRlckFmdGVyQm9keU1vZGUpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVp bGRlci5oCmluZGV4IGJiNzZiOWNhMzUxYzA5NjBmODZjYWM0ZjcyMTZkYjI2MWE1NjVmYWIuLjM3 ZTQyNzk1MzNkYjA1NTI3NGM0NGIzNWFlMTVkMjk3OTljNmRlMzAgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWls ZGVyLmgKQEAgLTE2OSw3ICsxNjksNiBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBpbmRleE9mRmly c3RVbm9wZW5Gb3JtYXR0aW5nRWxlbWVudCh1bnNpZ25lZCYgZmlyc3RVbm9wZW5FbGVtZW50SW5k ZXgpIGNvbnN0OwogICAgIHZvaWQgcmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxlbWVu dHMoKTsKLSAgICB2b2lkIGNsZWFyQWN0aXZlRm9ybWF0aW5nRWxlbWVudHNVcFRvTGFzdE1hcmtl cigpIHsgfQogCiAgICAgdm9pZCBnZW5lcmF0ZUltcGxpZWRFbmRUYWdzKCk7CiAgICAgdm9pZCBn ZW5lcmF0ZUltcGxpZWRFbmRUYWdzV2l0aEV4Y2x1c2lvbihjb25zdCBBdG9taWNTdHJpbmcmIHRh Z05hbWUpOwo=