39272 2010-05-17 23:56:46 -0700 Rename HTML5Tokenzier to HTML5Lexer so that we can add a new HTML5Tokenizer which implements Tokenizer 2010-05-18 00:00:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 eric webkit-unassigned abarth oldest_to_newest 227158 0 eric 2010-05-17 23:56:46 -0700 Rename HTML5Tokenzier to HTML5Lexer so that we can add a new HTML5Tokenizer which implements Tokenizer 227159 1 56328 eric 2010-05-17 23:57:58 -0700 Created attachment 56328 Patch 227160 2 56328 abarth 2010-05-17 23:58:49 -0700 Comment on attachment 56328 Patch Ok. Conflicts ahoy! 227161 3 eric 2010-05-18 00:00:26 -0700 Committed r59657: <http://trac.webkit.org/changeset/59657> 56328 2010-05-17 23:57:58 -0700 2010-05-17 23:58:48 -0700 Patch bug-39272-20100517235757.patch text/plain 10208 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWNjYzZhZmQwZTc4ZDg3ZDRhYWEzZGJmMTRmZWUxMjBiZjdiN2QyNS4uNGQxYTY5MzI2NWI1NzU3 YmI4YzUyNDlmZjNiNzQxYzNmZmUwM2NlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wNS0xNyAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIEhUTUw1VG9rZW56aWVyIHRvIEhUTUw1TGV4ZXIg c28gdGhhdCB3ZSBjYW4gYWRkIGEgbmV3IEhUTUw1VG9rZW5pemVyIHdoaWNoIGltcGxlbWVudHMg VG9rZW5pemVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTI3MgorCisgICAgICAgIFN0cmljdGx5IGEgcmVuYW1lLCBubyBmdW5jdGlvbmFsaXR5IGNo YW5nZS4KKworICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAg ICAgICAgKiBodG1sL0hUTUw1TGV4ZXIuY3BwOiBBZGRlZC4KKyAgICAgICAgKiBodG1sL0hUTUw1 TGV4ZXIuaDogQWRkZWQuCisgICAgICAgICogaHRtbC9IVE1MNVRva2VuaXplci5jcHA6IFJlbW92 ZWQuCisgICAgICAgICogaHRtbC9IVE1MNVRva2VuaXplci5oOiBSZW1vdmVkLgorCiAyMDEwLTA1 LTE3ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAg ICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNTk2NTIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDY0MWVlYmVkNjE4MDZlMTFmY2I2MjFjOWIwMDBjNzgw ZWMxNzk2OWUuLmVhNmRiNTVmYzZiN2ZkMGQ3NzdjZmJkZDg0OGMyYTM4NzdiMDdkMTQgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yNTQ0LDggKzI1NDQs OCBAQAogCQk5N0RDRTIwMjEwODA3Qzc1MDA1N0QzOTQgLyogSGlzdG9yeUNvbnRyb2xsZXIuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3RENFMjAwMTA4 MDdDNzUwMDU3RDM5NCAvKiBIaXN0b3J5Q29udHJvbGxlci5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTk3REQ0RDg2MEZERjRENkUwMEVDRjlBNCAv KiBYU1NBdWRpdG9yLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDk3REQ0RDg0MEZERjRENkQwMEVDRjlBNCAvKiBYU1NBdWRpdG9yLmNwcCAqLzsgfTsK IAkJOTdERDREODcwRkRGNEQ2RTAwRUNGOUE0IC8qIFhTU0F1ZGl0b3IuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3REQ0RDg1MEZERjRENkUwMEVDRjlB NCAvKiBYU1NBdWRpdG9yLmggKi87IH07Ci0JCTk3RThCMzU2MTFBMjNDRTIwMDE2OTQwOSAvKiBI VE1MNVRva2VuaXplci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA5N0U4QjM1NDExQTIzQ0UyMDAxNjk0MDkgLyogSFRNTDVUb2tlbml6ZXIuY3BwICov OyB9OwotCQk5N0U4QjM1NzExQTIzQ0UyMDAxNjk0MDkgLyogSFRNTDVUb2tlbml6ZXIuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3RThCMzU1MTFBMjND RTIwMDE2OTQwOSAvKiBIVE1MNVRva2VuaXplci5oICovOyB9OworCQk5N0U4QjM1NjExQTIzQ0Uy MDAxNjk0MDkgLyogSFRNTDVMZXhlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA5N0U4QjM1NDExQTIzQ0UyMDAxNjk0MDkgLyogSFRNTDVMZXhlci5j cHAgKi87IH07CisJCTk3RThCMzU3MTFBMjNDRTIwMDE2OTQwOSAvKiBIVE1MNUxleGVyLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5N0U4QjM1NTExQTIz Q0UyMDAxNjk0MDkgLyogSFRNTDVMZXhlci5oICovOyB9OwogCQk5N0VGN0RGRTEwN0U1NUI3MDBE N0M0OUMgLyogU2NyaXB0Q29udHJvbGxlckJhc2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTdFRjdERkQxMDdFNTVCNzAwRDdDNDlDIC8qIFNjcmlw dENvbnRyb2xsZXJCYXNlLmNwcCAqLzsgfTsKIAkJOUY2RkMxOTYxMTIyRTgyQTAwRTgwMTk2IC8q IFNjcmlwdERlYnVnU2VydmVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDlGNkZDMTk0MTEyMkU4MkEwMEU4MDE5NiAvKiBTY3JpcHREZWJ1Z1NlcnZl ci5jcHAgKi87IH07CiAJCTlGNkZDMTk3MTEyMkU4MkEwMEU4MDE5NiAvKiBTY3JpcHREZWJ1Z1Nl cnZlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOUY2 RkMxOTUxMTIyRTgyQTAwRTgwMTk2IC8qIFNjcmlwdERlYnVnU2VydmVyLmggKi87IHNldHRpbmdz ID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKQEAgLTgwODksOCArODA4OSw4IEBA CiAJCTk3RENFMjAwMTA4MDdDNzUwMDU3RDM5NCAvKiBIaXN0b3J5Q29udHJvbGxlci5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBIaXN0b3J5Q29udHJvbGxlci5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk5N0RENEQ4NDBGREY0RDZEMDBFQ0Y5QTQgLyogWFNTQXVk aXRvci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBYU1NBdWRpdG9y LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTdERDREODUwRkRGNEQ2RTAwRUNG OUE0IC8qIFhTU0F1ZGl0b3IuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gWFNT QXVkaXRvci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk5N0U4QjM1NDExQTIzQ0Uy MDAxNjk0MDkgLyogSFRNTDVUb2tlbml6ZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAu Y3BwOyBwYXRoID0gSFRNTDVUb2tlbml6ZXIuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwotCQk5N0U4QjM1NTExQTIzQ0UyMDAxNjk0MDkgLyogSFRNTDVUb2tlbml6ZXIuaCAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gSFRNTDVUb2tlbml6ZXIuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJOTdFOEIzNTQxMUEyM0NFMjAwMTY5NDA5IC8qIEhUTUw1TGV4ZXIu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSFRNTDVMZXhlci5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTk3RThCMzU1MTFBMjNDRTIwMDE2OTQwOSAv KiBIVE1MNUxleGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEhUTUw1TGV4 ZXIuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTdFRjdERkQxMDdFNTVCNzAwRDdD NDlDIC8qIFNjcmlwdENvbnRyb2xsZXJCYXNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw LmNwcDsgcGF0aCA9IFNjcmlwdENvbnRyb2xsZXJCYXNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJOUY2RkMxOTQxMTIyRTgyQTAwRTgwMTk2IC8qIFNjcmlwdERlYnVnU2VydmVy LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcmlwdERlYnVnU2Vy dmVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOUY2RkMxOTUxMTIyRTgyQTAw RTgwMTk2IC8qIFNjcmlwdERlYnVnU2VydmVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IFNjcmlwdERlYnVnU2VydmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0xMzMwNyw4ICsxMzMwNyw4IEBACiAJCQkJODk1MjUzREUxMTZDNEYwNjAwQ0FCRjAwIC8qIEZp bGVUaHJlYWRUYXNrLmggKi8sCiAJCQkJQTgxMzZEMzcwOTczQThFNzAwRDc0NDYzIC8qIEZvcm1E YXRhTGlzdC5jcHAgKi8sCiAJCQkJQTgxMzZEMzYwOTczQThFNzAwRDc0NDYzIC8qIEZvcm1EYXRh TGlzdC5oICovLAotCQkJCTk3RThCMzU0MTFBMjNDRTIwMDE2OTQwOSAvKiBIVE1MNVRva2VuaXpl ci5jcHAgKi8sCi0JCQkJOTdFOEIzNTUxMUEyM0NFMjAwMTY5NDA5IC8qIEhUTUw1VG9rZW5pemVy LmggKi8sCisJCQkJOTdFOEIzNTQxMUEyM0NFMjAwMTY5NDA5IC8qIEhUTUw1TGV4ZXIuY3BwICov LAorCQkJCTk3RThCMzU1MTFBMjNDRTIwMDE2OTQwOSAvKiBIVE1MNUxleGVyLmggKi8sCiAJCQkJ QkM5N0UyMzkxMDkxNDQ5NTAwMTBEMzYxIC8qIEhUTUxBbGxDb2xsZWN0aW9uLmNwcCAqLywKIAkJ CQlCQzk3RTIzODEwOTE0NDk1MDAxMEQzNjEgLyogSFRNTEFsbENvbGxlY3Rpb24uaCAqLywKIAkJ CQlCQzk3RTIzQzEwOTE0NkYxMDAxMEQzNjEgLyogSFRNTEFsbENvbGxlY3Rpb24uaWRsICovLApA QCAtMTkyNTcsNyArMTkyNTcsNyBAQAogCQkJCUM1NkM5MUExMTE5RDkxODEwMERFNENEOSAvKiBK U0lEQkVycm9yRXZlbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCUM1NkM5MUEzMTE5RDkxODEwMERF NENEOSAvKiBKU0lEQkV2ZW50LmggaW4gSGVhZGVycyAqLywKIAkJCQlDNTZDOTFBNzExOUQ5MTg3 MDBERTRDRDkgLyogSlNJREJTdWNjZXNzRXZlbnQuaCBpbiBIZWFkZXJzICovLAotCQkJCTk3RThC MzU3MTFBMjNDRTIwMDE2OTQwOSAvKiBIVE1MNVRva2VuaXplci5oIGluIEhlYWRlcnMgKi8sCisJ CQkJOTdFOEIzNTcxMUEyM0NFMjAwMTY5NDA5IC8qIEhUTUw1TGV4ZXIuaCBpbiBIZWFkZXJzICov LAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9 OwpAQCAtMjE1MzgsNyArMjE1MzgsNyBAQAogCQkJCUM1NkM5MUEwMTE5RDkxODEwMERFNENEOSAv KiBKU0lEQkVycm9yRXZlbnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQzU2QzkxQTIxMTlEOTE4 MTAwREU0Q0Q5IC8qIEpTSURCRXZlbnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQzU2QzkxQTYx MTlEOTE4NzAwREU0Q0Q5IC8qIEpTSURCU3VjY2Vzc0V2ZW50LmNwcCBpbiBTb3VyY2VzICovLAot CQkJCTk3RThCMzU2MTFBMjNDRTIwMDE2OTQwOSAvKiBIVE1MNVRva2VuaXplci5jcHAgaW4gU291 cmNlcyAqLywKKwkJCQk5N0U4QjM1NjExQTIzQ0UyMDAxNjk0MDkgLyogSFRNTDVMZXhlci5jcHAg aW4gU291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNz aW5nID0gMDsKIAkJfTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5j cHAgYi9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5jcHAKc2ltaWxhcml0eSBpbmRleCA5NSUKcmVu YW1lIGZyb20gV2ViQ29yZS9odG1sL0hUTUw1VG9rZW5pemVyLmNwcApyZW5hbWUgdG8gV2ViQ29y ZS9odG1sL0hUTUw1TGV4ZXIuY3BwCmluZGV4IDgyM2NhZTliOTEzMzFlZDg5ZjIwM2E2MjhmMWI5 YzcwYzAxZDVhMTIuLjY5MzFkMjFkNzA4ZGIxM2IzZDAwZjVmNWZjNDYyZjA1YjM0ODVkOTQgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MNVRva2VuaXplci5jcHAKKysrIGIvV2ViQ29yZS9o dG1sL0hUTUw1TGV4ZXIuY3BwCkBAIC0yNiw3ICsyNiw3IEBACiAgKi8KIAogI2luY2x1ZGUgImNv bmZpZy5oIgotI2luY2x1ZGUgIkhUTUw1VG9rZW5pemVyLmgiCisjaW5jbHVkZSAiSFRNTDVMZXhl ci5oIgogCiAjaW5jbHVkZSAiQXRvbWljU3RyaW5nLmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgi CkBAIC01NCwyNCArNTQsMjQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3Bh Y2UgSFRNTE5hbWVzOwogCi1IVE1MNVRva2VuaXplcjo6SFRNTDVUb2tlbml6ZXIoKQorSFRNTDVM ZXhlcjo6SFRNTDVMZXhlcigpCiB7CiB9CiAKLUhUTUw1VG9rZW5pemVyOjp+SFRNTDVUb2tlbml6 ZXIoKQorSFRNTDVMZXhlcjo6fkhUTUw1TGV4ZXIoKQogewogfQogCi12b2lkIEhUTUw1VG9rZW5p emVyOjpiZWdpbigpIAordm9pZCBIVE1MNUxleGVyOjpiZWdpbigpIAogeyAKICAgICByZXNldCgp OyAKIH0KIAotdm9pZCBIVE1MNVRva2VuaXplcjo6ZW5kKCkgCit2b2lkIEhUTUw1TGV4ZXI6OmVu ZCgpIAogewogfQogCi12b2lkIEhUTUw1VG9rZW5pemVyOjpyZXNldCgpCit2b2lkIEhUTUw1TGV4 ZXI6OnJlc2V0KCkKIHsKICAgICBtX3NvdXJjZS5jbGVhcigpOwogCkBAIC05MCw3ICs5MCw3IEBA IHZvaWQgSFRNTDVUb2tlbml6ZXI6OnJlc2V0KCkKICAgICBjbGVhckxhc3RDaGFyYWN0ZXJzKCk7 CiB9CiAKLXZvaWQgSFRNTDVUb2tlbml6ZXI6OndyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmluZyYg c291cmNlKQordm9pZCBIVE1MNUxleGVyOjp3cml0ZShjb25zdCBTZWdtZW50ZWRTdHJpbmcmIHNv dXJjZSkKIHsKICAgICB0b2tlbml6ZShzb3VyY2UpOwogfQpAQCAtMTAwLDE4ICsxMDAsMTggQEAg c3RhdGljIGlubGluZSBib29sIGlzV2hpdGVzcGFjZShVQ2hhciBjKQogICAgIHJldHVybiBjID09 ICcgJyB8fCBjID09ICdcbicgfHwgYyA9PSAnXHInIHx8IGMgPT0gJ1x0JzsKIH0KIAotaW5saW5l IHZvaWQgSFRNTDVUb2tlbml6ZXI6OmNsZWFyTGFzdENoYXJhY3RlcnMoKQoraW5saW5lIHZvaWQg SFRNTDVMZXhlcjo6Y2xlYXJMYXN0Q2hhcmFjdGVycygpCiB7CiAgICAgbWVtc2V0KG1fbGFzdENo YXJhY3RlcnMsIDAsIGxhc3RDaGFyYWN0ZXJzQnVmZmVyU2l6ZSAqIHNpemVvZihVQ2hhcikpOwog fQogCi1pbmxpbmUgdm9pZCBIVE1MNVRva2VuaXplcjo6cmVtZW1iZXJDaGFyYWN0ZXIoVUNoYXIg YykKK2lubGluZSB2b2lkIEhUTUw1TGV4ZXI6OnJlbWVtYmVyQ2hhcmFjdGVyKFVDaGFyIGMpCiB7 CiAgICAgbV9sYXN0Q2hhcmFjdGVySW5kZXggPSAobV9sYXN0Q2hhcmFjdGVySW5kZXggKyAxKSAl IGxhc3RDaGFyYWN0ZXJzQnVmZmVyU2l6ZTsKICAgICBtX2xhc3RDaGFyYWN0ZXJzW21fbGFzdENo YXJhY3RlckluZGV4XSA9IGM7CiB9CiAKLWlubGluZSBib29sIEhUTUw1VG9rZW5pemVyOjpsYXN0 Q2hhcmFjdGVyc01hdGNoKGNvbnN0IGNoYXIqIGNoYXJzLCB1bnNpZ25lZCBjb3VudCkgY29uc3QK K2lubGluZSBib29sIEhUTUw1TGV4ZXI6Omxhc3RDaGFyYWN0ZXJzTWF0Y2goY29uc3QgY2hhciog Y2hhcnMsIHVuc2lnbmVkIGNvdW50KSBjb25zdAogewogICAgIHVuc2lnbmVkIHBvcyA9IG1fbGFz dENoYXJhY3RlckluZGV4OwogICAgIHdoaWxlIChjb3VudCkgewpAQCAtMTMzLDcgKzEzMyw3IEBA IHN0YXRpYyBpbmxpbmUgdW5zaWduZWQgbGVnYWxFbnRpdHlGb3IodW5zaWduZWQgdmFsdWUpCiAg ICAgcmV0dXJuIHZhbHVlOwogfQogICAgIAotdW5zaWduZWQgSFRNTDVUb2tlbml6ZXI6OmNvbnN1 bWVFbnRpdHkoU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIGJvb2wmIG5vdEVub3VnaENoYXJhY3Rl cnMpCit1bnNpZ25lZCBIVE1MNUxleGVyOjpjb25zdW1lRW50aXR5KFNlZ21lbnRlZFN0cmluZyYg c291cmNlLCBib29sJiBub3RFbm91Z2hDaGFyYWN0ZXJzKQogewogICAgIGVudW0gRW50aXR5U3Rh dGUgewogICAgICAgICBJbml0aWFsLApAQCAtMjUxLDcgKzI1MSw3IEBAIG91dE9mQ2hhcmFjdGVy czoKICAgICByZXR1cm4gMDsKIH0KIAotdm9pZCBIVE1MNVRva2VuaXplcjo6dG9rZW5pemUoY29u c3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCit2b2lkIEhUTUw1TGV4ZXI6OnRva2VuaXplKGNv bnN0IFNlZ21lbnRlZFN0cmluZyYgc291cmNlKQogewogICAgIG1fc291cmNlLmFwcGVuZChzb3Vy Y2UpOwogCkBAIC01MTIsNyArNTEyLDcgQEAgdm9pZCBIVE1MNVRva2VuaXplcjo6dG9rZW5pemUo Y29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UpCiAgICAgfQogfQogCi12b2lkIEhUTUw1VG9r ZW5pemVyOjpwcm9jZXNzQXR0cmlidXRlKCkKK3ZvaWQgSFRNTDVMZXhlcjo6cHJvY2Vzc0F0dHJp YnV0ZSgpCiB7CiAgICAgQXRvbWljU3RyaW5nIHRhZyA9IEF0b21pY1N0cmluZyhtX3RhZ05hbWUu ZGF0YSgpLCBtX3RhZ05hbWUuc2l6ZSgpKTsKICAgICBBdG9taWNTdHJpbmcgYXR0cmlidXRlID0g QXRvbWljU3RyaW5nKG1fYXR0cmlidXRlTmFtZS5kYXRhKCksIG1fYXR0cmlidXRlTmFtZS5zaXpl KCkpOwpAQCAtNTIwLDE1ICs1MjAsMTUgQEAgdm9pZCBIVE1MNVRva2VuaXplcjo6cHJvY2Vzc0F0 dHJpYnV0ZSgpCiAgICAgU3RyaW5nIHZhbHVlKG1fYXR0cmlidXRlVmFsdWUuZGF0YSgpLCBtX2F0 dHJpYnV0ZVZhbHVlLnNpemUoKSk7CiB9CiAKLWlubGluZSB2b2lkIEhUTUw1VG9rZW5pemVyOjpl bWl0Q2hhcmFjdGVyKFVDaGFyKQoraW5saW5lIHZvaWQgSFRNTDVMZXhlcjo6ZW1pdENoYXJhY3Rl cihVQ2hhcikKIHsKIH0KIAotaW5saW5lIHZvaWQgSFRNTDVUb2tlbml6ZXI6OmVtaXRQYXJzZUVy cm9yKCkKK2lubGluZSB2b2lkIEhUTUw1TGV4ZXI6OmVtaXRQYXJzZUVycm9yKCkKIHsKIH0KIAot dm9pZCBIVE1MNVRva2VuaXplcjo6ZW1pdFRhZygpCit2b2lkIEhUTUw1TGV4ZXI6OmVtaXRUYWco KQogewogICAgIGlmIChtX2Nsb3NlVGFnKSB7CiAgICAgICAgIG1fY29udGVudE1vZGVsID0gUENE QVRBOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VG9rZW5pemVyLmggYi9XZWJDb3Jl L2h0bWwvSFRNTDVMZXhlci5oCnNpbWlsYXJpdHkgaW5kZXggOTclCnJlbmFtZSBmcm9tIFdlYkNv cmUvaHRtbC9IVE1MNVRva2VuaXplci5oCnJlbmFtZSB0byBXZWJDb3JlL2h0bWwvSFRNTDVMZXhl ci5oCmluZGV4IDBmZDRhMzMyY2IyNzNmYzJlZmVmZDIzY2JkNDNkYTA5NzM0Mjg4YmYuLjg4NDg1 NDZiZTJkNzM2NmIyNGVmYjdmNDZlMmZlMTNkZDdjYjQ2OTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9IVE1MNVRva2VuaXplci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmgKQEAg LTI0LDggKzI0LDggQEAKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAogICovCiAKLSNpZm5kZWYgSFRNTDVUb2tl bml6ZXJfaAotI2RlZmluZSBIVE1MNVRva2VuaXplcl9oCisjaWZuZGVmIEhUTUw1TGV4ZXJfaAor I2RlZmluZSBIVE1MNUxleGVyX2gKIAogI2luY2x1ZGUgIkF0b21pY1N0cmluZy5oIgogI2luY2x1 ZGUgIlNlZ21lbnRlZFN0cmluZy5oIgpAQCAtMzQsMTAgKzM0LDEwIEBACiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAotICAgIGNsYXNzIEhUTUw1VG9rZW5pemVyIDogcHVibGljIE5vbmNvcHlhYmxl IHsKKyAgICBjbGFzcyBIVE1MNUxleGVyIDogcHVibGljIE5vbmNvcHlhYmxlIHsKICAgICBwdWJs aWM6Ci0gICAgICAgIEhUTUw1VG9rZW5pemVyKCk7Ci0gICAgICAgIH5IVE1MNVRva2VuaXplcigp OworICAgICAgICBIVE1MNUxleGVyKCk7CisgICAgICAgIH5IVE1MNUxleGVyKCk7CiAKICAgICAg ICAgdm9pZCBiZWdpbigpOwogICAgICAgICB2b2lkIHdyaXRlKGNvbnN0IFNlZ21lbnRlZFN0cmlu ZyYpOwo=