41046 2010-06-23 00:05:51 -0700 Rename lexer and m_lexer to tokenizer and m_tokenizer, respectively 2010-06-23 00:17:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 abarth abarth eric oldest_to_newest 241703 0 abarth 2010-06-23 00:05:51 -0700 Rename lexer and m_lexer to tokenizer and m_tokenizer, respectively 241704 1 59484 abarth 2010-06-23 00:08:01 -0700 Created attachment 59484 Patch 241705 2 59484 eric 2010-06-23 00:09:41 -0700 Comment on attachment 59484 Patch OK. pumpLexer* too. 241710 3 abarth 2010-06-23 00:17:07 -0700 Committed r61668: <http://trac.webkit.org/changeset/61668> 59484 2010-06-23 00:08:01 -0700 2010-06-23 00:09:41 -0700 Patch bug-41046-20100623000759.patch text/plain 13400 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTY2NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTAtMDYtMjMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5h bWUgbGV4ZXIgYW5kIG1fbGV4ZXIgdG8gdG9rZW5pemVyIGFuZCBtX3Rva2VuaXplciwgcmVzcGVj dGl2ZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 MTA0NgorCisgICAgICAgIFRoaXMgaXMgYSBmb2xsb3cgdXAgdG8gdGhlIHJlY2VudCBIVE1MNUxl eGVyID0+IEhUTUxUb2tlbml6ZXIgcmVuYW1lLgorCisgICAgICAgICogaHRtbC9IVE1MNURvY3Vt ZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1RG9jdW1lbnRQYXJzZXI6OkhU TUw1RG9jdW1lbnRQYXJzZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVEb2N1bWVudFBhcnNl cjo6YmVnaW4pOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVEb2N1bWVudFBhcnNlcjo6cHVtcExl eGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1RG9jdW1lbnRQYXJzZXI6OndpbGxQdW1wTGV4 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVEb2N1bWVudFBhcnNlcjo6ZGlkUHVtcExleGVy KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1RG9jdW1lbnRQYXJzZXI6OmxpbmVOdW1iZXIpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTDVEb2N1bWVudFBhcnNlcjo6Y29sdW1uTnVtYmVyKToKKyAg ICAgICAgKiBodG1sL0hUTUw1RG9jdW1lbnRQYXJzZXIuaDoKKyAgICAgICAgKiBodG1sL0hUTUw1 UHJlbG9hZFNjYW5uZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTDVQcmVsb2FkU2Nhbm5l cjo6c2Nhbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVByZWxvYWRTY2FubmVyOjpwcm9jZXNz VG9rZW4pOgorICAgICAgICAqIGh0bWwvSFRNTDVQcmVsb2FkU2Nhbm5lci5oOgorICAgICAgICAq IGh0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRyZWVC dWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VHJlZUJ1 aWxkZXI6OmhhbmRsZVNjcmlwdFN0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VHJl ZUJ1aWxkZXI6OnBhc3NUb2tlblRvTGVnYWN5UGFyc2VyKToKKyAgICAgICAgKiBodG1sL0hUTUw1 VHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiBodG1sL0hUTUxUb2tlbml6ZXIuaDoKKyAgICAgICAg KiBodG1sL0xlZ2FjeUhUTUxEb2N1bWVudFBhcnNlci5oOgorCiAyMDEwLTA2LTIyICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlk ZWwuCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTDVEb2N1bWVudFBhcnNlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9odG1sL0hUTUw1RG9jdW1lbnRQYXJzZXIuY3BwCShyZXZpc2lvbiA2MTY2 NSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MNURvY3VtZW50UGFyc2VyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNjcsOSArNjcsOSBAQCBwcml2YXRlOgogCiBIVE1MNURvY3VtZW50UGFyc2VyOjpIVE1M NURvY3VtZW50UGFyc2VyKEhUTUxEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgcmVwb3J0RXJyb3Jz KQogICAgIDogbV9kb2N1bWVudChkb2N1bWVudCkKLSAgICAsIG1fbGV4ZXIobmV3IEhUTUxUb2tl bml6ZXIpCisgICAgLCBtX3Rva2VuaXplcihuZXcgSFRNTFRva2VuaXplcikKICAgICAsIG1fc2Ny aXB0UnVubmVyKG5ldyBIVE1MNVNjcmlwdFJ1bm5lcihkb2N1bWVudCwgdGhpcykpCi0gICAgLCBt X3RyZWVDb25zdHJ1Y3RvcihuZXcgSFRNTDVUcmVlQnVpbGRlcihtX2xleGVyLmdldCgpLCBkb2N1 bWVudCwgcmVwb3J0RXJyb3JzKSkKKyAgICAsIG1fdHJlZUNvbnN0cnVjdG9yKG5ldyBIVE1MNVRy ZWVCdWlsZGVyKG1fdG9rZW5pemVyLmdldCgpLCBkb2N1bWVudCwgcmVwb3J0RXJyb3JzKSkKICAg ICAsIG1fcGFyc2VyU2NoZWR1bGVyKG5ldyBIVE1MUGFyc2VyU2NoZWR1bGVyKHRoaXMpKQogICAg ICwgbV9lbmRXYXNEZWxheWVkKGZhbHNlKQogICAgICwgbV93cml0ZU5lc3RpbmdMZXZlbCgwKQpA QCAtODEsOCArODEsOCBAQCBIVE1MNURvY3VtZW50UGFyc2VyOjpIVE1MNURvY3VtZW50UGFyc2Vy CiAvLyBtaW5pbWl6ZSBjb2RlIGR1cGxpY2F0aW9uIGJldHdlZW4gdGhlc2UgY29uc3RydWN0b3Jz LgogSFRNTDVEb2N1bWVudFBhcnNlcjo6SFRNTDVEb2N1bWVudFBhcnNlcihEb2N1bWVudEZyYWdt ZW50KiBmcmFnbWVudCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1p c3Npb24pCiAgICAgOiBtX2RvY3VtZW50KGZyYWdtZW50LT5kb2N1bWVudCgpKQotICAgICwgbV9s ZXhlcihuZXcgSFRNTFRva2VuaXplcikKLSAgICAsIG1fdHJlZUNvbnN0cnVjdG9yKG5ldyBIVE1M NVRyZWVCdWlsZGVyKG1fbGV4ZXIuZ2V0KCksIGZyYWdtZW50LCBzY3JpcHRpbmdQZXJtaXNzaW9u KSkKKyAgICAsIG1fdG9rZW5pemVyKG5ldyBIVE1MVG9rZW5pemVyKQorICAgICwgbV90cmVlQ29u c3RydWN0b3IobmV3IEhUTUw1VHJlZUJ1aWxkZXIobV90b2tlbml6ZXIuZ2V0KCksIGZyYWdtZW50 LCBzY3JpcHRpbmdQZXJtaXNzaW9uKSkKICAgICAsIG1fZW5kV2FzRGVsYXllZChmYWxzZSkKICAg ICAsIG1fd3JpdGVOZXN0aW5nTGV2ZWwoMCkKIHsKQEAgLTk5LDcgKzk5LDcgQEAgSFRNTDVEb2N1 bWVudFBhcnNlcjo6fkhUTUw1RG9jdW1lbnRQYXJzZQogCiB2b2lkIEhUTUw1RG9jdW1lbnRQYXJz ZXI6OmJlZ2luKCkKIHsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHJlc2V0IHRoZSBsZXhlcj8K KyAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHJlc2V0IHRoZSB0b2tlbml6ZXI/CiB9CiAKIHZvaWQg SFRNTDVEb2N1bWVudFBhcnNlcjo6c3RvcFBhcnNpbmcoKQpAQCAtMTY1LDcgKzE2NSw3IEBAIHZv aWQgSFRNTDVEb2N1bWVudFBhcnNlcjo6cHVtcExleGVyKFN5bmMKICAgICBIVE1MUGFyc2VyU2No ZWR1bGVyOjpQdW1wU2Vzc2lvbiBzZXNzaW9uOwogICAgIC8vIEZJWE1FOiBUaGlzIGxvb3AgYm9k eSBoYXMgaXMgbm93IHRvbyBsb25nIGFuZCBuZWVkcyBjbGVhbnVwLgogICAgIHdoaWxlIChtb2Rl ID09IEZvcmNlU3luY2hyb25vdXMgfHwgKCFtX3BhcnNlclN0b3BwZWQgJiYgbV9wYXJzZXJTY2hl ZHVsZXItPnNob3VsZENvbnRpbnVlUGFyc2luZyhzZXNzaW9uKSkpIHsKLSAgICAgICAgaWYgKCFt X2xleGVyLT5uZXh0VG9rZW4obV9pbnB1dC5jdXJyZW50KCksIG1fdG9rZW4pKQorICAgICAgICBp ZiAoIW1fdG9rZW5pemVyLT5uZXh0VG9rZW4obV9pbnB1dC5jdXJyZW50KCksIG1fdG9rZW4pKQog ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgbV90cmVlQ29uc3RydWN0b3ItPmNvbnN0cnVj dFRyZWVGcm9tVG9rZW4obV90b2tlbik7CkBAIC0xODMsNyArMTgzLDcgQEAgdm9pZCBIVE1MNURv Y3VtZW50UGFyc2VyOjpwdW1wTGV4ZXIoU3luYwogICAgIH0KIAogICAgIGlmIChpc1dhaXRpbmdG b3JTY3JpcHRzKCkpIHsKLSAgICAgICAgQVNTRVJUKG1fbGV4ZXItPnN0YXRlKCkgPT0gSFRNTFRv a2VuaXplcjo6RGF0YVN0YXRlKTsKKyAgICAgICAgQVNTRVJUKG1fdG9rZW5pemVyLT5zdGF0ZSgp ID09IEhUTUxUb2tlbml6ZXI6OkRhdGFTdGF0ZSk7CiAgICAgICAgIGlmICghbV9wcmVsb2FkU2Nh bm5lcikgewogICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci5zZXQobmV3IEhUTUw1UHJlbG9h ZFNjYW5uZXIobV9kb2N1bWVudCkpOwogICAgICAgICAgICAgbV9wcmVsb2FkU2Nhbm5lci0+YXBw ZW5kVG9FbmQobV9pbnB1dC5jdXJyZW50KCkpOwpAQCAtMjAxLDcgKzIwMSw3IEBAIHZvaWQgSFRN TDVEb2N1bWVudFBhcnNlcjo6d2lsbFB1bXBMZXhlcigKICAgICAvLyBlbmQgdXAgcGFyc2luZyB0 aGUgd2hvbGUgYnVmZmVyIGluIHRoaXMgcHVtcC4gIFdlIHNob3VsZCBwYXNzIGhvdwogICAgIC8v IG11Y2ggd2UgcGFyc2VkIGFzIHBhcnQgb2YgZGlkV3JpdGVIVE1MIGluc3RlYWQgb2Ygd2lsbFdy aXRlSFRNTC4KICAgICBpZiAoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9 IG1fZG9jdW1lbnQtPmluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSkKLSAgICAgICAgdGltZWxpbmVB Z2VudC0+d2lsbFdyaXRlSFRNTChtX2lucHV0LmN1cnJlbnQoKS5sZW5ndGgoKSwgbV9sZXhlci0+ bGluZU51bWJlcigpKTsKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+d2lsbFdyaXRlSFRNTChtX2lu cHV0LmN1cnJlbnQoKS5sZW5ndGgoKSwgbV90b2tlbml6ZXItPmxpbmVOdW1iZXIoKSk7CiAjZW5k aWYKIH0KIApAQCAtMjA5LDcgKzIwOSw3IEBAIHZvaWQgSFRNTDVEb2N1bWVudFBhcnNlcjo6ZGlk UHVtcExleGVyKCkKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmIChJbnNwZWN0b3JU aW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gbV9kb2N1bWVudC0+aW5zcGVjdG9yVGltZWxp bmVBZ2VudCgpKQotICAgICAgICB0aW1lbGluZUFnZW50LT5kaWRXcml0ZUhUTUwobV9sZXhlci0+ bGluZU51bWJlcigpKTsKKyAgICAgICAgdGltZWxpbmVBZ2VudC0+ZGlkV3JpdGVIVE1MKG1fdG9r ZW5pemVyLT5saW5lTnVtYmVyKCkpOwogI2VuZGlmCiB9CiAKQEAgLTMwMSwxMiArMzAxLDEyIEBA IGJvb2wgSFRNTDVEb2N1bWVudFBhcnNlcjo6aW5TY3JpcHRFeGVjdXQKIAogaW50IEhUTUw1RG9j dW1lbnRQYXJzZXI6OmxpbmVOdW1iZXIoKSBjb25zdAogewotICAgIHJldHVybiBtX2xleGVyLT5s aW5lTnVtYmVyKCk7CisgICAgcmV0dXJuIG1fdG9rZW5pemVyLT5saW5lTnVtYmVyKCk7CiB9CiAK IGludCBIVE1MNURvY3VtZW50UGFyc2VyOjpjb2x1bW5OdW1iZXIoKSBjb25zdAogewotICAgIHJl dHVybiBtX2xleGVyLT5jb2x1bW5OdW1iZXIoKTsKKyAgICByZXR1cm4gbV90b2tlbml6ZXItPmNv bHVtbk51bWJlcigpOwogfQogCiBMZWdhY3lIVE1MVHJlZUNvbnN0cnVjdG9yKiBIVE1MNURvY3Vt ZW50UGFyc2VyOjpodG1sVHJlZUNvbnN0cnVjdG9yKCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvaHRt bC9IVE1MNURvY3VtZW50UGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUw1 RG9jdW1lbnRQYXJzZXIuaAkocmV2aXNpb24gNjE2NjUpCisrKyBXZWJDb3JlL2h0bWwvSFRNTDVE b2N1bWVudFBhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTgsNyArMTE4LDcgQEAgcHJpdmF0 ZToKICAgICAvLyBXZSBtdXN0IHN1cHBvcnQgcGFyc2luZyBpbnRvIGEgRG9jdW1lbnQqIGFuZCBu b3QganVzdCBIVE1MRG9jdW1lbnQqCiAgICAgLy8gdG8gc3VwcG9ydCBEb2N1bWVudEZyYWdtZW50 ICh3aGljaCBoYXMgYSBEb2N1bWVudCopLgogICAgIERvY3VtZW50KiBtX2RvY3VtZW50OwotICAg IE93blB0cjxIVE1MVG9rZW5pemVyPiBtX2xleGVyOworICAgIE93blB0cjxIVE1MVG9rZW5pemVy PiBtX3Rva2VuaXplcjsKICAgICBPd25QdHI8SFRNTDVTY3JpcHRSdW5uZXI+IG1fc2NyaXB0UnVu bmVyOwogICAgIE93blB0cjxIVE1MNVRyZWVCdWlsZGVyPiBtX3RyZWVDb25zdHJ1Y3RvcjsKICAg ICBPd25QdHI8SFRNTDVQcmVsb2FkU2Nhbm5lcj4gbV9wcmVsb2FkU2Nhbm5lcjsKSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MNVByZWxvYWRTY2FubmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L2h0bWwvSFRNTDVQcmVsb2FkU2Nhbm5lci5jcHAJKHJldmlzaW9uIDYxNjY1KQorKysgV2ViQ29y ZS9odG1sL0hUTUw1UHJlbG9hZFNjYW5uZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQsNyAr MTM0LDcgQEAgdm9pZCBIVE1MNVByZWxvYWRTY2FubmVyOjpzY2FuKCkKIHsKICAgICAvLyBGSVhN RTogV2Ugc2hvdWxkIHNhdmUgYW5kIHJlLXVzZSB0aGVzZSB0b2tlbnMgaW4gSFRNTDVEb2N1bWVu dFBhcnNlciBpZgogICAgIC8vIHRoZSBwZW5kaW5nIHNjcmlwdCBkb2Vzbid0IGVuZCB1cCBjYWxs aW5nIGRvY3VtZW50LndyaXRlLgotICAgIHdoaWxlIChtX2xleGVyLm5leHRUb2tlbihtX3NvdXJj ZSwgbV90b2tlbikpIHsKKyAgICB3aGlsZSAobV90b2tlbml6ZXIubmV4dFRva2VuKG1fc291cmNl LCBtX3Rva2VuKSkgewogICAgICAgICBwcm9jZXNzVG9rZW4oKTsKICAgICAgICAgbV90b2tlbi5j bGVhcigpOwogICAgIH0KQEAgLTE1NSwxMiArMTU1LDEyIEBAIHZvaWQgSFRNTDVQcmVsb2FkU2Nh bm5lcjo6cHJvY2Vzc1Rva2VuKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUHJlbG9hZFRhc2sg dGFzayhtX3Rva2VuKTsKLSAgICBtX2xleGVyLnNldFN0YXRlKEhUTUw1VHJlZUJ1aWxkZXI6OmFk anVzdGVkTGV4ZXJTdGF0ZShtX2xleGVyLnN0YXRlKCksIHRhc2sudGFnTmFtZSgpLCBtX2RvY3Vt ZW50LT5mcmFtZSgpKSk7CisgICAgbV90b2tlbml6ZXIuc2V0U3RhdGUoSFRNTDVUcmVlQnVpbGRl cjo6YWRqdXN0ZWRMZXhlclN0YXRlKG1fdG9rZW5pemVyLnN0YXRlKCksIHRhc2sudGFnTmFtZSgp LCBtX2RvY3VtZW50LT5mcmFtZSgpKSk7CiAgICAgaWYgKHRhc2sudGFnTmFtZSgpID09IHNjcmlw dFRhZykgewotICAgICAgICAvLyBUaGUgdHJlZSBidWlsZGVyIGhhbmRsZXMgc2NyaXB0VGFnIHNl cGFyYXRlbHkgZnJvbSB0aGUgb3RoZXIgbGV4ZXIKKyAgICAgICAgLy8gVGhlIHRyZWUgYnVpbGRl ciBoYW5kbGVzIHNjcmlwdFRhZyBzZXBhcmF0ZWx5IGZyb20gdGhlIG90aGVyIHRva2VuaXplcgog ICAgICAgICAvLyBzdGF0ZSBhZGp1c3RtZW50cywgc28gd2UgbmVlZCB0byBoYW5kbGUgaXQgc2Vw YXJhdGVseSB0b28uCi0gICAgICAgIEFTU0VSVChtX2xleGVyLnN0YXRlKCkgPT0gSFRNTFRva2Vu aXplcjo6RGF0YVN0YXRlKTsKLSAgICAgICAgbV9sZXhlci5zZXRTdGF0ZShIVE1MVG9rZW5pemVy OjpTY3JpcHREYXRhU3RhdGUpOworICAgICAgICBBU1NFUlQobV90b2tlbml6ZXIuc3RhdGUoKSA9 PSBIVE1MVG9rZW5pemVyOjpEYXRhU3RhdGUpOworICAgICAgICBtX3Rva2VuaXplci5zZXRTdGF0 ZShIVE1MVG9rZW5pemVyOjpTY3JpcHREYXRhU3RhdGUpOwogICAgIH0KIAogICAgIGlmICh0YXNr LnRhZ05hbWUoKSA9PSBib2R5VGFnKQpJbmRleDogV2ViQ29yZS9odG1sL0hUTUw1UHJlbG9hZFNj YW5uZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTDVQcmVsb2FkU2Nhbm5lci5o CShyZXZpc2lvbiA2MTY2NSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MNVByZWxvYWRTY2FubmVyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTUyLDcgKzUyLDcgQEAgcHJpdmF0ZToKIAogICAgIERvY3VtZW50 KiBtX2RvY3VtZW50OwogICAgIFNlZ21lbnRlZFN0cmluZyBtX3NvdXJjZTsKLSAgICBIVE1MVG9r ZW5pemVyIG1fbGV4ZXI7CisgICAgSFRNTFRva2VuaXplciBtX3Rva2VuaXplcjsKICAgICBIVE1M NVRva2VuIG1fdG9rZW47CiAgICAgQ1NTUHJlbG9hZFNjYW5uZXIgbV9jc3NTY2FubmVyOwogICAg IGJvb2wgbV9ib2R5U2VlbjsKSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5jcHAJKHJldmlz aW9uIDYxNjY1KQorKysgV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00NSwxMiArNDUsMTIgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1lczsKIAog c3RhdGljIGNvbnN0IGludCB1bmluaXRpYWxpemVkTGluZU51bWJlclZhbHVlID0gLTE7CiAKLUhU TUw1VHJlZUJ1aWxkZXI6OkhUTUw1VHJlZUJ1aWxkZXIoSFRNTFRva2VuaXplciogbGV4ZXIsIEhU TUxEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgcmVwb3J0RXJyb3JzKQorSFRNTDVUcmVlQnVpbGRl cjo6SFRNTDVUcmVlQnVpbGRlcihIVE1MVG9rZW5pemVyKiB0b2tlbml6ZXIsIEhUTUxEb2N1bWVu dCogZG9jdW1lbnQsIGJvb2wgcmVwb3J0RXJyb3JzKQogICAgIDogbV9kb2N1bWVudChkb2N1bWVu dCkKICAgICAsIG1fcmVwb3J0RXJyb3JzKHJlcG9ydEVycm9ycykKICAgICAsIG1faXNQYXVzZWQo ZmFsc2UpCiAgICAgLCBtX2luc2VydGlvbk1vZGUoSW5pdGlhbCkKLSAgICAsIG1fbGV4ZXIobGV4 ZXIpCisgICAgLCBtX3Rva2VuaXplcih0b2tlbml6ZXIpCiAgICAgLCBtX2xlZ2FjeVRyZWVDb25z dHJ1Y3RvcihuZXcgTGVnYWN5SFRNTFRyZWVDb25zdHJ1Y3Rvcihkb2N1bWVudCwgcmVwb3J0RXJy b3JzKSkKICAgICAsIG1fbGFzdFNjcmlwdEVsZW1lbnRTdGFydExpbmUodW5pbml0aWFsaXplZExp bmVOdW1iZXJWYWx1ZSkKICAgICAsIG1fc2NyaXB0VG9Qcm9jZXNzU3RhcnRMaW5lKHVuaW5pdGlh bGl6ZWRMaW5lTnVtYmVyVmFsdWUpCkBAIC02MCwxMiArNjAsMTIgQEAgSFRNTDVUcmVlQnVpbGRl cjo6SFRNTDVUcmVlQnVpbGRlcihIVE1MVAogCiAvLyBGSVhNRTogTWVtYmVyIHZhcmlhYmxlcyBz aG91bGQgYmUgZ3JvdXBlZCBpbnRvIHNlbGYtaW5pdGlhbGl6aW5nIHN0cnVjdHMgdG8KIC8vIG1p bmltaXplIGNvZGUgZHVwbGljYXRpb24gYmV0d2VlbiB0aGVzZSBjb25zdHJ1Y3RvcnMuCi1IVE1M NVRyZWVCdWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVyKEhUTUxUb2tlbml6ZXIqIGxleGVyLCBEb2N1 bWVudEZyYWdtZW50KiBmcmFnbWVudCwgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlw dGluZ1Blcm1pc3Npb24pCitIVE1MNVRyZWVCdWlsZGVyOjpIVE1MNVRyZWVCdWlsZGVyKEhUTUxU b2tlbml6ZXIqIHRva2VuaXplciwgRG9jdW1lbnRGcmFnbWVudCogZnJhZ21lbnQsIEZyYWdtZW50 U2NyaXB0aW5nUGVybWlzc2lvbiBzY3JpcHRpbmdQZXJtaXNzaW9uKQogICAgIDogbV9kb2N1bWVu dChmcmFnbWVudC0+ZG9jdW1lbnQoKSkKICAgICAsIG1fcmVwb3J0RXJyb3JzKGZhbHNlKSAvLyBG SVhNRTogV2h5IG5vdCByZXBvcnQgZXJyb3JzIGluIGZyYWdtZW50cz8KICAgICAsIG1faXNQYXVz ZWQoZmFsc2UpCiAgICAgLCBtX2luc2VydGlvbk1vZGUoSW5pdGlhbCkKLSAgICAsIG1fbGV4ZXIo bGV4ZXIpCisgICAgLCBtX3Rva2VuaXplcih0b2tlbml6ZXIpCiAgICAgLCBtX2xlZ2FjeVRyZWVD b25zdHJ1Y3RvcihuZXcgTGVnYWN5SFRNTFRyZWVDb25zdHJ1Y3RvcihmcmFnbWVudCwgc2NyaXB0 aW5nUGVybWlzc2lvbikpCiAgICAgLCBtX2xhc3RTY3JpcHRFbGVtZW50U3RhcnRMaW5lKHVuaW5p dGlhbGl6ZWRMaW5lTnVtYmVyVmFsdWUpCiAgICAgLCBtX3NjcmlwdFRvUHJvY2Vzc1N0YXJ0TGlu ZSh1bmluaXRpYWxpemVkTGluZU51bWJlclZhbHVlKQpAQCAtMTIxLDcgKzEyMSw3IEBAIHN0YXRp YyB2b2lkIGNvbnZlcnRUb09sZFN0eWxlKEhUTUw1VG9rZW4KIHZvaWQgSFRNTDVUcmVlQnVpbGRl cjo6aGFuZGxlU2NyaXB0U3RhcnRUYWcoKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIFRo ZSBIVE1MIGZyZ21lbnQgY2FzZT8KLSAgICBtX2xleGVyLT5zZXRTdGF0ZShIVE1MVG9rZW5pemVy OjpTY3JpcHREYXRhU3RhdGUpOworICAgIG1fdG9rZW5pemVyLT5zZXRTdGF0ZShIVE1MVG9rZW5p emVyOjpTY3JpcHREYXRhU3RhdGUpOwogICAgIG5vdEltcGxlbWVudGVkKCk7IC8vIFNhdmUgaW5z ZXJ0aW9uIG1vZGUuCiB9CiAKQEAgLTE5MCwxMSArMTkwLDExIEBAIFBhc3NSZWZQdHI8Tm9kZT4g SFRNTDVUcmVlQnVpbGRlcjo6cGFzc1QKICAgICAgICAgaWYgKG9sZFN0eWxlVG9rZW4udGFnTmFt ZSA9PSBzY3JpcHRUYWcpIHsKICAgICAgICAgICAgIGhhbmRsZVNjcmlwdFN0YXJ0VGFnKCk7CiAg ICAgICAgICAgICBtX2xhc3RTY3JpcHRFbGVtZW50ID0gc3RhdGljX3BvaW50ZXJfY2FzdDxFbGVt ZW50PihyZXN1bHQpOwotICAgICAgICAgICAgbV9sYXN0U2NyaXB0RWxlbWVudFN0YXJ0TGluZSA9 IG1fbGV4ZXItPmxpbmVOdW1iZXIoKTsKKyAgICAgICAgICAgIG1fbGFzdFNjcmlwdEVsZW1lbnRT dGFydExpbmUgPSBtX3Rva2VuaXplci0+bGluZU51bWJlcigpOwogICAgICAgICB9IGVsc2UgaWYg KG9sZFN0eWxlVG9rZW4udGFnTmFtZSA9PSBwcmVUYWcgfHwgb2xkU3R5bGVUb2tlbi50YWdOYW1l ID09IGxpc3RpbmdUYWcpCi0gICAgICAgICAgICBtX2xleGVyLT5za2lwTGVhZGluZ05ld0xpbmVG b3JMaXN0aW5nKCk7CisgICAgICAgICAgICBtX3Rva2VuaXplci0+c2tpcExlYWRpbmdOZXdMaW5l Rm9yTGlzdGluZygpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2xleGVyLT5zZXRTdGF0 ZShhZGp1c3RlZExleGVyU3RhdGUobV9sZXhlci0+c3RhdGUoKSwgb2xkU3R5bGVUb2tlbi50YWdO YW1lLCBtX2RvY3VtZW50LT5mcmFtZSgpKSk7CisgICAgICAgICAgICBtX3Rva2VuaXplci0+c2V0 U3RhdGUoYWRqdXN0ZWRMZXhlclN0YXRlKG1fdG9rZW5pemVyLT5zdGF0ZSgpLCBvbGRTdHlsZVRv a2VuLnRhZ05hbWUsIG1fZG9jdW1lbnQtPmZyYW1lKCkpKTsKICAgICB9IGVsc2UgaWYgKHRva2Vu LnR5cGUoKSA9PSBIVE1MNVRva2VuOjpFbmRUYWcpIHsKICAgICAgICAgaWYgKG9sZFN0eWxlVG9r ZW4udGFnTmFtZSA9PSBzY3JpcHRUYWcpIHsKICAgICAgICAgICAgIGlmIChtX2xhc3RTY3JpcHRF bGVtZW50KSB7CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTDVUcmVlQnVpbGRlci5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MNVRyZWVCdWlsZGVyLmgJKHJldmlzaW9uIDYxNjY1KQor KysgV2ViQ29yZS9odG1sL0hUTUw1VHJlZUJ1aWxkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtOTUs OSArOTUsOSBAQCBwcml2YXRlOgogCiAgICAgSW5zZXJ0aW9uTW9kZSBtX2luc2VydGlvbk1vZGU7 CiAKLSAgICAvLyBIVE1MNSBzcGVjIHJlcXVpcmVzIHRoYXQgd2UgYmUgYWJsZSB0byBjaGFuZ2Ug dGhlIHN0YXRlIG9mIHRoZSBsZXhlcgorICAgIC8vIEhUTUw1IHNwZWMgcmVxdWlyZXMgdGhhdCB3 ZSBiZSBhYmxlIHRvIGNoYW5nZSB0aGUgc3RhdGUgb2YgdGhlIHRva2VuaXplcgogICAgIC8vIGZy b20gd2l0aGluIHBhcnNlciBhY3Rpb25zLgotICAgIEhUTUxUb2tlbml6ZXIqIG1fbGV4ZXI7Cisg ICAgSFRNTFRva2VuaXplciogbV90b2tlbml6ZXI7CiAKICAgICAvLyBXZSdyZSByZS11c2luZyBs b2dpYyBmcm9tIHRoZSBvbGQgTGVnYWN5SFRNTFRyZWVDb25zdHJ1Y3RvciB3aGlsZSB0aGlzIGNs YXNzIGlzIGJlaW5nIHdyaXR0ZW4uCiAgICAgT3duUHRyPExlZ2FjeUhUTUxUcmVlQ29uc3RydWN0 b3I+IG1fbGVnYWN5VHJlZUNvbnN0cnVjdG9yOwpJbmRleDogV2ViQ29yZS9odG1sL0hUTUxUb2tl bml6ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFRva2VuaXplci5oCShyZXZp c2lvbiA2MTY2NSkKKysrIFdlYkNvcmUvaHRtbC9IVE1MVG9rZW5pemVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTIxOCw3ICsyMTgsNyBAQCBwcml2YXRlOgogCiAgICAgLy8gV2Ugb2NjYXRpb25hbGx5 IHdhbnQgdG8gZW1pdCBib3RoIGEgY2hhcmFjdGVyIHRva2VuIGFuZCBhbiBlbmQgdGFnCiAgICAg Ly8gdG9rZW4gKGUuZy4sIHdoZW4gbGV4aW5nIHNjcmlwdCkuICBXZSBidWZmZXIgdGhlIG5hbWUg b2YgdGhlIGVuZCB0YWcKLSAgICAvLyB0b2tlbiBoZXJlIHNvIHdlIHJlbWVtYmVyIGl0IG5leHQg dGltZSB3ZSByZS1lbnRlciB0aGUgbGV4ZXIuCisgICAgLy8gdG9rZW4gaGVyZSBzbyB3ZSByZW1l bWJlciBpdCBuZXh0IHRpbWUgd2UgcmUtZW50ZXIgdGhlIHRva2VuaXplci4KICAgICBWZWN0b3I8 VUNoYXIsIDMyPiBtX2J1ZmZlcmVkRW5kVGFnTmFtZTsKIAogICAgIC8vIGh0dHA6Ly93d3cud2hh dHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvI2FkZGl0aW9uYWwtYWxsb3dlZC1j aGFyYWN0ZXIKSW5kZXg6IFdlYkNvcmUvaHRtbC9MZWdhY3lIVE1MRG9jdW1lbnRQYXJzZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvTGVnYWN5SFRNTERvY3VtZW50UGFyc2VyLmgJKHJl dmlzaW9uIDYxNjY0KQorKysgV2ViQ29yZS9odG1sL0xlZ2FjeUhUTUxEb2N1bWVudFBhcnNlci5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsMTAgKzEzNSwxMCBAQCBwdWJsaWM6CiAKIC8vLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KIAotLy8gRklYTUU6IFRoaXMgY2xhc3MgZG9lcyB0b28gbXVjaC4gIFJp Z2h0IG5vdyBpdCBpcyBib3RoIGFuIEhUTUwgbGV4ZXIgYXMgd2VsbAotLy8gYXMgaGFuZGxpbmcg YWxsIG9mIHRoZSBub24tbGV4ZXItc3BlY2lmaWMganVuayByZWxhdGVkIHRvIHRva2VuaXppbmcg SFRNTAotLy8gKGxpa2UgZGVhbGluZyB3aXRoIDxzY3JpcHQ+IHRhZ3MpLiAgVGhlIEhUTUwgbGV4 ZXIgYml0cyBzaG91bGQgYmUgcHVzaGVkCi0vLyBkb3duIGludG8gYSBzZXBhcmF0ZSBIVE1MIGxl eGVyIGNsYXNzLgorLy8gRklYTUU6IFRoaXMgY2xhc3MgZG9lcyB0b28gbXVjaC4gIFJpZ2h0IG5v dyBpdCBpcyBib3RoIGFuIEhUTUwgdG9rZW5pemVyIGFzIHdlbGwKKy8vIGFzIGhhbmRsaW5nIGFs bCBvZiB0aGUgbm9uLXRva2VuaXplci1zcGVjaWZpYyBqdW5rIHJlbGF0ZWQgdG8gdG9rZW5pemlu ZyBIVE1MCisvLyAobGlrZSBkZWFsaW5nIHdpdGggPHNjcmlwdD4gdGFncykuICBUaGUgSFRNTCB0 b2tlbml6ZXIgYml0cyBzaG91bGQgYmUgcHVzaGVkCisvLyBkb3duIGludG8gYSBzZXBhcmF0ZSBI VE1MIHRva2VuaXplciBjbGFzcy4KIAogY2xhc3MgTGVnYWN5SFRNTERvY3VtZW50UGFyc2VyIDog cHVibGljIERvY3VtZW50UGFyc2VyLCBwdWJsaWMgQ2FjaGVkUmVzb3VyY2VDbGllbnQgewogcHVi bGljOgo=