106694 2013-01-11 13:20:54 -0800 Move constructTreeFromHTMLToken into HTMLDocumentParser 2013-01-11 17:30:08 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 1 tonyg tonyg ojan.autocc webkit.review.bot oldest_to_newest 805562 0 tonyg 2013-01-11 13:20:54 -0800 Move constructTreeFromHTMLToken into HTMLDocumentParser 805564 1 182403 tonyg 2013-01-11 13:21:41 -0800 Created attachment 182403 Patch 805569 2 182403 abarth 2013-01-11 13:26:42 -0800 Comment on attachment 182403 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182403&action=review > Source/WebCore/html/parser/HTMLTreeBuilder.h:81 > void constructTreeFromAtomicToken(AtomicHTMLToken*); I would probably rename this function to "constructTree" now that we only have one. :) 805576 3 182408 tonyg 2013-01-11 13:34:41 -0800 Created attachment 182408 Patch 805579 4 tonyg 2013-01-11 13:35:17 -0800 (In reply to comment #2) > (From update of attachment 182403 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=182403&action=review > > > Source/WebCore/html/parser/HTMLTreeBuilder.h:81 > > void constructTreeFromAtomicToken(AtomicHTMLToken*); > > I would probably rename this function to "constructTree" now that we only have one. :) Good catch. Done. 805775 5 182408 webkit.review.bot 2013-01-11 17:30:04 -0800 Comment on attachment 182408 Patch Clearing flags on attachment: 182408 Committed r139523: <http://trac.webkit.org/changeset/139523> 805776 6 webkit.review.bot 2013-01-11 17:30:08 -0800 All reviewed patches have been landed. Closing bug. 182403 2013-01-11 13:21:41 -0800 2013-01-11 13:34:15 -0800 Patch bug-106694-20130111131843.patch text/plain 6506 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNhNjY5ZWY0NGYxNDcw ZTNmZGZhNjU0MjY5NzYzMzBhMDdkMzM3Ni4uMmM5OWUyNDY4YjVhZGEyNjEyODc5ZGI1MDY0Yjdm ODNkM2U4ODJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTExICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTW92ZSBjb25zdHJ1 Y3RUcmVlRnJvbUhUTUxUb2tlbiBpbnRvIEhUTUxEb2N1bWVudFBhcnNlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2Njk0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3YXkgaXQgd2lsbCBzaXQg cGFyYWxsZWwgdG8gYSBuZXcgY29uc3RydWN0VHJlZUZyb21Db21wYWN0SFRNTFRva2VuIG1ldGhv ZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tlbml6ZXIpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbUhUTUxUb2tlbik6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQ YXJzZXIuaDoKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAg ICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5oOgorICAgICAgICAoSFRNTFRyZWVC dWlsZGVyKToKKwogMjAxMy0wMS0xMCAgRGFuIEJlYW0gIDxkYmVhbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgSW1wbGVtZW50IEF1dG9jb21wbGV0ZUVycm9yRXZlbnQjcmVhc29uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAppbmRleCAw MWY2NTcwNDY0NWRmYjhhMDI1NzQzOWViMTYyZTE5ZmFlYmNjZmEwLi41MTg0Mjk4MDZiNjI2ZTBj MGUyNWNmYjQxNGZiYmFhYzAxNDc1NDMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTI3Myw3ICsyNzMsNyBAQCB2b2lkIEhU TUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkKICAg ICAgICAgICAgIG1feHNzQXVkaXRvci5maWx0ZXJUb2tlbihtX3Rva2VuKTsKICAgICAgICAgfQog Ci0gICAgICAgIG1fdHJlZUJ1aWxkZXItPmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4obV90b2tlbik7 CisgICAgICAgIGNvbnN0cnVjdFRyZWVGcm9tSFRNTFRva2VuKG1fdG9rZW4pOwogICAgICAgICBB U1NFUlQobV90b2tlbi5pc1VuaW5pdGlhbGl6ZWQoKSk7CiAgICAgfQogCkBAIC0yOTksNiArMjk5 LDM3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpwdW1wVG9rZW5pemVyKFN5bmNocm9ub3Vz TW9kZSBtb2RlKQogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkV3JpdGVIVE1MKGNv b2tpZSwgbV9pbnB1dC5jdXJyZW50KCkuY3VycmVudExpbmUoKS56ZXJvQmFzZWRJbnQoKSk7CiB9 CiAKK3ZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbUhUTUxUb2tlbihI VE1MVG9rZW4mIHJhd1Rva2VuKQoreworICAgIFJlZlB0cjxBdG9taWNIVE1MVG9rZW4+IHRva2Vu ID0gQXRvbWljSFRNTFRva2VuOjpjcmVhdGUocmF3VG9rZW4pOworCisgICAgLy8gV2UgY2xlYXIg dGhlIHJhd1Rva2VuIGluIGNhc2UgY29uc3RydWN0VHJlZUZyb21BdG9taWNUb2tlbgorICAgIC8v IHN5bmNocm9ub3VzbHkgcmUtZW50ZXJzIHRoZSBwYXJzZXIuIFdlIGRvbid0IGNsZWFyIHRoZSB0 b2tlbiBpbW1lZGF0ZWx5CisgICAgLy8gZm9yIENoYXJhY3RlciB0b2tlbnMgYmVjYXVzZSB0aGUg QXRvbWljSFRNTFRva2VuIGF2b2lkcyBjb3B5aW5nIHRoZQorICAgIC8vIGNoYXJhY3RlcnMgYnkg a2VlcGluZyBhIHBvaW50ZXIgdG8gdGhlIHVuZGVybHlpbmcgYnVmZmVyIGluIHRoZQorICAgIC8v IEhUTUxUb2tlbi4gRm9ydHVuYXRlbHksIENoYXJhY3RlciB0b2tlbnMgY2FuJ3QgY2F1c2UgdXMg dG8gcmUtZW50ZXIKKyAgICAvLyB0aGUgcGFyc2VyLgorICAgIC8vCisgICAgLy8gRklYTUU6IFN0 b3AgY2xlYXJpbmcgdGhlIHJhd1Rva2VuIG9uY2Ugd2Ugc3RhcnQgcnVubmluZyB0aGUgcGFyc2Vy IG9mZgorICAgIC8vIHRoZSBtYWluIHRocmVhZCBvciBvbmNlIHdlIHN0b3AgYWxsb3dpbmcgc3lu Y2hyb25vdXMgSmF2YVNjcmlwdAorICAgIC8vIGV4ZWN1dGlvbiBmcm9tIHBhcnNlQXR0cmlidXRl LgorICAgIGlmIChyYXdUb2tlbi50eXBlKCkgIT0gSFRNTFRva2VuVHlwZXM6OkNoYXJhY3RlcikK KyAgICAgICAgcmF3VG9rZW4uY2xlYXIoKTsKKworICAgIG1fdHJlZUJ1aWxkZXItPmNvbnN0cnVj dFRyZWVGcm9tQXRvbWljVG9rZW4odG9rZW4uZ2V0KCkpOworCisgICAgLy8gQXRvbWljSFRNTFRv a2VuIGtlZXBzIGEgcG9pbnRlciB0byB0aGUgSFRNTFRva2VuJ3MgYnVmZmVyIGluc3RlYWQKKyAg ICAvLyBvZiBjb3B5aW5nIHRoZSBjaGFyYWN0ZXJzIGZvciBwZXJmb3JtYW5jZS4KKyAgICAvLyBD bGVhciB0aGUgZXh0ZXJuYWwgY2hhcmFjdGVycyBwb2ludGVyIGJlZm9yZSB0aGUgcmF3IHRva2Vu IGlzIGNsZWFyZWQKKyAgICAvLyB0byBtYWtlIHN1cmUgdGhhdCB3ZSB3b24ndCBoYXZlIGEgZGFu Z2xpbmcgcG9pbnRlci4KKyAgICB0b2tlbi0+Y2xlYXJFeHRlcm5hbENoYXJhY3RlcnMoKTsKKwor ICAgIGlmICghcmF3VG9rZW4uaXNVbmluaXRpYWxpemVkKCkpIHsKKyAgICAgICAgQVNTRVJUKHJh d1Rva2VuLnR5cGUoKSA9PSBIVE1MVG9rZW5UeXBlczo6Q2hhcmFjdGVyKTsKKyAgICAgICAgcmF3 VG9rZW4uY2xlYXIoKTsKKyAgICB9Cit9CisKIGJvb2wgSFRNTERvY3VtZW50UGFyc2VyOjpoYXNJ bnNlcnRpb25Qb2ludCgpCiB7CiAgICAgLy8gRklYTUU6IFRoZSB3YXNDcmVhdGVkQnlTY3JpcHQo KSBicmFuY2ggaGVyZSBtaWdodCBub3QgYmUgZnVsbHkgY29ycmVjdC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oIGIvU291cmNlL1dl YkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggODZiYThiN2UxZWNh MTZkY2RiYTUwNjA4MTRlNjY5MWQxZTQzYjA0Yy4uOTU0NGIxYmQwZTEwNGI3MWVhNWIxNTQ0ZDc4 MGNkYjcxOTAxOGM2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRN TERvY3VtZW50UGFyc2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERv Y3VtZW50UGFyc2VyLmgKQEAgLTEyMSw2ICsxMjEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgY2Fu VGFrZU5leHRUb2tlbihTeW5jaHJvbm91c01vZGUsIFB1bXBTZXNzaW9uJik7CiAgICAgdm9pZCBw dW1wVG9rZW5pemVyKFN5bmNocm9ub3VzTW9kZSk7CiAgICAgdm9pZCBwdW1wVG9rZW5pemVySWZQ b3NzaWJsZShTeW5jaHJvbm91c01vZGUpOworICAgIHZvaWQgY29uc3RydWN0VHJlZUZyb21IVE1M VG9rZW4oSFRNTFRva2VuJik7CiAKICAgICB2b2lkIHJ1blNjcmlwdHNGb3JQYXVzZWRUcmVlQnVp bGRlcigpOwogICAgIHZvaWQgcmVzdW1lUGFyc2luZ0FmdGVyU2NyaXB0RXhlY3V0aW9uKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRleCBm ODI0ZWY1NWU1M2JjMDM5OGMxNWJhNTk4MjJiMzJiZDU2MmI0MzNlLi44YTE2ZDRlNzc2NTIxYzhm NzgyM2MxMWIwNDdiMTYwMjBhYjExMTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTM1OSwzNyArMzU5LDYgQEAgUGFzc1JlZlB0cjxF bGVtZW50PiBIVE1MVHJlZUJ1aWxkZXI6OnRha2VTY3JpcHRUb1Byb2Nlc3MoVGV4dFBvc2l0aW9u JiBzY3JpcHRTdGEKICAgICByZXR1cm4gbV9zY3JpcHRUb1Byb2Nlc3MucmVsZWFzZSgpOwogfQog Ci12b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbihIVE1MVG9rZW4m IHJhd1Rva2VuKQotewotICAgIFJlZlB0cjxBdG9taWNIVE1MVG9rZW4+IHRva2VuID0gQXRvbWlj SFRNTFRva2VuOjpjcmVhdGUocmF3VG9rZW4pOwotCi0gICAgLy8gV2UgY2xlYXIgdGhlIHJhd1Rv a2VuIGluIGNhc2UgY29uc3RydWN0VHJlZUZyb21BdG9taWNUb2tlbgotICAgIC8vIHN5bmNocm9u b3VzbHkgcmUtZW50ZXJzIHRoZSBwYXJzZXIuIFdlIGRvbid0IGNsZWFyIHRoZSB0b2tlbiBpbW1l ZGF0ZWx5Ci0gICAgLy8gZm9yIENoYXJhY3RlciB0b2tlbnMgYmVjYXVzZSB0aGUgQXRvbWljSFRN TFRva2VuIGF2b2lkcyBjb3B5aW5nIHRoZQotICAgIC8vIGNoYXJhY3RlcnMgYnkga2VlcGluZyBh IHBvaW50ZXIgdG8gdGhlIHVuZGVybHlpbmcgYnVmZmVyIGluIHRoZQotICAgIC8vIEhUTUxUb2tl bi4gRm9ydHVuYXRlbHksIENoYXJhY3RlciB0b2tlbnMgY2FuJ3QgY2F1c2UgdXNlIHRvIHJlLWVu dGVyCi0gICAgLy8gdGhlIHBhcnNlci4KLSAgICAvLwotICAgIC8vIEZJWE1FOiBTdG9wIGNsZWFy aW5nIHRoZSByYXdUb2tlbiBvbmNlIHdlIHN0YXJ0IHJ1bm5pbmcgdGhlIHBhcnNlciBvZmYKLSAg ICAvLyB0aGUgbWFpbiB0aHJlYWQgb3Igb25jZSB3ZSBzdG9wIGFsbG93aW5nIHN5bmNocm9ub3Vz IEphdmFTY3JpcHQKLSAgICAvLyBleGVjdXRpb24gZnJvbSBwYXJzZUF0dHJpYnV0ZS4KLSAgICBp ZiAocmF3VG9rZW4udHlwZSgpICE9IEhUTUxUb2tlblR5cGVzOjpDaGFyYWN0ZXIpCi0gICAgICAg IHJhd1Rva2VuLmNsZWFyKCk7Ci0KLSAgICBjb25zdHJ1Y3RUcmVlRnJvbUF0b21pY1Rva2VuKHRv a2VuLmdldCgpKTsKLQotICAgIC8vIEF0b21pY0hUTUxUb2tlbiBrZWVwcyBhIHBvaW50ZXIgdG8g dGhlIEhUTUxUb2tlbidzIGJ1ZmZlciBpbnN0ZWFkCi0gICAgLy8gb2YgY29weWluZyB0aGUgY2hh cmFjdGVycyBmb3IgcGVyZm9ybWFuY2UuCi0gICAgLy8gQ2xlYXIgdGhlIGV4dGVybmFsIGNoYXJh Y3RlcnMgcG9pbnRlciBiZWZvcmUgdGhlIHJhdyB0b2tlbiBpcyBjbGVhcmVkCi0gICAgLy8gdG8g bWFrZSBzdXJlIHRoYXQgd2Ugd29uJ3QgaGF2ZSBhIGRhbmdsaW5nIHBvaW50ZXIuCi0gICAgdG9r ZW4tPmNsZWFyRXh0ZXJuYWxDaGFyYWN0ZXJzKCk7Ci0KLSAgICBpZiAoIXJhd1Rva2VuLmlzVW5p bml0aWFsaXplZCgpKSB7Ci0gICAgICAgIEFTU0VSVChyYXdUb2tlbi50eXBlKCkgPT0gSFRNTFRv a2VuVHlwZXM6OkNoYXJhY3Rlcik7Ci0gICAgICAgIHJhd1Rva2VuLmNsZWFyKCk7Ci0gICAgfQot fQotCiB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y29uc3RydWN0VHJlZUZyb21BdG9taWNUb2tlbihB dG9taWNIVE1MVG9rZW4qIHRva2VuKQogewogICAgIGlmIChzaG91bGRQcm9jZXNzVG9rZW5JbkZv cmVpZ25Db250ZW50KHRva2VuKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxUcmVlQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRy ZWVCdWlsZGVyLmgKaW5kZXggN2EwZWVkOGMyM2RhYTY5MTJlYzhhYTdiZDIxNWE3YTdiYmU2ODQ5 MC4uNzA1MmE3NjFiYmRlNzRmODllYzY2YTA2ZjQ4NmUzMjI4OGQ4MGY1NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmgKQEAgLTc4LDggKzc4LDYgQEAg cHVibGljOgogCiAgICAgdm9pZCBkZXRhY2goKTsKIAotICAgIC8vIFRoZSB0b2tlbiByZWFsbHkg c2hvdWxkIGJlIHBhc3NlZCBhcyBhIGNvbnN0JiBzaW5jZSBpdCdzIG5ldmVyIG1vZGlmaWVkLgot ICAgIHZvaWQgY29uc3RydWN0VHJlZUZyb21Ub2tlbihIVE1MVG9rZW4mKTsKICAgICB2b2lkIGNv bnN0cnVjdFRyZWVGcm9tQXRvbWljVG9rZW4oQXRvbWljSFRNTFRva2VuKik7CiAKICAgICBib29s IGhhc1BhcnNlckJsb2NraW5nU2NyaXB0KCkgY29uc3QgeyByZXR1cm4gISFtX3NjcmlwdFRvUHJv Y2VzczsgfQo= 182408 2013-01-11 13:34:41 -0800 2013-01-11 17:30:04 -0800 Patch bug-106694-20130111133144.patch text/plain 7645 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5Mzc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNhNjY5ZWY0NGYxNDcw ZTNmZGZhNjU0MjY5NzYzMzBhMDdkMzM3Ni4uMmM5OWUyNDY4YjVhZGEyNjEyODc5ZGI1MDY0Yjdm ODNkM2U4ODJhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTExICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTW92ZSBjb25zdHJ1 Y3RUcmVlRnJvbUhUTUxUb2tlbiBpbnRvIEhUTUxEb2N1bWVudFBhcnNlcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA2Njk0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyB3YXkgaXQgd2lsbCBzaXQg cGFyYWxsZWwgdG8gYSBuZXcgY29uc3RydWN0VHJlZUZyb21Db21wYWN0SFRNTFRva2VuIG1ldGhv ZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYmVjYXVzZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIGh0bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIVE1MRG9jdW1lbnRQYXJzZXI6OnB1bXBUb2tlbml6ZXIpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTERvY3VtZW50UGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbUhUTUxUb2tlbik6 CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQ YXJzZXIuaDoKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwOgorICAg ICAgICAqIGh0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5oOgorICAgICAgICAoSFRNTFRyZWVC dWlsZGVyKToKKwogMjAxMy0wMS0xMCAgRGFuIEJlYW0gIDxkYmVhbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgSW1wbGVtZW50IEF1dG9jb21wbGV0ZUVycm9yRXZlbnQjcmVhc29uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmNwcAppbmRleCAw MWY2NTcwNDY0NWRmYjhhMDI1NzQzOWViMTYyZTE5ZmFlYmNjZmEwLi45OWU3OWU1MGNmNjllOTBm ZWVkOThkZWFkMWQ5MTQ4MTI3NWFjMmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3BhcnNlci9IVE1MRG9jdW1lbnRQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv cGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5jcHAKQEAgLTI3Myw3ICsyNzMsNyBAQCB2b2lkIEhU TUxEb2N1bWVudFBhcnNlcjo6cHVtcFRva2VuaXplcihTeW5jaHJvbm91c01vZGUgbW9kZSkKICAg ICAgICAgICAgIG1feHNzQXVkaXRvci5maWx0ZXJUb2tlbihtX3Rva2VuKTsKICAgICAgICAgfQog Ci0gICAgICAgIG1fdHJlZUJ1aWxkZXItPmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4obV90b2tlbik7 CisgICAgICAgIGNvbnN0cnVjdFRyZWVGcm9tSFRNTFRva2VuKG1fdG9rZW4pOwogICAgICAgICBB U1NFUlQobV90b2tlbi5pc1VuaW5pdGlhbGl6ZWQoKSk7CiAgICAgfQogCkBAIC0yOTksNiArMjk5 LDM3IEBAIHZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpwdW1wVG9rZW5pemVyKFN5bmNocm9ub3Vz TW9kZSBtb2RlKQogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkV3JpdGVIVE1MKGNv b2tpZSwgbV9pbnB1dC5jdXJyZW50KCkuY3VycmVudExpbmUoKS56ZXJvQmFzZWRJbnQoKSk7CiB9 CiAKK3ZvaWQgSFRNTERvY3VtZW50UGFyc2VyOjpjb25zdHJ1Y3RUcmVlRnJvbUhUTUxUb2tlbihI VE1MVG9rZW4mIHJhd1Rva2VuKQoreworICAgIFJlZlB0cjxBdG9taWNIVE1MVG9rZW4+IHRva2Vu ID0gQXRvbWljSFRNTFRva2VuOjpjcmVhdGUocmF3VG9rZW4pOworCisgICAgLy8gV2UgY2xlYXIg dGhlIHJhd1Rva2VuIGluIGNhc2UgY29uc3RydWN0VHJlZUZyb21BdG9taWNUb2tlbgorICAgIC8v IHN5bmNocm9ub3VzbHkgcmUtZW50ZXJzIHRoZSBwYXJzZXIuIFdlIGRvbid0IGNsZWFyIHRoZSB0 b2tlbiBpbW1lZGF0ZWx5CisgICAgLy8gZm9yIENoYXJhY3RlciB0b2tlbnMgYmVjYXVzZSB0aGUg QXRvbWljSFRNTFRva2VuIGF2b2lkcyBjb3B5aW5nIHRoZQorICAgIC8vIGNoYXJhY3RlcnMgYnkg a2VlcGluZyBhIHBvaW50ZXIgdG8gdGhlIHVuZGVybHlpbmcgYnVmZmVyIGluIHRoZQorICAgIC8v IEhUTUxUb2tlbi4gRm9ydHVuYXRlbHksIENoYXJhY3RlciB0b2tlbnMgY2FuJ3QgY2F1c2UgdXMg dG8gcmUtZW50ZXIKKyAgICAvLyB0aGUgcGFyc2VyLgorICAgIC8vCisgICAgLy8gRklYTUU6IFN0 b3AgY2xlYXJpbmcgdGhlIHJhd1Rva2VuIG9uY2Ugd2Ugc3RhcnQgcnVubmluZyB0aGUgcGFyc2Vy IG9mZgorICAgIC8vIHRoZSBtYWluIHRocmVhZCBvciBvbmNlIHdlIHN0b3AgYWxsb3dpbmcgc3lu Y2hyb25vdXMgSmF2YVNjcmlwdAorICAgIC8vIGV4ZWN1dGlvbiBmcm9tIHBhcnNlQXR0cmlidXRl LgorICAgIGlmIChyYXdUb2tlbi50eXBlKCkgIT0gSFRNTFRva2VuVHlwZXM6OkNoYXJhY3RlcikK KyAgICAgICAgcmF3VG9rZW4uY2xlYXIoKTsKKworICAgIG1fdHJlZUJ1aWxkZXItPmNvbnN0cnVj dFRyZWUodG9rZW4uZ2V0KCkpOworCisgICAgLy8gQXRvbWljSFRNTFRva2VuIGtlZXBzIGEgcG9p bnRlciB0byB0aGUgSFRNTFRva2VuJ3MgYnVmZmVyIGluc3RlYWQKKyAgICAvLyBvZiBjb3B5aW5n IHRoZSBjaGFyYWN0ZXJzIGZvciBwZXJmb3JtYW5jZS4KKyAgICAvLyBDbGVhciB0aGUgZXh0ZXJu YWwgY2hhcmFjdGVycyBwb2ludGVyIGJlZm9yZSB0aGUgcmF3IHRva2VuIGlzIGNsZWFyZWQKKyAg ICAvLyB0byBtYWtlIHN1cmUgdGhhdCB3ZSB3b24ndCBoYXZlIGEgZGFuZ2xpbmcgcG9pbnRlci4K KyAgICB0b2tlbi0+Y2xlYXJFeHRlcm5hbENoYXJhY3RlcnMoKTsKKworICAgIGlmICghcmF3VG9r ZW4uaXNVbmluaXRpYWxpemVkKCkpIHsKKyAgICAgICAgQVNTRVJUKHJhd1Rva2VuLnR5cGUoKSA9 PSBIVE1MVG9rZW5UeXBlczo6Q2hhcmFjdGVyKTsKKyAgICAgICAgcmF3VG9rZW4uY2xlYXIoKTsK KyAgICB9Cit9CisKIGJvb2wgSFRNTERvY3VtZW50UGFyc2VyOjpoYXNJbnNlcnRpb25Qb2ludCgp CiB7CiAgICAgLy8gRklYTUU6IFRoZSB3YXNDcmVhdGVkQnlTY3JpcHQoKSBicmFuY2ggaGVyZSBt aWdodCBub3QgYmUgZnVsbHkgY29ycmVjdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvcGFyc2VyL0hUTUxEb2N1bWVudFBhcnNlci5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvSFRNTERvY3VtZW50UGFyc2VyLmgKaW5kZXggODZiYThiN2UxZWNhMTZkY2RiYTUwNjA4MTRl NjY5MWQxZTQzYjA0Yy4uOTU0NGIxYmQwZTEwNGI3MWVhNWIxNTQ0ZDc4MGNkYjcxOTAxOGM2ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2Vy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTERvY3VtZW50UGFyc2VyLmgK QEAgLTEyMSw2ICsxMjEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgY2FuVGFrZU5leHRUb2tlbihT eW5jaHJvbm91c01vZGUsIFB1bXBTZXNzaW9uJik7CiAgICAgdm9pZCBwdW1wVG9rZW5pemVyKFN5 bmNocm9ub3VzTW9kZSk7CiAgICAgdm9pZCBwdW1wVG9rZW5pemVySWZQb3NzaWJsZShTeW5jaHJv bm91c01vZGUpOworICAgIHZvaWQgY29uc3RydWN0VHJlZUZyb21IVE1MVG9rZW4oSFRNTFRva2Vu Jik7CiAKICAgICB2b2lkIHJ1blNjcmlwdHNGb3JQYXVzZWRUcmVlQnVpbGRlcigpOwogICAgIHZv aWQgcmVzdW1lUGFyc2luZ0FmdGVyU2NyaXB0RXhlY3V0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcAppbmRleCBmODI0ZWY1NWU1M2JjMDM5 OGMxNWJhNTk4MjJiMzJiZDU2MmI0MzNlLi4xZTUzYzc0OGYyZmM4MzZiMTAzNGIyNDM1MTIzZDli ZjMyZjkxMWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJl ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVp bGRlci5jcHAKQEAgLTM1OSwzOCArMzU5LDcgQEAgUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MVHJl ZUJ1aWxkZXI6OnRha2VTY3JpcHRUb1Byb2Nlc3MoVGV4dFBvc2l0aW9uJiBzY3JpcHRTdGEKICAg ICByZXR1cm4gbV9zY3JpcHRUb1Byb2Nlc3MucmVsZWFzZSgpOwogfQogCi12b2lkIEhUTUxUcmVl QnVpbGRlcjo6Y29uc3RydWN0VHJlZUZyb21Ub2tlbihIVE1MVG9rZW4mIHJhd1Rva2VuKQotewot ICAgIFJlZlB0cjxBdG9taWNIVE1MVG9rZW4+IHRva2VuID0gQXRvbWljSFRNTFRva2VuOjpjcmVh dGUocmF3VG9rZW4pOwotCi0gICAgLy8gV2UgY2xlYXIgdGhlIHJhd1Rva2VuIGluIGNhc2UgY29u c3RydWN0VHJlZUZyb21BdG9taWNUb2tlbgotICAgIC8vIHN5bmNocm9ub3VzbHkgcmUtZW50ZXJz IHRoZSBwYXJzZXIuIFdlIGRvbid0IGNsZWFyIHRoZSB0b2tlbiBpbW1lZGF0ZWx5Ci0gICAgLy8g Zm9yIENoYXJhY3RlciB0b2tlbnMgYmVjYXVzZSB0aGUgQXRvbWljSFRNTFRva2VuIGF2b2lkcyBj b3B5aW5nIHRoZQotICAgIC8vIGNoYXJhY3RlcnMgYnkga2VlcGluZyBhIHBvaW50ZXIgdG8gdGhl IHVuZGVybHlpbmcgYnVmZmVyIGluIHRoZQotICAgIC8vIEhUTUxUb2tlbi4gRm9ydHVuYXRlbHks IENoYXJhY3RlciB0b2tlbnMgY2FuJ3QgY2F1c2UgdXNlIHRvIHJlLWVudGVyCi0gICAgLy8gdGhl IHBhcnNlci4KLSAgICAvLwotICAgIC8vIEZJWE1FOiBTdG9wIGNsZWFyaW5nIHRoZSByYXdUb2tl biBvbmNlIHdlIHN0YXJ0IHJ1bm5pbmcgdGhlIHBhcnNlciBvZmYKLSAgICAvLyB0aGUgbWFpbiB0 aHJlYWQgb3Igb25jZSB3ZSBzdG9wIGFsbG93aW5nIHN5bmNocm9ub3VzIEphdmFTY3JpcHQKLSAg ICAvLyBleGVjdXRpb24gZnJvbSBwYXJzZUF0dHJpYnV0ZS4KLSAgICBpZiAocmF3VG9rZW4udHlw ZSgpICE9IEhUTUxUb2tlblR5cGVzOjpDaGFyYWN0ZXIpCi0gICAgICAgIHJhd1Rva2VuLmNsZWFy KCk7Ci0KLSAgICBjb25zdHJ1Y3RUcmVlRnJvbUF0b21pY1Rva2VuKHRva2VuLmdldCgpKTsKLQot ICAgIC8vIEF0b21pY0hUTUxUb2tlbiBrZWVwcyBhIHBvaW50ZXIgdG8gdGhlIEhUTUxUb2tlbidz IGJ1ZmZlciBpbnN0ZWFkCi0gICAgLy8gb2YgY29weWluZyB0aGUgY2hhcmFjdGVycyBmb3IgcGVy Zm9ybWFuY2UuCi0gICAgLy8gQ2xlYXIgdGhlIGV4dGVybmFsIGNoYXJhY3RlcnMgcG9pbnRlciBi ZWZvcmUgdGhlIHJhdyB0b2tlbiBpcyBjbGVhcmVkCi0gICAgLy8gdG8gbWFrZSBzdXJlIHRoYXQg d2Ugd29uJ3QgaGF2ZSBhIGRhbmdsaW5nIHBvaW50ZXIuCi0gICAgdG9rZW4tPmNsZWFyRXh0ZXJu YWxDaGFyYWN0ZXJzKCk7Ci0KLSAgICBpZiAoIXJhd1Rva2VuLmlzVW5pbml0aWFsaXplZCgpKSB7 Ci0gICAgICAgIEFTU0VSVChyYXdUb2tlbi50eXBlKCkgPT0gSFRNTFRva2VuVHlwZXM6OkNoYXJh Y3Rlcik7Ci0gICAgICAgIHJhd1Rva2VuLmNsZWFyKCk7Ci0gICAgfQotfQotCi12b2lkIEhUTUxU cmVlQnVpbGRlcjo6Y29uc3RydWN0VHJlZUZyb21BdG9taWNUb2tlbihBdG9taWNIVE1MVG9rZW4q IHRva2VuKQordm9pZCBIVE1MVHJlZUJ1aWxkZXI6OmNvbnN0cnVjdFRyZWUoQXRvbWljSFRNTFRv a2VuKiB0b2tlbikKIHsKICAgICBpZiAoc2hvdWxkUHJvY2Vzc1Rva2VuSW5Gb3JlaWduQ29udGVu dCh0b2tlbikpCiAgICAgICAgIHByb2Nlc3NUb2tlbkluRm9yZWlnbkNvbnRlbnQodG9rZW4pOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1aWxkZXIuaAppbmRleCA3YTBl ZWQ4YzIzZGFhNjkxMmVjOGFhN2JkMjE1YTdhN2JiZTY4NDkwLi40N2UxZDgyNWY1ZDU4MzEwNjlh MDcyMWE1MDAyZWYzOTAwOGM2MGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MVHJlZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9I VE1MVHJlZUJ1aWxkZXIuaApAQCAtNzgsOSArNzgsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRl dGFjaCgpOwogCi0gICAgLy8gVGhlIHRva2VuIHJlYWxseSBzaG91bGQgYmUgcGFzc2VkIGFzIGEg Y29uc3QmIHNpbmNlIGl0J3MgbmV2ZXIgbW9kaWZpZWQuCi0gICAgdm9pZCBjb25zdHJ1Y3RUcmVl RnJvbVRva2VuKEhUTUxUb2tlbiYpOwotICAgIHZvaWQgY29uc3RydWN0VHJlZUZyb21BdG9taWNU b2tlbihBdG9taWNIVE1MVG9rZW4qKTsKKyAgICB2b2lkIGNvbnN0cnVjdFRyZWUoQXRvbWljSFRN TFRva2VuKik7CiAKICAgICBib29sIGhhc1BhcnNlckJsb2NraW5nU2NyaXB0KCkgY29uc3QgeyBy ZXR1cm4gISFtX3NjcmlwdFRvUHJvY2VzczsgfQogICAgIC8vIE11c3QgYmUgY2FsbGVkIHRvIHRh a2UgdGhlIHBhcnNlci1ibG9ja2luZyBzY3JpcHQgYmVmb3JlIGNhbGxpbmcgdGhlIHBhcnNlciBh Z2Fpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1RleHREb2N1bWVu dFBhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9UZXh0RG9jdW1lbnRQYXJz ZXIuY3BwCmluZGV4IGUzOGQwZTBjNGZkZGFmYTY1Y2NjOGZlZWUwZjBjNThiNjY2OTQzYTUuLmEw Nzk3YjkzYWU4ZTVkMjJiNjk2YzZlZDRlYmZiNTIyOTgxNmU5MGIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvcGFyc2VyL1RleHREb2N1bWVudFBhcnNlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvVGV4dERvY3VtZW50UGFyc2VyLmNwcApAQCAtNjQsNyArNjQs NyBAQCB2b2lkIFRleHREb2N1bWVudFBhcnNlcjo6aW5zZXJ0RmFrZVByZUVsZW1lbnQoKQogICAg IGF0dHJpYnV0ZXMuYXBwZW5kKEF0dHJpYnV0ZShzdHlsZUF0dHIsICJ3b3JkLXdyYXA6IGJyZWFr LXdvcmQ7IHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsiKSk7CiAgICAgUmVmUHRyPEF0b21pY0hUTUxU b2tlbj4gZmFrZVByZSA9IEF0b21pY0hUTUxUb2tlbjo6Y3JlYXRlKEhUTUxUb2tlblR5cGVzOjpT dGFydFRhZywgcHJlVGFnLmxvY2FsTmFtZSgpLCBhdHRyaWJ1dGVzKTsKIAotICAgIHRyZWVCdWls ZGVyKCktPmNvbnN0cnVjdFRyZWVGcm9tQXRvbWljVG9rZW4oZmFrZVByZS5nZXQoKSk7CisgICAg dHJlZUJ1aWxkZXIoKS0+Y29uc3RydWN0VHJlZShmYWtlUHJlLmdldCgpKTsKICAgICAvLyBOb3Jt YWxseSB3ZSB3b3VsZCBza2lwIHRoZSBmaXJzdCBcbiBhZnRlciBhIDxwcmU+IGVsZW1lbnQsIGJ1 dCB3ZSBkb24ndAogICAgIC8vIHdhbnQgdG8gc2tpcCB0aGUgZmlyc3QgXG4gZm9yIHRleHQgZG9j dW1lbnRzIQogICAgIHRyZWVCdWlsZGVyKCktPnNldFNob3VsZFNraXBMZWFkaW5nTmV3bGluZShm YWxzZSk7Cg==