41265 2010-06-27 12:36:01 -0700 Clean up some loose ends in HTML5 tree builder 2010-06-27 16:50:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth abarth commit-queue eric webkit.review.bot oldest_to_newest 243490 0 abarth 2010-06-27 12:36:01 -0700 Clean up some loose ends in HTML5 tree builder 243491 1 59861 abarth 2010-06-27 12:41:13 -0700 Created attachment 59861 Patch 243509 2 59861 eric 2010-06-27 14:55:44 -0700 Comment on attachment 59861 Patch WebCore/ChangeLog:17 + - Originally I thought that comments had speciall processing in the special WebCore/html/HTMLTreeBuilder.cpp:622 + currentElement()->addChild(HTMLElementFactory::createHTMLElement(QualifiedName(nullAtom, token.name(), xhtmlNamespaceURI), m_document, 0)); Seems we should wrap this in a function. One which just takes the token.name(). createHTMLElement()? addHTMLElement()? 243519 3 59864 abarth 2010-06-27 16:04:08 -0700 Created attachment 59864 Patch for landing 243520 4 59864 commit-queue 2010-06-27 16:19:29 -0700 Comment on attachment 59864 Patch for landing Clearing flags on attachment: 59864 Committed r61974: <http://trac.webkit.org/changeset/61974> 243521 5 commit-queue 2010-06-27 16:19:33 -0700 All reviewed patches have been landed. Closing bug. 243522 6 webkit.review.bot 2010-06-27 16:50:22 -0700 http://trac.webkit.org/changeset/61974 might have broken GTK Linux 64-bit Debug 59861 2010-06-27 12:41:13 -0700 2010-06-27 16:03:57 -0700 Patch bug-41265-20100627124111.patch text/plain 4886 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTE4ZWFiZjI4M2NlMzg5ZGFiMjhkZTc1MzliMTMxOGIxYmIwMWZkZi4uZGY3NzU5YTNlZmYwN2U0 ZTRjM2NlZjZiNmI0YzA1YWM2ZTk4OTFkYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwzOCBAQAogCiAgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgogCisgICAgICAgIENsZWFuIHVwIHNvbWUgbG9vc2UgZW5k cyBpbiBIVE1MNSB0cmVlIGJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQxMjY1CisKKyAgICAgICAgVGhpcyBwYXRjaCBjbGVhbnMgdXAgYSBm ZXcgbG9vc2UgZW5kcyBpbiBIVE1MNSB0cmVlIGJ1aWxkZXIuCisgICAgICAgIFRlY2huaWNhbGx5 LCB3ZSBjb3VsZCBkbyBlYWNoIG9mIHRoZXNlIGFzIGluZGl2aWR1YWwgcGF0Y2hlcywgYnV0IHRo YXQKKyAgICAgICAgZGlkbid0IHNlZW0gd29ydGggd2hpbGUuCisKKyAgICAgICAgKiBodG1sL0hU TUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NTdGFydFRhZyk6CisgICAgICAgICAgICAtIEFkZCBtaXNzaW5nIGJyZWFrIGJlZm9yZSBk ZWZhdWx0IGNhc2Ugc3RhdGVtZW50LiAgSSBkb24ndCB0aGluaworICAgICAgICAgICAgICB0aGlz IGNoYW5nZSBpcyBvYnNlcnZhYmxlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVy Ojpwcm9jZXNzQ29tbWVudCk6CisgICAgICAgICAgICAtIE9yaWdpbmFsbHkgSSB0aG91Z2h0IHRo YXQgY29tbWVudHMgaGFkIHNwZWNpYWxsIHByb2Nlc3NpbmcgaW4gdGhlCisgICAgICAgICAgICAg IEluSGVhZE5vc2NyaXB0TW9kZSwgYnV0IGl0IHR1cm5zIG91dCB0aGF0IHdoZW4geW91IHVud2lu ZCB0aGUKKyAgICAgICAgICAgICAgZGVmaW5pdGlvbnMsIGl0IGFtb3VudHMgdG8gZXhhY3RseSB0 aGUgc2FtZSB0aGluZy4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vz c0VuZE9mRmlsZSk6CisgICAgICAgICAgICAtIEFkZCBtaXNzaW5nIGJyZWFrIGJlZm9yZSBkZWZh dWx0IGNhc2Ugc3RhdGVtZW50LiAgSSBkb24ndCB0aGluaworICAgICAgICAgICAgICB0aGlzIGNo YW5nZSBpcyBvYnNlcnZhYmxlLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpp bnNlcnRDb21tZW50KToKKyAgICAgICAgICAgIC0gRWxpbWluYXRlIG9uZSB1bm5lY2Vzc2FyeSBy ZWYvZGVyZWYgcGFpci4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0 U2VsZkNsb3NpbmdFbGVtZW50KToKKyAgICAgICAgICAgIC0gV2hlbiB3ZSBpbnNlcnQgc2VsZi1j bG9zaW5nIGVsZW1lbnRzLCB0aGVyZSdzIG5vIHJlYXNvbiB0byBwdXNoCisgICAgICAgICAgICAg IHRoZW0gb250byB0aGUgc3RhY2sgb2Ygb3BlbiBlbGVtZW50cyBqdXN0IHRvIHBvcCB0aGVtIG9m ZiBhZ2Fpbi4KKyAgICAgICAgICAgICAgVGhpcyBjaGFuZ2Ugc2F2ZXMgYSBtYWxsb2MvZnJlZSBw YWlyIGFzIHdlbGwgYXMgYSByZWYvZGVyZWYgcGFpci4KKyAgICAgICAgICAgICAgR28gdGVhbS4K KyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5oOgorICAgICAgICAgICAgLSBSZW1vdmUg dW51c2VkIGZ1bmN0aW9uLgorCisyMDEwLTA2LTI3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAg SW1wbGVtZW50IHJlbWFpbmluZyBTdGFydFRhZyBwcm9jZXNzaW5nIGZvciBJbkhlYWROb3Njcmlw dE1vZGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQx MjY0CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2Vi Q29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggZWI4MjkwZjIzOGY0ODliNjQyZjU0 MTk4ZGJjMjdiNWU0ODMxOTlmYi4uMjU2NTA5ZGY1MWI3YTA3ZjhmMDExMmY5YjJjYmU0ZjBmMDRh OTQ2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIv V2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTM3Miw2ICszNzIsNyBAQCB2b2lk IEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiAgICAgICAgIH0KICAgICAgICAgcHJvY2Vzc0RlZmF1bHRGb3JJbkhlYWROb3NjcmlwdE1vZGUo dG9rZW4pOwogICAgICAgICBwcm9jZXNzVG9rZW4odG9rZW4pOworICAgICAgICBicmVhazsKICAg ICBkZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KQEAgLTQ2MiwxMCAr NDYzLDYgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKIAogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NDb21tZW50KEF0b21p Y0hUTUxUb2tlbiYgdG9rZW4pCiB7Ci0gICAgaWYgKGluc2VydGlvbk1vZGUoKSA9PSBJbkhlYWRO b3NjcmlwdE1vZGUpIHsKLSAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KICAgICBpbnNlcnRDb21tZW50KHRva2VuKTsKIH0KIApAQCAtNTEwLDYgKzUwNyw3 IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kT2ZGaWxlKEF0b21pY0hUTUxUb2tl biYgdG9rZW4pCiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5IZWFkTm9zY3Jp cHRNb2RlKTsKICAgICAgICAgcHJvY2Vzc0RlZmF1bHRGb3JJbkhlYWROb3NjcmlwdE1vZGUodG9r ZW4pOwogICAgICAgICBwcm9jZXNzVG9rZW4odG9rZW4pOworICAgICAgICBicmVhazsKICAgICBk ZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KQEAgLTYwNyw4ICs2MDUs NyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0RG9jdHlwZShBdG9taWNIVE1MVG9rZW4m IHRva2VuKQogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydENvbW1lbnQoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKIHsKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6Q29t bWVudCk7Ci0gICAgUmVmUHRyPE5vZGU+IGVsZW1lbnQgPSBDb21tZW50OjpjcmVhdGUobV9kb2N1 bWVudCwgdG9rZW4uY29tbWVudCgpKTsKLSAgICBjdXJyZW50RWxlbWVudCgpLT5hZGRDaGlsZChl bGVtZW50KTsKKyAgICBjdXJyZW50RWxlbWVudCgpLT5hZGRDaGlsZChDb21tZW50OjpjcmVhdGUo bV9kb2N1bWVudCwgdG9rZW4uY29tbWVudCgpKSk7CiB9CiAKIHZvaWQgSFRNTFRyZWVCdWlsZGVy OjppbnNlcnRFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCkBAIC02MjIsMTcgKzYxOSwx MSBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0RWxlbWVudChBdG9taWNIVE1MVG9rZW4m IHRva2VuKQogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydFNlbGZDbG9zaW5nRWxlbWVudChB dG9taWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRN TFRva2VuOjpTdGFydFRhZyk7Ci0gICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7Ci0gICAgbV9vcGVu RWxlbWVudHMucG9wKCk7CisgICAgY3VycmVudEVsZW1lbnQoKS0+YWRkQ2hpbGQoSFRNTEVsZW1l bnRGYWN0b3J5OjpjcmVhdGVIVE1MRWxlbWVudChRdWFsaWZpZWROYW1lKG51bGxBdG9tLCB0b2tl bi5uYW1lKCksIHhodG1sTmFtZXNwYWNlVVJJKSwgbV9kb2N1bWVudCwgMCkpOwogICAgIC8vIEZJ WE1FOiBEbyB3ZSB3YW50IHRvIGFja25vd2xlZGdlIHRoZSB0b2tlbidzIHNlbGYtY2xvc2luZyBm bGFnPwogICAgIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50 LXdvcmsvbXVsdGlwYWdlL3Rva2VuaXphdGlvbi5odG1sI2Fja25vd2xlZGdlLXNlbGYtY2xvc2lu Zy1mbGFnCiB9CiAKLXZvaWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnRDaGFyYWN0ZXIoVUNoYXIg Y2MpCi17Ci0gICAgQVNTRVJUX1VOVVNFRChjYywgY2MpOwotfQotCiB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6aW5zZXJ0R2VuZXJpY1JDREFUQUVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikK IHsKICAgICBBU1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6U3RhcnRUYWcpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oIGIvV2ViQ29yZS9odG1sL0hU TUxUcmVlQnVpbGRlci5oCmluZGV4IDA4ZmMxMWU0NzQ0ZDkxZGFjMDdhNTljYWFmNmY5MTE3OTkx NGJmNTUuLjU0ODhhOTJiNWFjMGQ0ZDFhODJhZjljMjA5OGIwYmVmMGE2ZDIyMTkgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmgKQEAgLTE3OSw3ICsxNzksNiBAQCBwcml2YXRlOgogICAgIHZvaWQgaW5z ZXJ0Q29tbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydEVsZW1lbnQoQXRv bWljSFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRTZWxmQ2xvc2luZ0VsZW1lbnQoQXRvbWlj SFRNTFRva2VuJik7Ci0gICAgdm9pZCBpbnNlcnRDaGFyYWN0ZXIoVUNoYXIgY2MpOwogICAgIHZv aWQgaW5zZXJ0R2VuZXJpY1JDREFUQUVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9p ZCBpbnNlcnRHZW5lcmljUmF3VGV4dEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9p ZCBpbnNlcnRTY3JpcHRFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYpOwo= 59864 2010-06-27 16:04:08 -0700 2010-06-27 16:19:29 -0700 Patch for landing bug-41265-20100627160407.patch text/plain 5554 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTk3MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzUgQEAKKzIwMTAtMDYtMjcgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBDbGVhbiB1 cCBzb21lIGxvb3NlIGVuZHMgaW4gSFRNTDUgdHJlZSBidWlsZGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTI2NQorCisgICAgICAgIFRoaXMgcGF0 Y2ggY2xlYW5zIHVwIGEgZmV3IGxvb3NlIGVuZHMgaW4gSFRNTDUgdHJlZSBidWlsZGVyLgorICAg ICAgICBUZWNobmljYWxseSwgd2UgY291bGQgZG8gZWFjaCBvZiB0aGVzZSBhcyBpbmRpdmlkdWFs IHBhdGNoZXMsIGJ1dCB0aGF0CisgICAgICAgIGRpZG4ndCBzZWVtIHdvcnRoIHdoaWxlLgorCisg ICAgICAgICogaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcpOgorICAgICAgICAgICAgLSBBZGQgbWlzc2lu ZyBicmVhayBiZWZvcmUgZGVmYXVsdCBjYXNlIHN0YXRlbWVudC4gIEkgZG9uJ3QgdGhpbmsKKyAg ICAgICAgICAgICAgdGhpcyBjaGFuZ2UgaXMgb2JzZXJ2YWJsZS4KKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0NvbW1lbnQpOgorICAgICAgICAgICAgLSBPcmlnaW5h bGx5IEkgdGhvdWdodCB0aGF0IGNvbW1lbnRzIGhhZCBzcGVjaWFsIHByb2Nlc3NpbmcgaW4gdGhl CisgICAgICAgICAgICAgIEluSGVhZE5vc2NyaXB0TW9kZSwgYnV0IGl0IHR1cm5zIG91dCB0aGF0 IHdoZW4geW91IHVud2luZCB0aGUKKyAgICAgICAgICAgICAgZGVmaW5pdGlvbnMsIGl0IGFtb3Vu dHMgdG8gZXhhY3RseSB0aGUgc2FtZSB0aGluZy4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVl QnVpbGRlcjo6cHJvY2Vzc0VuZE9mRmlsZSk6CisgICAgICAgICAgICAtIEFkZCBtaXNzaW5nIGJy ZWFrIGJlZm9yZSBkZWZhdWx0IGNhc2Ugc3RhdGVtZW50LiAgSSBkb24ndCB0aGluaworICAgICAg ICAgICAgICB0aGlzIGNoYW5nZSBpcyBvYnNlcnZhYmxlLgorICAgICAgICAoV2ViQ29yZTo6SFRN TFRyZWVCdWlsZGVyOjppbnNlcnRDb21tZW50KToKKyAgICAgICAgICAgIC0gRWxpbWluYXRlIG9u ZSB1bm5lY2Vzc2FyeSByZWYvZGVyZWYgcGFpci4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVl QnVpbGRlcjo6aW5zZXJ0U2VsZkNsb3NpbmdFbGVtZW50KToKKyAgICAgICAgICAgIC0gV2hlbiB3 ZSBpbnNlcnQgc2VsZi1jbG9zaW5nIGVsZW1lbnRzLCB0aGVyZSdzIG5vIHJlYXNvbiB0byBwdXNo CisgICAgICAgICAgICAgIHRoZW0gb250byB0aGUgc3RhY2sgb2Ygb3BlbiBlbGVtZW50cyBqdXN0 IHRvIHBvcCB0aGVtIG9mZiBhZ2Fpbi4KKyAgICAgICAgICAgICAgVGhpcyBjaGFuZ2Ugc2F2ZXMg YSBtYWxsb2MvZnJlZSBwYWlyIGFzIHdlbGwgYXMgYSByZWYvZGVyZWYgcGFpci4KKyAgICAgICAg ICAgICAgR28gdGVhbS4KKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRlci5oOgorICAgICAg ICAgICAgLSBSZW1vdmUgdW51c2VkIGZ1bmN0aW9uLgorCiAyMDEwLTA2LTI3ICBBZGFtIEJhcnRo ICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAkocmV2aXNpb24gNjE5NzMpCisrKyBXZWJD b3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcyLDYgKzM3 Miw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXQKICAgICAgICAg fQogICAgICAgICBwcm9jZXNzRGVmYXVsdEZvckluSGVhZE5vc2NyaXB0TW9kZSh0b2tlbik7CiAg ICAgICAgIHByb2Nlc3NUb2tlbih0b2tlbik7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6 CiAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CiAgICAgfQpAQCAtNDYyLDEwICs0NjMsNiBAQCB2 b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyhBdG9tCiAKIHZvaWQgSFRNTFRyZWVC dWlsZGVyOjpwcm9jZXNzQ29tbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewotICAgIGlm IChpbnNlcnRpb25Nb2RlKCkgPT0gSW5IZWFkTm9zY3JpcHRNb2RlKSB7Ci0gICAgICAgIG5vdElt cGxlbWVudGVkKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgaW5zZXJ0Q29tbWVudCh0 b2tlbik7CiB9CiAKQEAgLTUxMCw2ICs1MDcsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc0VuZE9mRmlsZShBCiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5IZWFk Tm9zY3JpcHRNb2RlKTsKICAgICAgICAgcHJvY2Vzc0RlZmF1bHRGb3JJbkhlYWROb3NjcmlwdE1v ZGUodG9rZW4pOwogICAgICAgICBwcm9jZXNzVG9rZW4odG9rZW4pOworICAgICAgICBicmVhazsK ICAgICBkZWZhdWx0OgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KQEAgLTYwNywx NCArNjA1LDEzIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnREb2N0eXBlKEF0b20KIHZv aWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnRDb21tZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiB7CiAgICAgQVNTRVJUKHRva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW46OkNvbW1lbnQpOwotICAg IFJlZlB0cjxOb2RlPiBlbGVtZW50ID0gQ29tbWVudDo6Y3JlYXRlKG1fZG9jdW1lbnQsIHRva2Vu LmNvbW1lbnQoKSk7Ci0gICAgY3VycmVudEVsZW1lbnQoKS0+YWRkQ2hpbGQoZWxlbWVudCk7Cisg ICAgY3VycmVudEVsZW1lbnQoKS0+YWRkQ2hpbGQoQ29tbWVudDo6Y3JlYXRlKG1fZG9jdW1lbnQs IHRva2VuLmNvbW1lbnQoKSkpOwogfQogCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0RWxl bWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFTU0VSVCh0b2tlbi50eXBlKCkg PT0gSFRNTFRva2VuOjpTdGFydFRhZyk7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IGVsZW1lbnQgPSBI VE1MRWxlbWVudEZhY3Rvcnk6OmNyZWF0ZUhUTUxFbGVtZW50KFF1YWxpZmllZE5hbWUobnVsbEF0 b20sIHRva2VuLm5hbWUoKSwgeGh0bWxOYW1lc3BhY2VVUkkpLCBtX2RvY3VtZW50LCAwKTsKKyAg ICBSZWZQdHI8RWxlbWVudD4gZWxlbWVudCA9IGNyZWF0ZUVsZW1lbnQodG9rZW4pOwogICAgIGN1 cnJlbnRFbGVtZW50KCktPmFkZENoaWxkKGVsZW1lbnQpOwogICAgIG1fb3BlbkVsZW1lbnRzLnB1 c2goZWxlbWVudC5yZWxlYXNlKCkpOwogfQpAQCAtNjIyLDE3ICs2MTksMTEgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6Omluc2VydEVsZW1lbnQoQXRvbQogdm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omlu c2VydFNlbGZDbG9zaW5nRWxlbWVudChBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogewogICAgIEFT U0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpTdGFydFRhZyk7Ci0gICAgaW5zZXJ0RWxl bWVudCh0b2tlbik7Ci0gICAgbV9vcGVuRWxlbWVudHMucG9wKCk7CisgICAgY3VycmVudEVsZW1l bnQoKS0+YWRkQ2hpbGQoY3JlYXRlRWxlbWVudCh0b2tlbikpOwogICAgIC8vIEZJWE1FOiBEbyB3 ZSB3YW50IHRvIGFja25vd2xlZGdlIHRoZSB0b2tlbidzIHNlbGYtY2xvc2luZyBmbGFnPwogICAg IC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvbXVs dGlwYWdlL3Rva2VuaXphdGlvbi5odG1sI2Fja25vd2xlZGdlLXNlbGYtY2xvc2luZy1mbGFnCiB9 CiAKLXZvaWQgSFRNTFRyZWVCdWlsZGVyOjppbnNlcnRDaGFyYWN0ZXIoVUNoYXIgY2MpCi17Ci0g ICAgQVNTRVJUX1VOVVNFRChjYywgY2MpOwotfQotCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5z ZXJ0R2VuZXJpY1JDREFUQUVsZW1lbnQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKIHsKICAgICBB U1NFUlQodG9rZW4udHlwZSgpID09IEhUTUxUb2tlbjo6U3RhcnRUYWcpOwpAQCAtNjYyLDYgKzY1 MywxMSBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6aW5zZXJ0U2NyaXB0RWxlbWVuCiAgICAgbV9p bnNlcnRpb25Nb2RlID0gVGV4dE1vZGU7CiB9CiAKK1Bhc3NSZWZQdHI8RWxlbWVudD4gSFRNTFRy ZWVCdWlsZGVyOjpjcmVhdGVFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCit7CisgICAg cmV0dXJuIEhUTUxFbGVtZW50RmFjdG9yeTo6Y3JlYXRlSFRNTEVsZW1lbnQoUXVhbGlmaWVkTmFt ZShudWxsQXRvbSwgdG9rZW4ubmFtZSgpLCB4aHRtbE5hbWVzcGFjZVVSSSksIG1fZG9jdW1lbnQs IDApOworfQorCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6ZmluaXNoZWQoKQogewogICAgIC8vIFdl IHNob3VsZCBjYWxsIG1fZG9jdW1lbnQtPmZpbmlzaGVkUGFyc2luZygpIGhlcmUsIGV4Y2VwdApJ bmRleDogV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaAkocmV2aXNpb24gNjE5NzMpCisrKyBXZWJDb3JlL2h0 bWwvSFRNTFRyZWVCdWlsZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3OSw3ICsxNzksNiBAQCBw cml2YXRlOgogICAgIHZvaWQgaW5zZXJ0Q29tbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2 b2lkIGluc2VydEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRTZWxm Q2xvc2luZ0VsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7Ci0gICAgdm9pZCBpbnNlcnRDaGFyYWN0 ZXIoVUNoYXIgY2MpOwogICAgIHZvaWQgaW5zZXJ0R2VuZXJpY1JDREFUQUVsZW1lbnQoQXRvbWlj SFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRHZW5lcmljUmF3VGV4dEVsZW1lbnQoQXRvbWlj SFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRTY3JpcHRFbGVtZW50KEF0b21pY0hUTUxUb2tl biYpOwpAQCAtMTg3LDYgKzE4Niw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbnNlcnRIVE1MU3Rh cnRUYWdCZWZvcmVIVE1MKEF0b21pY0hUTUxUb2tlbiYpOwogICAgIHZvaWQgaW5zZXJ0SFRNTFN0 YXJ0VGFnSW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYpOwogCisgICAgUGFzc1JlZlB0cjxFbGVtZW50 PiBjcmVhdGVFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYpOworCiAgICAgRWxlbWVudCogY3VycmVu dEVsZW1lbnQoKSB7IHJldHVybiBtX29wZW5FbGVtZW50cy50b3AoKTsgfQogCiAgICAgUmVmUHRy PEVsZW1lbnQ+IG1faGVhZEVsZW1lbnQ7Cg==