45990 2010-09-17 13:29:54 -0700 Use AtomicString insted of String in XMLDocumentParser 2010-10-09 12:01:52 -0700 1 1 1 Unclassified WebKit XML 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 43085 1 paroga paroga abarth commit-queue dglazkov gustavo webkit.review.bot xan.lopez oldest_to_newest 280822 0 paroga 2010-09-17 13:29:54 -0700 Creating AtomicString instead of String as early as possible should decrease the parsing time. 280838 1 67945 paroga 2010-09-17 13:45:44 -0700 Created attachment 67945 Patch > + // FIXME: Use AtomicString::fromUTF8. > + return AtomicString(toString(string)); Maybe we can commit now and change this when bug 45594 is finished? 280971 2 webkit.review.bot 2010-09-17 16:23:48 -0700 Attachment 67945 did not build on gtk: Build output: http://queues.webkit.org/results/4071053 280977 3 webkit.review.bot 2010-09-17 16:36:08 -0700 Attachment 67945 did not build on chromium: Build output: http://queues.webkit.org/results/4000034 280982 4 67945 abarth 2010-09-17 16:43:03 -0700 Comment on attachment 67945 Patch Does not compile. 281096 5 68001 paroga 2010-09-18 01:16:26 -0700 Created attachment 68001 Patch Should build now. 281244 6 68001 commit-queue 2010-09-18 18:45:04 -0700 Comment on attachment 68001 Patch Rejecting patch 68001 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--wait-for-httpd', '--quiet']" exit_code: 1 Last 500 characters of output: outTests Testing 21315 test cases. websocket/tests/frame-length-skip.html -> timed out Sampling process 10878 for 10 seconds with 10 milliseconds of run time between samples Sampling completed, processing symbols... Sample analysis of process 10878 written to file /Users/eseidel/Library/Logs/DumpRenderTree/HangReport.txt Exiting early after 1 failures. 21281 tests run. 586.09s total testing time 21280 test cases (99%) succeeded 1 test case (<1%) timed out 33 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/4086008 281249 7 68001 abarth 2010-09-18 20:02:07 -0700 Comment on attachment 68001 Patch Clearing flags on attachment: 68001 Committed r67807: <http://trac.webkit.org/changeset/67807> 281250 8 abarth 2010-09-18 20:02:12 -0700 All reviewed patches have been landed. Closing bug. 67945 2010-09-17 13:45:44 -0700 2010-09-18 01:16:26 -0700 Patch bug-45990.patch text/plain 5526 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDIwZmJhMC4uMWJiMDQ5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0xNyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgQXRvbWljU3RyaW5nIGluc3RlZCBvZiBTdHJpbmcgaW4g WE1MRG9jdW1lbnRQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ1OTkwCisKKyAgICAgICAgQ3JlYXRlIEF0b21pY1N0cmluZyBhcyBlYXJseSBh cyBwb3NzaWJsZS4KKyAgICAgICAgVGhpcyBjYW4gYXZvaWQgdW5uZWNlc3NhcnkgbWVtY3B5IG9m IFN0cmluZyBjb250ZW50LgorCisgICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyLmg6Cisg ICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHA6CisgICAgICAgIChXZWJD b3JlOjp0b0F0b21pY1N0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVFbGVtZW50TmFt ZXNwYWNlcyk6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVFbGVtZW50QXR0cmlidXRlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6c3RhcnRFbGVtZW50TnMpOgorCiAy MDEwLTA5LTE2ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1 bWVudFBhcnNlci5oIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaAppbmRleCBhNjRk N2U0Li5lMDc3MGJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5o CisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKQEAgLTIxMSw5ICsyMTEsOSBA QCBwdWJsaWM6CiAgICAgICAgIGludCBtX3NjcmlwdFN0YXJ0TGluZTsKIAogICAgICAgICBib29s IG1fcGFyc2luZ0ZyYWdtZW50OwotICAgICAgICBTdHJpbmcgbV9kZWZhdWx0TmFtZXNwYWNlVVJJ OworICAgICAgICBBdG9taWNTdHJpbmcgbV9kZWZhdWx0TmFtZXNwYWNlVVJJOwogCi0gICAgICAg IHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gUHJlZml4Rm9yTmFtZXNwYWNlTWFwOwor ICAgICAgICB0eXBlZGVmIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBBdG9taWNTdHJpbmc+IFByZWZp eEZvck5hbWVzcGFjZU1hcDsKICAgICAgICAgUHJlZml4Rm9yTmFtZXNwYWNlTWFwIG1fcHJlZml4 VG9OYW1lc3BhY2VNYXA7CiAgICAgICAgIFNlZ21lbnRlZFN0cmluZyBtX3BlbmRpbmdTcmM7CiAg ICAgICAgIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiBtX3NjcmlwdGluZ1Blcm1pc3Npb247 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwIGIv V2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcAppbmRleCBlZWU4ZDk3Li5m NjdjOGQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIu Y3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAKQEAgLTEs MTEgKzEsMTIgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDAgUGV0ZXIgS2VsbHkgKHBta0Bw b3N0LmNvbSkKKyAqIENvcHlyaWdodCAoQykgMjAwMCBQZXRlciBLZWxseSA8cG1rQHBvc3QuY29t PgogICogQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAwNiBBbGV4ZXkgUHJvc2t1cnlha292IChh cEB3ZWJraXQub3JnKQotICogQ29weXJpZ2h0IChDKSAyMDA3IFNhbXVlbCBXZWluaWcgKHNhbUB3 ZWJraXQub3JnKQorICogQ29weXJpZ2h0IChDKSAyMDA2IEFsZXhleSBQcm9za3VyeWFrb3YgPGFw QHdlYmtpdC5vcmc+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDcgU2FtdWVsIFdlaW5pZyA8c2FtQHdl YmtpdC5vcmc+CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggTm9raWEgQ29ycG9yYXRpb24gYW5kL29y IGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggSG9sZ2VyIEhhbnMg UGV0ZXIgRnJleXRoZXIKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSBUb3JjaCBNb2JpbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50b3JjaG1vYmlsZS5jb20vKQor ICogQ29weXJpZ2h0IChDKSAyMDEwIFBhdHJpY2sgR2Fuc3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNv bT4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNjgxLDYgKzY4MiwxOCBAQCBzdGF0aWMgaW5saW5l IFN0cmluZyB0b1N0cmluZyhjb25zdCB4bWxDaGFyKiBzdHJpbmcpCiAgICAgcmV0dXJuIFN0cmlu Zzo6ZnJvbVVURjgocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oc3RyaW5nKSk7CiB9CiAK K3N0YXRpYyBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljU3RyaW5nKGNvbnN0IHhtbENoYXIq IHN0cmluZywgc2l6ZV90IHNpemUpCit7CisgICAgLy8gRklYTUU6IFVzZSBBdG9taWNTdHJpbmc6 OmZyb21VVEY4LgorICAgIHJldHVybiBBdG9taWNTdHJpbmcodG9TdHJpbmcoc3RyaW5nLCBzaXpl KSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljU3RyaW5nKGNvbnN0 IHhtbENoYXIqIHN0cmluZykKK3sKKyAgICAvLyBGSVhNRTogVXNlIEF0b21pY1N0cmluZzo6ZnJv bVVURjguCisgICAgcmV0dXJuIEF0b21pY1N0cmluZyh0b1N0cmluZyhzdHJpbmcpKTsKK30KKwog c3RydWN0IF94bWxTQVgyTmFtZXNwYWNlIHsKICAgICBjb25zdCB4bWxDaGFyKiBwcmVmaXg7CiAg ICAgY29uc3QgeG1sQ2hhciogdXJpOwpAQCAtNjkyLDcgKzcwNSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBoYW5kbGVFbGVtZW50TmFtZXNwYWNlcyhFbGVtZW50KiBuZXdFbGVtZW50LCBjb25zdCB4 bWxDaGFyKioKICAgICB4bWxTQVgyTmFtZXNwYWNlKiBuYW1lc3BhY2VzID0gcmVpbnRlcnByZXRf Y2FzdDx4bWxTQVgyTmFtZXNwYWNlKj4obGlieG1sTmFtZXNwYWNlcyk7CiAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBuYl9uYW1lc3BhY2VzOyBpKyspIHsKICAgICAgICAgQXRvbWljU3RyaW5nIG5h bWVzcGFjZVFOYW1lID0geG1sbnNBdG9tOwotICAgICAgICBTdHJpbmcgbmFtZXNwYWNlVVJJID0g dG9TdHJpbmcobmFtZXNwYWNlc1tpXS51cmkpOworICAgICAgICBBdG9taWNTdHJpbmcgbmFtZXNw YWNlVVJJID0gdG9BdG9taWNTdHJpbmcobmFtZXNwYWNlc1tpXS51cmkpOwogICAgICAgICBpZiAo bmFtZXNwYWNlc1tpXS5wcmVmaXgpCiAgICAgICAgICAgICBuYW1lc3BhY2VRTmFtZSA9ICJ4bWxu czoiICsgdG9TdHJpbmcobmFtZXNwYWNlc1tpXS5wcmVmaXgpOwogICAgICAgICBuZXdFbGVtZW50 LT5zZXRBdHRyaWJ1dGVOUyhYTUxOU05hbWVzOjp4bWxuc05hbWVzcGFjZVVSSSwgbmFtZXNwYWNl UU5hbWUsIG5hbWVzcGFjZVVSSSwgZWMsIHNjcmlwdGluZ1Blcm1pc3Npb24pOwpAQCAtNzE0LDEy ICs3MjcsMTEgQEAgc3RhdGljIGlubGluZSB2b2lkIGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKEVs ZW1lbnQqIG5ld0VsZW1lbnQsIGNvbnN0IHhtbENoYXIqKgogewogICAgIHhtbFNBWDJBdHRyaWJ1 dGVzKiBhdHRyaWJ1dGVzID0gcmVpbnRlcnByZXRfY2FzdDx4bWxTQVgyQXR0cmlidXRlcyo+KGxp YnhtbEF0dHJpYnV0ZXMpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmJfYXR0cmlidXRlczsg aSsrKSB7Ci0gICAgICAgIFN0cmluZyBhdHRyTG9jYWxOYW1lID0gdG9TdHJpbmcoYXR0cmlidXRl c1tpXS5sb2NhbG5hbWUpOwotICAgICAgICBpbnQgdmFsdWVMZW5ndGggPSAoaW50KSAoYXR0cmli dXRlc1tpXS5lbmQgLSBhdHRyaWJ1dGVzW2ldLnZhbHVlKTsKLSAgICAgICAgU3RyaW5nIGF0dHJW YWx1ZSA9IHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0udmFsdWUsIHZhbHVlTGVuZ3RoKTsKKyAgICAg ICAgaW50IHZhbHVlTGVuZ3RoID0gc3RhdGljX2Nhc3Q8aW50PihhdHRyaWJ1dGVzW2ldLmVuZCAt IGF0dHJpYnV0ZXNbaV0udmFsdWUpOworICAgICAgICBBdG9taWNTdHJpbmcgYXR0clZhbHVlID0g dG9BdG9taWNTdHJpbmcoYXR0cmlidXRlc1tpXS52YWx1ZSwgdmFsdWVMZW5ndGgpOwogICAgICAg ICBTdHJpbmcgYXR0clByZWZpeCA9IHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0ucHJlZml4KTsKLSAg ICAgICAgU3RyaW5nIGF0dHJVUkkgPSBhdHRyUHJlZml4LmlzRW1wdHkoKSA/IFN0cmluZygpIDog dG9TdHJpbmcoYXR0cmlidXRlc1tpXS51cmkpOwotICAgICAgICBTdHJpbmcgYXR0clFOYW1lID0g YXR0clByZWZpeC5pc0VtcHR5KCkgPyBhdHRyTG9jYWxOYW1lIDogYXR0clByZWZpeCArICI6IiAr IGF0dHJMb2NhbE5hbWU7CisgICAgICAgIEF0b21pY1N0cmluZyBhdHRyVVJJID0gYXR0clByZWZp eC5pc0VtcHR5KCkgPyBBdG9taWNTdHJpbmcoKSA6IHRvQXRvbWljU3RyaW5nKGF0dHJpYnV0ZXNb aV0udXJpKTsKKyAgICAgICAgQXRvbWljU3RyaW5nIGF0dHJRTmFtZSA9IGF0dHJQcmVmaXguaXNF bXB0eSgpID8gdG9BdG9taWNTdHJpbmcoYXR0cmlidXRlc1tpXS5sb2NhbG5hbWUpIDogYXR0clBy ZWZpeCArICI6IiArIHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0ubG9jYWxuYW1lKTsKIAogICAgICAg ICBuZXdFbGVtZW50LT5zZXRBdHRyaWJ1dGVOUyhhdHRyVVJJLCBhdHRyUU5hbWUsIGF0dHJWYWx1 ZSwgZWMsIHNjcmlwdGluZ1Blcm1pc3Npb24pOwogICAgICAgICBpZiAoZWMpIC8vIGV4Y2VwdGlv biBzZXR0aW5nIGF0dHJpYnV0ZXMKQEAgLTc0OSw5ICs3NjEsOSBAQCB2b2lkIFhNTERvY3VtZW50 UGFyc2VyOjpzdGFydEVsZW1lbnROcyhjb25zdCB4bWxDaGFyKiB4bWxMb2NhbE5hbWUsIGNvbnN0 IHhtbENoYQogCiAgICAgZXhpdFRleHQoKTsKIAotICAgIFN0cmluZyBsb2NhbE5hbWUgPSB0b1N0 cmluZyh4bWxMb2NhbE5hbWUpOwotICAgIFN0cmluZyB1cmkgPSB0b1N0cmluZyh4bWxVUkkpOwot ICAgIFN0cmluZyBwcmVmaXggPSB0b1N0cmluZyh4bWxQcmVmaXgpOworICAgIEF0b21pY1N0cmlu ZyBsb2NhbE5hbWUgPSB0b0F0b21pY1N0cmluZyh4bWxMb2NhbE5hbWUpOworICAgIEF0b21pY1N0 cmluZyB1cmkgPSB0b0F0b21pY1N0cmluZyh4bWxVUkkpOworICAgIEF0b21pY1N0cmluZyBwcmVm aXggPSB0b0F0b21pY1N0cmluZyh4bWxQcmVmaXgpOwogCiAgICAgaWYgKG1fcGFyc2luZ0ZyYWdt ZW50ICYmIHVyaS5pc051bGwoKSkgewogICAgICAgICBpZiAoIXByZWZpeC5pc051bGwoKSkK 68001 2010-09-18 01:16:26 -0700 2010-09-18 20:02:07 -0700 Patch bug-45990.patch text/plain 5540 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDIwZmJhMC4uMWJiMDQ5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0xNyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAcGFyb2dhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2UgQXRvbWljU3RyaW5nIGluc3RlZCBvZiBTdHJpbmcgaW4g WE1MRG9jdW1lbnRQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ1OTkwCisKKyAgICAgICAgQ3JlYXRlIEF0b21pY1N0cmluZyBhcyBlYXJseSBh cyBwb3NzaWJsZS4KKyAgICAgICAgVGhpcyBjYW4gYXZvaWQgdW5uZWNlc3NhcnkgbWVtY3B5IG9m IFN0cmluZyBjb250ZW50LgorCisgICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyLmg6Cisg ICAgICAgICogZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHA6CisgICAgICAgIChXZWJD b3JlOjp0b0F0b21pY1N0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVFbGVtZW50TmFt ZXNwYWNlcyk6CisgICAgICAgIChXZWJDb3JlOjpoYW5kbGVFbGVtZW50QXR0cmlidXRlcyk6Cisg ICAgICAgIChXZWJDb3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6c3RhcnRFbGVtZW50TnMpOgorCiAy MDEwLTA5LTE2ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFRvbnkgQ2hhbmcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1 bWVudFBhcnNlci5oIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuaAppbmRleCBhNjRk N2U0Li5lMDc3MGJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5o CisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyLmgKQEAgLTIxMSw5ICsyMTEsOSBA QCBwdWJsaWM6CiAgICAgICAgIGludCBtX3NjcmlwdFN0YXJ0TGluZTsKIAogICAgICAgICBib29s IG1fcGFyc2luZ0ZyYWdtZW50OwotICAgICAgICBTdHJpbmcgbV9kZWZhdWx0TmFtZXNwYWNlVVJJ OworICAgICAgICBBdG9taWNTdHJpbmcgbV9kZWZhdWx0TmFtZXNwYWNlVVJJOwogCi0gICAgICAg IHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4gUHJlZml4Rm9yTmFtZXNwYWNlTWFwOwor ICAgICAgICB0eXBlZGVmIEhhc2hNYXA8QXRvbWljU3RyaW5nLCBBdG9taWNTdHJpbmc+IFByZWZp eEZvck5hbWVzcGFjZU1hcDsKICAgICAgICAgUHJlZml4Rm9yTmFtZXNwYWNlTWFwIG1fcHJlZml4 VG9OYW1lc3BhY2VNYXA7CiAgICAgICAgIFNlZ21lbnRlZFN0cmluZyBtX3BlbmRpbmdTcmM7CiAg ICAgICAgIEZyYWdtZW50U2NyaXB0aW5nUGVybWlzc2lvbiBtX3NjcmlwdGluZ1Blcm1pc3Npb247 CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwIGIv V2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcAppbmRleCBlZWU4ZDk3Li5m NjdjOGQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIu Y3BwCisrKyBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAKQEAgLTEs MTEgKzEsMTIgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDAgUGV0ZXIgS2VsbHkgKHBta0Bw b3N0LmNvbSkKKyAqIENvcHlyaWdodCAoQykgMjAwMCBQZXRlciBLZWxseSA8cG1rQHBvc3QuY29t PgogICogQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA4IEFwcGxlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAwNiBBbGV4ZXkgUHJvc2t1cnlha292IChh cEB3ZWJraXQub3JnKQotICogQ29weXJpZ2h0IChDKSAyMDA3IFNhbXVlbCBXZWluaWcgKHNhbUB3 ZWJraXQub3JnKQorICogQ29weXJpZ2h0IChDKSAyMDA2IEFsZXhleSBQcm9za3VyeWFrb3YgPGFw QHdlYmtpdC5vcmc+CisgKiBDb3B5cmlnaHQgKEMpIDIwMDcgU2FtdWVsIFdlaW5pZyA8c2FtQHdl YmtpdC5vcmc+CiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggTm9raWEgQ29ycG9yYXRpb24gYW5kL29y IGl0cyBzdWJzaWRpYXJ5KC1pZXMpCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggSG9sZ2VyIEhhbnMg UGV0ZXIgRnJleXRoZXIKICAqIENvcHlyaWdodCAoQykgMjAwOCwgMjAwOSBUb3JjaCBNb2JpbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50b3JjaG1vYmlsZS5jb20vKQor ICogQ29weXJpZ2h0IChDKSAyMDEwIFBhdHJpY2sgR2Fuc3RlcmVyIDxwYXJvZ2FAcGFyb2dhLmNv bT4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3Ry aWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNjgxLDYgKzY4MiwxOCBAQCBzdGF0aWMgaW5saW5l IFN0cmluZyB0b1N0cmluZyhjb25zdCB4bWxDaGFyKiBzdHJpbmcpCiAgICAgcmV0dXJuIFN0cmlu Zzo6ZnJvbVVURjgocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oc3RyaW5nKSk7CiB9CiAK K3N0YXRpYyBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljU3RyaW5nKGNvbnN0IHhtbENoYXIq IHN0cmluZywgc2l6ZV90IHNpemUpCit7CisgICAgLy8gRklYTUU6IFVzZSBBdG9taWNTdHJpbmc6 OmZyb21VVEY4LgorICAgIHJldHVybiBBdG9taWNTdHJpbmcodG9TdHJpbmcoc3RyaW5nLCBzaXpl KSk7Cit9CisKK3N0YXRpYyBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljU3RyaW5nKGNvbnN0 IHhtbENoYXIqIHN0cmluZykKK3sKKyAgICAvLyBGSVhNRTogVXNlIEF0b21pY1N0cmluZzo6ZnJv bVVURjguCisgICAgcmV0dXJuIEF0b21pY1N0cmluZyh0b1N0cmluZyhzdHJpbmcpKTsKK30KKwog c3RydWN0IF94bWxTQVgyTmFtZXNwYWNlIHsKICAgICBjb25zdCB4bWxDaGFyKiBwcmVmaXg7CiAg ICAgY29uc3QgeG1sQ2hhciogdXJpOwpAQCAtNjkyLDcgKzcwNSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBoYW5kbGVFbGVtZW50TmFtZXNwYWNlcyhFbGVtZW50KiBuZXdFbGVtZW50LCBjb25zdCB4 bWxDaGFyKioKICAgICB4bWxTQVgyTmFtZXNwYWNlKiBuYW1lc3BhY2VzID0gcmVpbnRlcnByZXRf Y2FzdDx4bWxTQVgyTmFtZXNwYWNlKj4obGlieG1sTmFtZXNwYWNlcyk7CiAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBuYl9uYW1lc3BhY2VzOyBpKyspIHsKICAgICAgICAgQXRvbWljU3RyaW5nIG5h bWVzcGFjZVFOYW1lID0geG1sbnNBdG9tOwotICAgICAgICBTdHJpbmcgbmFtZXNwYWNlVVJJID0g dG9TdHJpbmcobmFtZXNwYWNlc1tpXS51cmkpOworICAgICAgICBBdG9taWNTdHJpbmcgbmFtZXNw YWNlVVJJID0gdG9BdG9taWNTdHJpbmcobmFtZXNwYWNlc1tpXS51cmkpOwogICAgICAgICBpZiAo bmFtZXNwYWNlc1tpXS5wcmVmaXgpCiAgICAgICAgICAgICBuYW1lc3BhY2VRTmFtZSA9ICJ4bWxu czoiICsgdG9TdHJpbmcobmFtZXNwYWNlc1tpXS5wcmVmaXgpOwogICAgICAgICBuZXdFbGVtZW50 LT5zZXRBdHRyaWJ1dGVOUyhYTUxOU05hbWVzOjp4bWxuc05hbWVzcGFjZVVSSSwgbmFtZXNwYWNl UU5hbWUsIG5hbWVzcGFjZVVSSSwgZWMsIHNjcmlwdGluZ1Blcm1pc3Npb24pOwpAQCAtNzE0LDEy ICs3MjcsMTEgQEAgc3RhdGljIGlubGluZSB2b2lkIGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKEVs ZW1lbnQqIG5ld0VsZW1lbnQsIGNvbnN0IHhtbENoYXIqKgogewogICAgIHhtbFNBWDJBdHRyaWJ1 dGVzKiBhdHRyaWJ1dGVzID0gcmVpbnRlcnByZXRfY2FzdDx4bWxTQVgyQXR0cmlidXRlcyo+KGxp YnhtbEF0dHJpYnV0ZXMpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbmJfYXR0cmlidXRlczsg aSsrKSB7Ci0gICAgICAgIFN0cmluZyBhdHRyTG9jYWxOYW1lID0gdG9TdHJpbmcoYXR0cmlidXRl c1tpXS5sb2NhbG5hbWUpOwotICAgICAgICBpbnQgdmFsdWVMZW5ndGggPSAoaW50KSAoYXR0cmli dXRlc1tpXS5lbmQgLSBhdHRyaWJ1dGVzW2ldLnZhbHVlKTsKLSAgICAgICAgU3RyaW5nIGF0dHJW YWx1ZSA9IHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0udmFsdWUsIHZhbHVlTGVuZ3RoKTsKKyAgICAg ICAgaW50IHZhbHVlTGVuZ3RoID0gc3RhdGljX2Nhc3Q8aW50PihhdHRyaWJ1dGVzW2ldLmVuZCAt IGF0dHJpYnV0ZXNbaV0udmFsdWUpOworICAgICAgICBBdG9taWNTdHJpbmcgYXR0clZhbHVlID0g dG9BdG9taWNTdHJpbmcoYXR0cmlidXRlc1tpXS52YWx1ZSwgdmFsdWVMZW5ndGgpOwogICAgICAg ICBTdHJpbmcgYXR0clByZWZpeCA9IHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0ucHJlZml4KTsKLSAg ICAgICAgU3RyaW5nIGF0dHJVUkkgPSBhdHRyUHJlZml4LmlzRW1wdHkoKSA/IFN0cmluZygpIDog dG9TdHJpbmcoYXR0cmlidXRlc1tpXS51cmkpOwotICAgICAgICBTdHJpbmcgYXR0clFOYW1lID0g YXR0clByZWZpeC5pc0VtcHR5KCkgPyBhdHRyTG9jYWxOYW1lIDogYXR0clByZWZpeCArICI6IiAr IGF0dHJMb2NhbE5hbWU7CisgICAgICAgIEF0b21pY1N0cmluZyBhdHRyVVJJID0gYXR0clByZWZp eC5pc0VtcHR5KCkgPyBBdG9taWNTdHJpbmcoKSA6IHRvQXRvbWljU3RyaW5nKGF0dHJpYnV0ZXNb aV0udXJpKTsKKyAgICAgICAgQXRvbWljU3RyaW5nIGF0dHJRTmFtZSA9IGF0dHJQcmVmaXguaXNF bXB0eSgpID8gdG9BdG9taWNTdHJpbmcoYXR0cmlidXRlc1tpXS5sb2NhbG5hbWUpIDogQXRvbWlj U3RyaW5nKGF0dHJQcmVmaXggKyAiOiIgKyB0b1N0cmluZyhhdHRyaWJ1dGVzW2ldLmxvY2FsbmFt ZSkpOwogCiAgICAgICAgIG5ld0VsZW1lbnQtPnNldEF0dHJpYnV0ZU5TKGF0dHJVUkksIGF0dHJR TmFtZSwgYXR0clZhbHVlLCBlYywgc2NyaXB0aW5nUGVybWlzc2lvbik7CiAgICAgICAgIGlmIChl YykgLy8gZXhjZXB0aW9uIHNldHRpbmcgYXR0cmlidXRlcwpAQCAtNzQ5LDkgKzc2MSw5IEBAIHZv aWQgWE1MRG9jdW1lbnRQYXJzZXI6OnN0YXJ0RWxlbWVudE5zKGNvbnN0IHhtbENoYXIqIHhtbExv Y2FsTmFtZSwgY29uc3QgeG1sQ2hhCiAKICAgICBleGl0VGV4dCgpOwogCi0gICAgU3RyaW5nIGxv Y2FsTmFtZSA9IHRvU3RyaW5nKHhtbExvY2FsTmFtZSk7Ci0gICAgU3RyaW5nIHVyaSA9IHRvU3Ry aW5nKHhtbFVSSSk7Ci0gICAgU3RyaW5nIHByZWZpeCA9IHRvU3RyaW5nKHhtbFByZWZpeCk7Cisg ICAgQXRvbWljU3RyaW5nIGxvY2FsTmFtZSA9IHRvQXRvbWljU3RyaW5nKHhtbExvY2FsTmFtZSk7 CisgICAgQXRvbWljU3RyaW5nIHVyaSA9IHRvQXRvbWljU3RyaW5nKHhtbFVSSSk7CisgICAgQXRv bWljU3RyaW5nIHByZWZpeCA9IHRvQXRvbWljU3RyaW5nKHhtbFByZWZpeCk7CiAKICAgICBpZiAo bV9wYXJzaW5nRnJhZ21lbnQgJiYgdXJpLmlzTnVsbCgpKSB7CiAgICAgICAgIGlmICghcHJlZml4 LmlzTnVsbCgpKQo=