46390 2010-09-23 12:34:42 -0700 Remove unnecessary parameter from AsyncFileWriterClient::didTruncate 2010-09-24 01:15:33 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 44358 1 ericu ericu commit-queue kinuko michaeln oldest_to_newest 283853 0 ericu 2010-09-23 12:34:42 -0700 The FileWriter knows the length it sent to truncate, and we're never going to get the wrong answer back. We might as well cache what we sent rather than have an extra parameter through 10 layers of calls. It's going to get cached at some level anyway; it might as well be right in the FileWriter. 283917 1 68582 ericu 2010-09-23 13:39:29 -0700 Created attachment 68582 Patch 283968 2 68582 levin 2010-09-23 14:39:31 -0700 Comment on attachment 68582 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68582&action=review Just a few things to address. > WebCore/fileapi/FileWriter.cpp:@ > void FileWriter::truncate(long long posi Please init m_truncateLength to 0 in constructor. > WebCore/fileapi/FileWriter.cpp:174 > + ASSERT(m_truncateLength >= 0); Why are there both of these asserts? Should they also be in FileWriter::truncate when m_truncateLength is set? > WebCore/fileapi/FileWriter.cpp:178 > m_readyState = DONE; Set m_truncateLength be set back to 0 here. > WebKit/chromium/src/AsyncFileWriterChromium.h:-64 > - virtual void didTruncate(long long length); What code calls this api? (I don't see a change to it.) 284020 3 68605 ericu 2010-09-23 15:20:58 -0700 Created attachment 68605 Patch 284027 4 ericu 2010-09-23 15:24:52 -0700 (In reply to comment #2) > (From update of attachment 68582 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=68582&action=review > > Just a few things to address. > > > WebCore/fileapi/FileWriter.cpp:@ > > void FileWriter::truncate(long long posi > > Please init m_truncateLength to 0 in constructor. I used -1, as 0 is a legal value. > > WebCore/fileapi/FileWriter.cpp:174 > > + ASSERT(m_truncateLength >= 0); > > Why are there both of these asserts? Typo--fixed. However, the spec has changed, and now you can use truncate to extend the file as well, so I've rolled that in to this change. > Should they also be in FileWriter::truncate when m_truncateLength is set? Actually, there should be a soft error there [a thrown exception], so that we can assert here. Fixed. > > WebCore/fileapi/FileWriter.cpp:178 > > m_readyState = DONE; > > Set m_truncateLength be set back to 0 here. Done [-1]. > > WebKit/chromium/src/AsyncFileWriterChromium.h:-64 > > - virtual void didTruncate(long long length); > > What code calls this api? (I don't see a change to it.) I haven't written it yet ;'>. My Chromium implementation is starting at http://codereview.chromium.org/3440021/show, and the WebCore implementation will follow shortly thereafter. 284289 5 68605 commit-queue 2010-09-24 01:15:28 -0700 Comment on attachment 68605 Patch Clearing flags on attachment: 68605 Committed r68242: <http://trac.webkit.org/changeset/68242> 284290 6 commit-queue 2010-09-24 01:15:33 -0700 All reviewed patches have been landed. Closing bug. 68582 2010-09-23 13:39:29 -0700 2010-09-23 15:20:55 -0700 Patch bug-46390-20100923133928.patch text/plain 5397 ericu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODE4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjMgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdW5uZWNlc3NhcnkgcGFyYW1ldGVyIGZyb20gQXN5bmNGaWxlV3JpdGVyQ2xpZW50Ojpk aWRUcnVuY2F0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDYzOTAKKworICAgICAgICAqIGZpbGVhcGkvQXN5bmNGaWxlV3JpdGVyQ2xpZW50Lmg6CisK KyAgICAgICAgQWRkZWQgc3RhdGUgdG8gRmlsZVdyaXRlciB0byByZXBsYWNlIHRoZSBwYXJhbWV0 ZXIuCisgICAgICAgICogZmlsZWFwaS9GaWxlV3JpdGVyLmg6CisgICAgICAgICogZmlsZWFwaS9G aWxlV3JpdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVXcml0ZXI6OnRydW5jYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkZpbGVXcml0ZXI6OmRpZFRydW5jYXRlKToKKwogMjAxMC0wOS0y MyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogV2ViQ29yZS9maWxlYXBpL0FzeW5jRmlsZVdyaXRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZmlsZWFwaS9Bc3luY0ZpbGVXcml0ZXJD bGllbnQuaAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJDb3JlL2ZpbGVhcGkvQXN5bmNGaWxlV3Jp dGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgfkFzeW5jRmlsZVdyaXRlckNsaWVudCgpIHt9CiAKICAgICB2aXJ0dWFsIHZvaWQg ZGlkV3JpdGUobG9uZyBsb25nIGJ5dGVzLCBib29sIGNvbXBsZXRlKSA9IDA7Ci0gICAgdmlydHVh bCB2b2lkIGRpZFRydW5jYXRlKGxvbmcgbG9uZyBwb3NpdGlvbikgPSAwOworICAgIHZpcnR1YWwg dm9pZCBkaWRUcnVuY2F0ZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChFeGNlcHRp b25Db2RlKSA9IDA7CiB9OwogCkluZGV4OiBXZWJDb3JlL2ZpbGVhcGkvRmlsZVdyaXRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9maWxlYXBpL0ZpbGVXcml0ZXIuY3BwCShyZXZpc2lvbiA2 ODE4MykKKysrIFdlYkNvcmUvZmlsZWFwaS9GaWxlV3JpdGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTMwLDYgKzEzMCw3IEBAIHZvaWQgRmlsZVdyaXRlcjo6dHJ1bmNhdGUobG9uZyBsb25nIHBv c2kKICAgICBtX3JlYWR5U3RhdGUgPSBXUklUSU5HOwogICAgIG1fYnl0ZXNXcml0dGVuID0gMDsK ICAgICBtX2J5dGVzVG9Xcml0ZSA9IDA7CisgICAgbV90cnVuY2F0ZUxlbmd0aCA9IHBvc2l0aW9u OwogICAgIGZpcmVFdmVudChldmVudE5hbWVzKCkud3JpdGVzdGFydEV2ZW50KTsKICAgICBtX3dy aXRlci0+dHJ1bmNhdGUocG9zaXRpb24pOwogfQpAQCAtMTY3LDEyICsxNjgsMTEgQEAgdm9pZCBG aWxlV3JpdGVyOjpkaWRXcml0ZShsb25nIGxvbmcgYnl0ZQogICAgICAgICBmaXJlRXZlbnQoZXZl bnROYW1lcygpLndyaXRlZW5kRXZlbnQpOwogfQogCi12b2lkIEZpbGVXcml0ZXI6OmRpZFRydW5j YXRlKGxvbmcgbG9uZyBsZW5ndGgpCit2b2lkIEZpbGVXcml0ZXI6OmRpZFRydW5jYXRlKCkKIHsK LSAgICBBU1NFUlQobGVuZ3RoID4gMCk7Ci0gICAgQVNTRVJUKGxlbmd0aCA+PSAwKTsKLSAgICBB U1NFUlQobGVuZ3RoIDwgbV9sZW5ndGgpOwotICAgIG1fbGVuZ3RoID0gbGVuZ3RoOworICAgIEFT U0VSVChtX3RydW5jYXRlTGVuZ3RoID4gMCk7CisgICAgQVNTRVJUKG1fdHJ1bmNhdGVMZW5ndGgg Pj0gMCk7CisgICAgbV9sZW5ndGggPSBtX3RydW5jYXRlTGVuZ3RoOwogICAgIGlmIChtX3Bvc2l0 aW9uID4gbV9sZW5ndGgpCiAgICAgICAgIG1fcG9zaXRpb24gPSBtX2xlbmd0aDsKICAgICBtX3Jl YWR5U3RhdGUgPSBET05FOwpJbmRleDogV2ViQ29yZS9maWxlYXBpL0ZpbGVXcml0ZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2ZpbGVhcGkvRmlsZVdyaXRlci5oCShyZXZpc2lvbiA2ODE4MykK KysrIFdlYkNvcmUvZmlsZWFwaS9GaWxlV3JpdGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc2LDcg Kzc2LDcgQEAgcHVibGljOgogCiAgICAgLy8gQXN5bmNGaWxlV3JpdGVyQ2xpZW50CiAgICAgdm9p ZCBkaWRXcml0ZShsb25nIGxvbmcgYnl0ZXMsIGJvb2wgY29tcGxldGUpOwotICAgIHZvaWQgZGlk VHJ1bmNhdGUobG9uZyBsb25nIGxlbmd0aCk7CisgICAgdm9pZCBkaWRUcnVuY2F0ZSgpOwogICAg IHZvaWQgZGlkRmFpbChFeGNlcHRpb25Db2RlIGVjKTsKIAogICAgIC8vIEFjdGl2ZURPTU9iamVj dApAQCAtMTIxLDYgKzEyMSw3IEBAIHByaXZhdGU6CiAgICAgbG9uZyBsb25nIG1fbGVuZ3RoOwog ICAgIGxvbmcgbG9uZyBtX2J5dGVzV3JpdHRlbjsKICAgICBsb25nIGxvbmcgbV9ieXRlc1RvV3Jp dGU7CisgICAgbG9uZyBsb25nIG1fdHJ1bmNhdGVMZW5ndGg7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDY4MTg0KQorKysgV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDEwLTA5 LTIzICBFcmljIFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHVubmVjZXNzYXJ5IHBhcmFt ZXRlciBmcm9tIEFzeW5jRmlsZVdyaXRlckNsaWVudDo6ZGlkVHJ1bmNhdGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MzkwCisKKyAgICAgICAgKiBw dWJsaWMvV2ViRmlsZVdyaXRlckNsaWVudC5oOgorICAgICAgICAqIHNyYy9Bc3luY0ZpbGVXcml0 ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgICogc3JjL0FzeW5jRmlsZVdyaXRlckNocm9taXVtLmg6 CisKIDIwMTAtMDktMjMgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRmlsZVdyaXRlckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRmlsZVdyaXRlckNsaWVudC5oCShyZXZpc2lvbiA2ODE4MykKKysrIFdlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRmlsZVdyaXRlckNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00 Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkV3JpdGUobG9uZyBsb25n IGJ5dGVzLCBib29sIGNvbXBsZXRlKSA9IDA7CiAKICAgICAvLyBDYWxsZWQgb25jZSB3aGVuIHRo ZSB0cnVuY2F0ZSBjb21wbGV0ZXMgc3VjY2Vzc2Z1bGx5LgotICAgIHZpcnR1YWwgdm9pZCBkaWRU cnVuY2F0ZShsb25nIGxvbmcgbGVuZ3RoKSA9IDA7CisgICAgdmlydHVhbCB2b2lkIGRpZFRydW5j YXRlKCkgPSAwOwogCiAgICAgLy8gQ2FsbGVkIGlmIHRoZSB3cml0ZSBvciB0cnVuY2F0ZSBmYWls cywgb3IgaWYgaXQgaXMgY2FuY2VsbGVkIGJlZm9yZSB0aGUgd3JpdGUgb3IgdHJ1bmNhdGUgY29t cGxldGVzLiAgQ29tcGxldGlvbiBvZiBhbiBvcGVyYXRpb24gd2lsbCBiZSBzaWduYWxsZWQgZXhh Y3RseSBvbmNlLCBlaXRoZXIgYnkgZGlkRmFpbCwgZGlkVHJ1bmNhdGUsIG9yIGRpZFdyaXRlKC4u LiwgdHJ1ZSkuCiAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoV2ViRmlsZUVycm9yKSA9IDA7Cklu ZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVdyaXRlckNocm9taXVtLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVdyaXRlckNocm9taXVtLmNw cAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVdyaXRl ckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzgsOSArNzgsOSBAQCB2b2lkIEFzeW5j RmlsZVdyaXRlckNocm9taXVtOjpkaWRXcml0ZShsCiAgICAgbV9jbGllbnQtPmRpZFdyaXRlKGJ5 dGVzLCBjb21wbGV0ZSk7CiB9CiAKLXZvaWQgQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW06OmRpZFRy dW5jYXRlKGxvbmcgbG9uZyBsZW5ndGgpCit2b2lkIEFzeW5jRmlsZVdyaXRlckNocm9taXVtOjpk aWRUcnVuY2F0ZSgpCiB7Ci0gICAgbV9jbGllbnQtPmRpZFRydW5jYXRlKGxlbmd0aCk7CisgICAg bV9jbGllbnQtPmRpZFRydW5jYXRlKCk7CiB9CiAKIHZvaWQgQXN5bmNGaWxlV3JpdGVyQ2hyb21p dW06OmRpZEZhaWwoV2ViS2l0OjpXZWJGaWxlRXJyb3IgZXJyb3IpCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vc3JjL0FzeW5jRmlsZVdyaXRlckNocm9taXVtLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5oCShyZXZpc2lvbiA2ODE4MykK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0uaAkod29ya2lu ZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBXZWJGaWxlV3JpdGVy Q2xpZW50CiAgICAgdmlydHVhbCB2b2lkIGRpZFdyaXRlKGxvbmcgbG9uZyBieXRlcywgYm9vbCBj b21wbGV0ZSk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZFRydW5jYXRlKGxvbmcgbG9uZyBsZW5ndGgp OworICAgIHZpcnR1YWwgdm9pZCBkaWRUcnVuY2F0ZSgpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRG YWlsKFdlYktpdDo6V2ViRmlsZUVycm9yKTsKIAogcHJpdmF0ZToK 68605 2010-09-23 15:20:58 -0700 2010-09-24 01:15:28 -0700 Patch bug-46390-20100923152057.patch text/plain 6001 ericu SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODE4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjMgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdW5uZWNlc3NhcnkgcGFyYW1ldGVyIGZyb20gQXN5bmNGaWxlV3JpdGVyQ2xpZW50Ojpk aWRUcnVuY2F0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDYzOTAKKworICAgICAgICAqIGZpbGVhcGkvQXN5bmNGaWxlV3JpdGVyQ2xpZW50Lmg6CisK KyAgICAgICAgQWRkZWQgc3RhdGUgdG8gRmlsZVdyaXRlciB0byByZXBsYWNlIHRoZSBwYXJhbWV0 ZXIuCisgICAgICAgICogZmlsZWFwaS9GaWxlV3JpdGVyLmg6CisgICAgICAgICogZmlsZWFwaS9G aWxlV3JpdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVXcml0ZXI6OnRydW5jYXRlKToK KyAgICAgICAgKFdlYkNvcmU6OkZpbGVXcml0ZXI6OmRpZFRydW5jYXRlKToKKwogMjAxMC0wOS0y MyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBBZGFtIFJvYmVuLgpJbmRleDogV2ViQ29yZS9maWxlYXBpL0FzeW5jRmlsZVdyaXRl ckNsaWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZmlsZWFwaS9Bc3luY0ZpbGVXcml0ZXJD bGllbnQuaAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJDb3JlL2ZpbGVhcGkvQXN5bmNGaWxlV3Jp dGVyQ2xpZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgfkFzeW5jRmlsZVdyaXRlckNsaWVudCgpIHt9CiAKICAgICB2aXJ0dWFsIHZvaWQg ZGlkV3JpdGUobG9uZyBsb25nIGJ5dGVzLCBib29sIGNvbXBsZXRlKSA9IDA7Ci0gICAgdmlydHVh bCB2b2lkIGRpZFRydW5jYXRlKGxvbmcgbG9uZyBwb3NpdGlvbikgPSAwOworICAgIHZpcnR1YWwg dm9pZCBkaWRUcnVuY2F0ZSgpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChFeGNlcHRp b25Db2RlKSA9IDA7CiB9OwogCkluZGV4OiBXZWJDb3JlL2ZpbGVhcGkvRmlsZVdyaXRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9maWxlYXBpL0ZpbGVXcml0ZXIuY3BwCShyZXZpc2lvbiA2 ODE4MykKKysrIFdlYkNvcmUvZmlsZWFwaS9GaWxlV3JpdGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDgsNiArNDgsNyBAQCBGaWxlV3JpdGVyOjpGaWxlV3JpdGVyKFNjcmlwdEV4ZWN1dGlvbkNv CiAgICAgLCBtX3Bvc2l0aW9uKDApCiAgICAgLCBtX2J5dGVzV3JpdHRlbigwKQogICAgICwgbV9i eXRlc1RvV3JpdGUoMCkKKyAgICAsIG1fdHJ1bmNhdGVMZW5ndGgoLTEpCiB7CiB9CiAKQEAgLTEy Miw3ICsxMjMsNyBAQCB2b2lkIEZpbGVXcml0ZXI6OnNlZWsobG9uZyBsb25nIHBvc2l0aW9uCiB2 b2lkIEZpbGVXcml0ZXI6OnRydW5jYXRlKGxvbmcgbG9uZyBwb3NpdGlvbiwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7CiAgICAgQVNTRVJUKG1fd3JpdGVyKTsKLSAgICBpZiAobV9yZWFkeVN0YXRlID09 IFdSSVRJTkcgfHwgcG9zaXRpb24gPj0gbV9sZW5ndGgpIHsKKyAgICBpZiAobV9yZWFkeVN0YXRl ID09IFdSSVRJTkcgfHwgcG9zaXRpb24gPCAwKSB7CiAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFU RV9FUlI7CiAgICAgICAgIG1fZXJyb3IgPSBGaWxlRXJyb3I6OmNyZWF0ZShlYyk7CiAgICAgICAg IHJldHVybjsKQEAgLTEzMCw2ICsxMzEsNyBAQCB2b2lkIEZpbGVXcml0ZXI6OnRydW5jYXRlKGxv bmcgbG9uZyBwb3NpCiAgICAgbV9yZWFkeVN0YXRlID0gV1JJVElORzsKICAgICBtX2J5dGVzV3Jp dHRlbiA9IDA7CiAgICAgbV9ieXRlc1RvV3JpdGUgPSAwOworICAgIG1fdHJ1bmNhdGVMZW5ndGgg PSBwb3NpdGlvbjsKICAgICBmaXJlRXZlbnQoZXZlbnROYW1lcygpLndyaXRlc3RhcnRFdmVudCk7 CiAgICAgbV93cml0ZXItPnRydW5jYXRlKHBvc2l0aW9uKTsKIH0KQEAgLTE2NywxNSArMTY5LDE0 IEBAIHZvaWQgRmlsZVdyaXRlcjo6ZGlkV3JpdGUobG9uZyBsb25nIGJ5dGUKICAgICAgICAgZmly ZUV2ZW50KGV2ZW50TmFtZXMoKS53cml0ZWVuZEV2ZW50KTsKIH0KIAotdm9pZCBGaWxlV3JpdGVy OjpkaWRUcnVuY2F0ZShsb25nIGxvbmcgbGVuZ3RoKQordm9pZCBGaWxlV3JpdGVyOjpkaWRUcnVu Y2F0ZSgpCiB7Ci0gICAgQVNTRVJUKGxlbmd0aCA+IDApOwotICAgIEFTU0VSVChsZW5ndGggPj0g MCk7Ci0gICAgQVNTRVJUKGxlbmd0aCA8IG1fbGVuZ3RoKTsKLSAgICBtX2xlbmd0aCA9IGxlbmd0 aDsKKyAgICBBU1NFUlQobV90cnVuY2F0ZUxlbmd0aCA+PSAwKTsKKyAgICBtX2xlbmd0aCA9IG1f dHJ1bmNhdGVMZW5ndGg7CiAgICAgaWYgKG1fcG9zaXRpb24gPiBtX2xlbmd0aCkKICAgICAgICAg bV9wb3NpdGlvbiA9IG1fbGVuZ3RoOwogICAgIG1fcmVhZHlTdGF0ZSA9IERPTkU7CisgICAgbV90 cnVuY2F0ZUxlbmd0aCA9IC0xOwogICAgIGZpcmVFdmVudChldmVudE5hbWVzKCkud3JpdGVFdmVu dCk7CiAgICAgZmlyZUV2ZW50KGV2ZW50TmFtZXMoKS53cml0ZWVuZEV2ZW50KTsKIH0KSW5kZXg6 IFdlYkNvcmUvZmlsZWFwaS9GaWxlV3JpdGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9maWxl YXBpL0ZpbGVXcml0ZXIuaAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJDb3JlL2ZpbGVhcGkvRmls ZVdyaXRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03Niw3ICs3Niw3IEBAIHB1YmxpYzoKIAogICAg IC8vIEFzeW5jRmlsZVdyaXRlckNsaWVudAogICAgIHZvaWQgZGlkV3JpdGUobG9uZyBsb25nIGJ5 dGVzLCBib29sIGNvbXBsZXRlKTsKLSAgICB2b2lkIGRpZFRydW5jYXRlKGxvbmcgbG9uZyBsZW5n dGgpOworICAgIHZvaWQgZGlkVHJ1bmNhdGUoKTsKICAgICB2b2lkIGRpZEZhaWwoRXhjZXB0aW9u Q29kZSBlYyk7CiAKICAgICAvLyBBY3RpdmVET01PYmplY3QKQEAgLTEyMSw2ICsxMjEsNyBAQCBw cml2YXRlOgogICAgIGxvbmcgbG9uZyBtX2xlbmd0aDsKICAgICBsb25nIGxvbmcgbV9ieXRlc1dy aXR0ZW47CiAgICAgbG9uZyBsb25nIG1fYnl0ZXNUb1dyaXRlOworICAgIGxvbmcgbG9uZyBtX3Ry dW5jYXRlTGVuZ3RoOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCShyZXZpc2lvbiA2ODE4NCkKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wOS0yMyAgRXJpYyBVaHJoYW5lICA8ZXJp Y3VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBwYXJhbWV0ZXIgZnJvbSBBc3luY0ZpbGVXcml0 ZXJDbGllbnQ6OmRpZFRydW5jYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjM5MAorCisgICAgICAgICogcHVibGljL1dlYkZpbGVXcml0ZXJDbGll bnQuaDoKKyAgICAgICAgKiBzcmMvQXN5bmNGaWxlV3JpdGVyQ2hyb21pdW0uY3BwOgorICAgICAg ICAqIHNyYy9Bc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5oOgorCiAyMDEwLTA5LTIzICBFcmljIFVo cmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQg TGV2aW4uCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZpbGVXcml0ZXJDbGllbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZpbGVXcml0ZXJDbGll bnQuaAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZpbGVX cml0ZXJDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCB2b2lkIGRpZFdyaXRlKGxvbmcgbG9uZyBieXRlcywgYm9vbCBjb21wbGV0ZSkg PSAwOwogCiAgICAgLy8gQ2FsbGVkIG9uY2Ugd2hlbiB0aGUgdHJ1bmNhdGUgY29tcGxldGVzIHN1 Y2Nlc3NmdWxseS4KLSAgICB2aXJ0dWFsIHZvaWQgZGlkVHJ1bmNhdGUobG9uZyBsb25nIGxlbmd0 aCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRUcnVuY2F0ZSgpID0gMDsKIAogICAgIC8vIENh bGxlZCBpZiB0aGUgd3JpdGUgb3IgdHJ1bmNhdGUgZmFpbHMsIG9yIGlmIGl0IGlzIGNhbmNlbGxl ZCBiZWZvcmUgdGhlIHdyaXRlIG9yIHRydW5jYXRlIGNvbXBsZXRlcy4gIENvbXBsZXRpb24gb2Yg YW4gb3BlcmF0aW9uIHdpbGwgYmUgc2lnbmFsbGVkIGV4YWN0bHkgb25jZSwgZWl0aGVyIGJ5IGRp ZEZhaWwsIGRpZFRydW5jYXRlLCBvciBkaWRXcml0ZSguLi4sIHRydWUpLgogICAgIHZpcnR1YWwg dm9pZCBkaWRGYWlsKFdlYkZpbGVFcnJvcikgPSAwOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3Ny Yy9Bc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9t aXVtL3NyYy9Bc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5jcHAJKHJldmlzaW9uIDY4MTgzKQorKysg V2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVXcml0ZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTc4LDkgKzc4LDkgQEAgdm9pZCBBc3luY0ZpbGVXcml0ZXJDaHJvbWl1bTo6ZGlk V3JpdGUobAogICAgIG1fY2xpZW50LT5kaWRXcml0ZShieXRlcywgY29tcGxldGUpOwogfQogCi12 b2lkIEFzeW5jRmlsZVdyaXRlckNocm9taXVtOjpkaWRUcnVuY2F0ZShsb25nIGxvbmcgbGVuZ3Ro KQordm9pZCBBc3luY0ZpbGVXcml0ZXJDaHJvbWl1bTo6ZGlkVHJ1bmNhdGUoKQogewotICAgIG1f Y2xpZW50LT5kaWRUcnVuY2F0ZShsZW5ndGgpOworICAgIG1fY2xpZW50LT5kaWRUcnVuY2F0ZSgp OwogfQogCiB2b2lkIEFzeW5jRmlsZVdyaXRlckNocm9taXVtOjpkaWRGYWlsKFdlYktpdDo6V2Vi RmlsZUVycm9yIGVycm9yKQpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3luY0ZpbGVXcml0 ZXJDaHJvbWl1bS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxl V3JpdGVyQ2hyb21pdW0uaAkocmV2aXNpb24gNjgxODMpCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L0FzeW5jRmlsZVdyaXRlckNocm9taXVtLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDcgKzYxLDcg QEAgcHVibGljOgogCiAgICAgLy8gV2ViRmlsZVdyaXRlckNsaWVudAogICAgIHZpcnR1YWwgdm9p ZCBkaWRXcml0ZShsb25nIGxvbmcgYnl0ZXMsIGJvb2wgY29tcGxldGUpOwotICAgIHZpcnR1YWwg dm9pZCBkaWRUcnVuY2F0ZShsb25nIGxvbmcgbGVuZ3RoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlk VHJ1bmNhdGUoKTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChXZWJLaXQ6OldlYkZpbGVFcnJv cik7CiAKIHByaXZhdGU6Cg==