128364 2014-02-07 01:21:29 -0800 CTTE: DocumentThreadableLoader always has a Document. 2014-02-07 03:57:23 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue japhet oldest_to_newest 977753 0 kling 2014-02-07 01:21:29 -0800 CTTE: DocumentThreadableLoader always has a Document. 977774 1 223438 kling 2014-02-07 02:18:38 -0800 Created attachment 223438 Patch 977806 2 223438 commit-queue 2014-02-07 03:57:21 -0800 Comment on attachment 223438 Patch Clearing flags on attachment: 223438 Committed r163622: <http://trac.webkit.org/changeset/163622> 977807 3 commit-queue 2014-02-07 03:57:23 -0800 All reviewed patches have been landed. Closing bug. 223438 2014-02-07 02:18:38 -0800 2014-02-07 03:57:21 -0800 Patch bug-128364.diff text/plain 13398 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYTk4YTkwLi5kNWYxNzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTQtMDItMDcgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgorCisgICAg ICAgIENUVEU6IERvY3VtZW50VGhyZWFkYWJsZUxvYWRlciBhbHdheXMgaGFzIGEgRG9jdW1lbnQu CisgICAgICAgIDxodHRwczovL3dlYmtpdC5vcmcvYi8xMjgzNjQ+CisKKyAgICAgICAgRG9jdW1l bnRUaHJlYWRhYmxlTG9hZGVyIGFsd2F5cyBoYXMgYW4gIm93bmVyIiBEb2N1bWVudCwgc28gc3Rv cmUKKyAgICAgICAgdGhhdCBhcyBhIHJlZmVyZW5jZSBpbnN0ZWFkIG9mIGEgcG9pbnRlci4gUmVt b3ZlZCBzb21lIHVubmVjZXNzYXJ5CisgICAgICAgIGFzc2VydGlvbnMgZXhwb3NlZCBieSB0aGlz IGNoYW5nZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KToK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6RG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6 ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJs ZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJl YWRhYmxlTG9hZGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3Vt ZW50VGhyZWFkYWJsZUxvYWRlcjo6ZGlkRmFpbCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVu dFRocmVhZGFibGVMb2FkZXI6OnByZWZsaWdodEZhaWx1cmUpOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAgKiBs b2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1RocmVh ZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkYWJsZUxvYWRlcjo6Y3Jl YXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5 bmNocm9ub3VzbHkpOgorICAgICAgICAqIGxvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZGFibGVMb2FkZXI6Ok1haW5UaHJlYWRC cmlkZ2U6Om1haW5UaHJlYWRDcmVhdGVMb2FkZXIpOgorCiAyMDE0LTAyLTA2ICBKZXJlbXkgSm9u ZXMgIDxqZXJlbXlqQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgQVZLaXQg ZnVsbHNjcmVlbiB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCmluZGV4IDAyZTk4ZWIuLmYxNWZjMTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCkBA IC01NiwxNCArNTYsMTQgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi12b2lkIERvY3VtZW50 VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShEb2N1bWVudCogZG9j dW1lbnQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgVGhyZWFkYWJsZUxvYWRlckNs aWVudCYgY2xpZW50LCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykKK3Zv aWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KERv Y3VtZW50JiBkb2N1bWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBUaHJlYWRh YmxlTG9hZGVyQ2xpZW50JiBjbGllbnQsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJiBv cHRpb25zKQogewogICAgIC8vIFRoZSBsb2FkZXIgd2lsbCBiZSBkZWxldGVkIGFzIHNvb24gYXMg dGhpcyBmdW5jdGlvbiBleGl0cy4KLSAgICBSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVy PiBsb2FkZXIgPSBhZG9wdFJlZihuZXcgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKGRvY3VtZW50 LCAmY2xpZW50LCBMb2FkU3luY2hyb25vdXNseSwgcmVxdWVzdCwgb3B0aW9ucykpOworICAgIFJl ZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGxvYWRlciA9IGFkb3B0UmVmKG5ldyBEb2N1 bWVudFRocmVhZGFibGVMb2FkZXIoZG9jdW1lbnQsIGNsaWVudCwgTG9hZFN5bmNocm9ub3VzbHks IHJlcXVlc3QsIG9wdGlvbnMpKTsKICAgICBBU1NFUlQobG9hZGVyLT5oYXNPbmVSZWYoKSk7CiB9 CiAKLVBhc3NSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBEb2N1bWVudFRocmVhZGFi bGVMb2FkZXI6OmNyZWF0ZShEb2N1bWVudCogZG9jdW1lbnQsIFRocmVhZGFibGVMb2FkZXJDbGll bnQqIGNsaWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRh YmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykKK1Bhc3NSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxl TG9hZGVyPiBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZShEb2N1bWVudCYgZG9jdW1l bnQsIFRocmVhZGFibGVMb2FkZXJDbGllbnQmIGNsaWVudCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9ucykKIHsKICAg ICBSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBsb2FkZXIgPSBhZG9wdFJlZihuZXcg RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKGRvY3VtZW50LCBjbGllbnQsIExvYWRBc3luY2hyb25v dXNseSwgcmVxdWVzdCwgb3B0aW9ucykpOwogICAgIGlmICghbG9hZGVyLT5tX3Jlc291cmNlKQpA QCAtNzEsMTYgKzcxLDE0IEBAIFBhc3NSZWZQdHI8RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyPiBE b2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZShEb2N1bWVudCoKICAgICByZXR1cm4gbG9h ZGVyLnJlbGVhc2UoKTsKIH0KIAotRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRo cmVhZGFibGVMb2FkZXIoRG9jdW1lbnQqIGRvY3VtZW50LCBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50 KiBjbGllbnQsIEJsb2NraW5nQmVoYXZpb3IgYmxvY2tpbmdCZWhhdmlvciwgY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYgb3B0aW9u cykKLSAgICA6IG1fY2xpZW50KGNsaWVudCkKK0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6RG9j dW1lbnRUaHJlYWRhYmxlTG9hZGVyKERvY3VtZW50JiBkb2N1bWVudCwgVGhyZWFkYWJsZUxvYWRl ckNsaWVudCYgY2xpZW50LCBCbG9ja2luZ0JlaGF2aW9yIGJsb2NraW5nQmVoYXZpb3IsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMm IG9wdGlvbnMpCisgICAgOiBtX2NsaWVudCgmY2xpZW50KQogICAgICwgbV9kb2N1bWVudChkb2N1 bWVudCkKICAgICAsIG1fb3B0aW9ucyhvcHRpb25zKQogICAgICwgbV9zYW1lT3JpZ2luUmVxdWVz dChzZWN1cml0eU9yaWdpbigpLT5jYW5SZXF1ZXN0KHJlcXVlc3QudXJsKCkpKQogICAgICwgbV9z aW1wbGVSZXF1ZXN0KHRydWUpCiAgICAgLCBtX2FzeW5jKGJsb2NraW5nQmVoYXZpb3IgPT0gTG9h ZEFzeW5jaHJvbm91c2x5KQogewotICAgIEFTU0VSVChkb2N1bWVudCk7Ci0gICAgQVNTRVJUKGNs aWVudCk7CiAgICAgLy8gU2V0dGluZyBhbiBvdXRnb2luZyByZWZlcmVyIGlzIG9ubHkgc3VwcG9y dGVkIGluIHRoZSBhc3luYyBjb2RlIHBhdGguCiAgICAgQVNTRVJUKG1fYXN5bmMgfHwgcmVxdWVz dC5odHRwUmVmZXJyZXIoKS5pc0VtcHR5KCkpOwogCkBAIC0yNDgsOCArMjQ2LDggQEAgdm9pZCBE b2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSh1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIGNvbnMKICAgICBTdHJpbmcgYWNjZXNzQ29udHJvbEVycm9yRGVzY3JpcHRp b247CiAgICAgaWYgKG1fYWN0dWFsUmVxdWVzdCkgewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0g ICAgICAgIERvY3VtZW50TG9hZGVyKiBsb2FkZXIgPSBtX2RvY3VtZW50LT5mcmFtZSgpLT5sb2Fk ZXIoKS5kb2N1bWVudExvYWRlcigpOwotICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291 cmNlUmVzcG9uc2UobV9kb2N1bWVudC0+ZnJhbWUoKSwgaWRlbnRpZmllciwgcmVzcG9uc2UpOwor ICAgICAgICBEb2N1bWVudExvYWRlciogbG9hZGVyID0gbV9kb2N1bWVudC5mcmFtZSgpLT5sb2Fk ZXIoKS5kb2N1bWVudExvYWRlcigpOworICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25D b29raWUgY29va2llID0gSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291 cmNlUmVzcG9uc2UobV9kb2N1bWVudC5mcmFtZSgpLCBpZGVudGlmaWVyLCByZXNwb25zZSk7CiAg ICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlUmVzcG9u c2UoY29va2llLCBpZGVudGlmaWVyLCBsb2FkZXIsIHJlc3BvbnNlLCAwKTsKICNlbmRpZgogCkBA IC0yOTMsNyArMjkxLDcgQEAgdm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmRpZFJlY2Vp dmVEYXRhKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2gKICAgICAvLyBQcmVmbGln aHQgZGF0YSBzaG91bGQgYmUgaW52aXNpYmxlIHRvIGNsaWVudHMuCiAgICAgaWYgKG1fYWN0dWFs UmVxdWVzdCkgewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZURhdGEobV9kb2N1bWVudC0+ZnJhbWUoKSwgaWRlbnRpZmll ciwgMCwgMCwgZGF0YUxlbmd0aCk7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6 ZGlkUmVjZWl2ZURhdGEobV9kb2N1bWVudC5mcmFtZSgpLCBpZGVudGlmaWVyLCAwLCAwLCBkYXRh TGVuZ3RoKTsKICNlbHNlCiAgICAgICAgIFVOVVNFRF9QQVJBTShpZGVudGlmaWVyKTsKICNlbmRp ZgpAQCAtMzE4LDcgKzMxNiw3IEBAIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpkaWRG aW5pc2hMb2FkaW5nKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlCiB7CiAgICAgaWYg KG1fYWN0dWFsUmVxdWVzdCkgewogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgICAgIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmluaXNoTG9hZGluZyhtX2RvY3VtZW50LT5mcmFtZSgp LCBtX2RvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCBpZGVudGlm aWVyLCBmaW5pc2hUaW1lKTsKKyAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRG aW5pc2hMb2FkaW5nKG1fZG9jdW1lbnQuZnJhbWUoKSwgbV9kb2N1bWVudC5mcmFtZSgpLT5sb2Fk ZXIoKS5kb2N1bWVudExvYWRlcigpLCBpZGVudGlmaWVyLCBmaW5pc2hUaW1lKTsKICNlbmRpZgog ICAgICAgICBBU1NFUlQoIW1fc2FtZU9yaWdpblJlcXVlc3QpOwogICAgICAgICBBU1NFUlQobV9v cHRpb25zLmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSA9PSBVc2VBY2Nlc3NDb250cm9sKTsKQEAg LTMzMSw3ICszMjksNyBAQCB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6ZGlkRmFpbCh1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlRQogewogI2lmIEVOQUJMRShJ TlNQRUNUT1IpCiAgICAgaWYgKG1fYWN0dWFsUmVxdWVzdCkKLSAgICAgICAgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpkaWRGYWlsTG9hZGluZyhtX2RvY3VtZW50LT5mcmFtZSgpLCBtX2RvY3Vt ZW50LT5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCBpZGVudGlmaWVyLCBlcnJv cik7CisgICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFpbExvYWRpbmcobV9k b2N1bWVudC5mcmFtZSgpLCBtX2RvY3VtZW50LmZyYW1lKCktPmxvYWRlcigpLmRvY3VtZW50TG9h ZGVyKCksIGlkZW50aWZpZXIsIGVycm9yKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGlkZW50 aWZpZXIpOwogI2VuZGlmCkBAIC0zNTcsNyArMzU1LDcgQEAgdm9pZCBEb2N1bWVudFRocmVhZGFi bGVMb2FkZXI6OnByZWZsaWdodEZhaWx1cmUodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25z dAogICAgIFJlc291cmNlRXJyb3IgZXJyb3IoZXJyb3JEb21haW5XZWJLaXRJbnRlcm5hbCwgMCwg dXJsLCBlcnJvckRlc2NyaXB0aW9uKTsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIGlmICht X2FjdHVhbFJlcXVlc3QpCi0gICAgICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkRmFp bExvYWRpbmcobV9kb2N1bWVudC0+ZnJhbWUoKSwgbV9kb2N1bWVudC0+ZnJhbWUoKS0+bG9hZGVy KCkuZG9jdW1lbnRMb2FkZXIoKSwgaWRlbnRpZmllciwgZXJyb3IpOworICAgICAgICBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nKG1fZG9jdW1lbnQuZnJhbWUoKSwgbV9k b2N1bWVudC5mcmFtZSgpLT5sb2FkZXIoKS5kb2N1bWVudExvYWRlcigpLCBpZGVudGlmaWVyLCBl cnJvcik7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShpZGVudGlmaWVyKTsKICNlbmRpZgpAQCAt Mzg5LDEyICszODcsMTIgQEAgdm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXF1 ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU2VjdXIKICAgICAgICAgbmV3UmVx dWVzdC5zZXRJbml0aWF0b3IobV9vcHRpb25zLmluaXRpYXRvcik7CiAjZW5kaWYKICAgICAgICAg QVNTRVJUKCFtX3Jlc291cmNlKTsKLSAgICAgICAgbV9yZXNvdXJjZSA9IG1fZG9jdW1lbnQtPmNh Y2hlZFJlc291cmNlTG9hZGVyKCktPnJlcXVlc3RSYXdSZXNvdXJjZShuZXdSZXF1ZXN0KTsKKyAg ICAgICAgbV9yZXNvdXJjZSA9IG1fZG9jdW1lbnQuY2FjaGVkUmVzb3VyY2VMb2FkZXIoKS0+cmVx dWVzdFJhd1Jlc291cmNlKG5ld1JlcXVlc3QpOwogICAgICAgICBpZiAobV9yZXNvdXJjZSkgewog I2lmIEVOQUJMRShJTlNQRUNUT1IpCiAgICAgICAgICAgICBpZiAobV9yZXNvdXJjZS0+bG9hZGVy KCkpIHsKICAgICAgICAgICAgICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIgPSBtX3Jlc291 cmNlLT5sb2FkZXIoKS0+aWRlbnRpZmllcigpOwotICAgICAgICAgICAgICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6ZG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JD bGllbnQobV9kb2N1bWVudCwgaWRlbnRpZmllciwgbV9jbGllbnQpOworICAgICAgICAgICAgICAg IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyU3RhcnRl ZExvYWRpbmdGb3JDbGllbnQoJm1fZG9jdW1lbnQsIGlkZW50aWZpZXIsIG1fY2xpZW50KTsKICAg ICAgICAgICAgIH0KICNlbmRpZgogICAgICAgICAgICAgbV9yZXNvdXJjZS0+YWRkQ2xpZW50KHRo aXMpOwpAQCAtNDA3LDEwICs0MDUsMTAgQEAgdm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6 OmxvYWRSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU2VjdXIKICAgICBS ZXNvdXJjZUVycm9yIGVycm9yOwogICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2U7CiAgICAg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyID0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZCBs b25nPjo6bWF4KCk7Ci0gICAgaWYgKG1fZG9jdW1lbnQtPmZyYW1lKCkpCi0gICAgICAgIGlkZW50 aWZpZXIgPSBtX2RvY3VtZW50LT5mcmFtZSgpLT5sb2FkZXIoKS5sb2FkUmVzb3VyY2VTeW5jaHJv bm91c2x5KHJlcXVlc3QsIG1fb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzLCBtX29wdGlvbnMuY2xp ZW50Q3JlZGVudGlhbFBvbGljeSwgZXJyb3IsIHJlc3BvbnNlLCBkYXRhKTsKKyAgICBpZiAobV9k b2N1bWVudC5mcmFtZSgpKQorICAgICAgICBpZGVudGlmaWVyID0gbV9kb2N1bWVudC5mcmFtZSgp LT5sb2FkZXIoKS5sb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KHJlcXVlc3QsIG1fb3B0aW9ucy5h bGxvd0NyZWRlbnRpYWxzLCBtX29wdGlvbnMuY2xpZW50Q3JlZGVudGlhbFBvbGljeSwgZXJyb3Is IHJlc3BvbnNlLCBkYXRhKTsKIAotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9jdW1l bnRUaHJlYWRhYmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JDbGllbnQobV9kb2N1bWVudCwgaWRl bnRpZmllciwgbV9jbGllbnQpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZG9jdW1l bnRUaHJlYWRhYmxlTG9hZGVyU3RhcnRlZExvYWRpbmdGb3JDbGllbnQoJm1fZG9jdW1lbnQsIGlk ZW50aWZpZXIsIG1fY2xpZW50KTsKIAogICAgIC8vIE5vIGV4Y2VwdGlvbiBmb3IgZmlsZTovLy8g cmVzb3VyY2VzLCBzZWUgPHJkYXI6Ly9wcm9ibGVtLzQ5NjIyOTg+LgogICAgIC8vIEFsc28sIGlm IHdlIGhhdmUgYW4gSFRUUCByZXNwb25zZSwgdGhlbiBpdCB3YXNuJ3QgYSBuZXR3b3JrIGVycm9y IGluIGZhY3QuCkBAIC00NDYsNyArNDQ0LDcgQEAgYm9vbCBEb2N1bWVudFRocmVhZGFibGVMb2Fk ZXI6OmlzQWxsb3dlZFJlZGlyZWN0KGNvbnN0IFVSTCYgdXJsKQogCiBTZWN1cml0eU9yaWdpbiog RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpzZWN1cml0eU9yaWdpbigpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIG1fb3B0aW9ucy5zZWN1cml0eU9yaWdpbiA/IG1fb3B0aW9ucy5zZWN1cml0eU9yaWdp bi5nZXQoKSA6IG1fZG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luKCk7CisgICAgcmV0dXJuIG1fb3B0 aW9ucy5zZWN1cml0eU9yaWdpbiA/IG1fb3B0aW9ucy5zZWN1cml0eU9yaWdpbi5nZXQoKSA6IG1f ZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRl ci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5oCmlu ZGV4IDdlYjMzZWEuLmZhYmNkM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9E b2N1bWVudFRocmVhZGFibGVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9j dW1lbnRUaHJlYWRhYmxlTG9hZGVyLmgKQEAgLTUzLDggKzUzLDggQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIGNsYXNzIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlciA6IHB1YmxpYyBSZWZDb3Vu dGVkPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4sIHB1YmxpYyBUaHJlYWRhYmxlTG9hZGVyLCBw cml2YXRlIENhY2hlZFJhd1Jlc291cmNlQ2xpZW50ICB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1Rf QUxMT0NBVEVEOwogICAgIHB1YmxpYzoKLSAgICAgICAgc3RhdGljIHZvaWQgbG9hZFJlc291cmNl U3luY2hyb25vdXNseShEb2N1bWVudCosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIFRocmVhZGFi bGVMb2FkZXJDbGllbnQmLCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYpOwotICAgICAg ICBzdGF0aWMgUGFzc1JlZlB0cjxEb2N1bWVudFRocmVhZGFibGVMb2FkZXI+IGNyZWF0ZShEb2N1 bWVudCosIFRocmVhZGFibGVMb2FkZXJDbGllbnQqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBj b25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYpOworICAgICAgICBzdGF0aWMgdm9pZCBsb2Fk UmVzb3VyY2VTeW5jaHJvbm91c2x5KERvY3VtZW50JiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jiwg VGhyZWFkYWJsZUxvYWRlckNsaWVudCYsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJik7 CisgICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcj4gY3Jl YXRlKERvY3VtZW50JiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCYsIGNvbnN0IFJlc291cmNlUmVx dWVzdCYsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zJik7CiAgICAgICAgIHZpcnR1YWwg fkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcigpOwogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBjYW5j ZWwoKTsKQEAgLTczLDcgKzczLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAg TG9hZEFzeW5jaHJvbm91c2x5CiAgICAgICAgIH07CiAKLSAgICAgICAgRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyKERvY3VtZW50KiwgVGhyZWFkYWJsZUxvYWRlckNsaWVudCosIEJsb2NraW5nQmVo YXZpb3IsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFRocmVhZGFibGVMb2FkZXJPcHRp b25zJik7CisgICAgICAgIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihEb2N1bWVudCYsIFRocmVh ZGFibGVMb2FkZXJDbGllbnQmLCBCbG9ja2luZ0JlaGF2aW9yLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmLCBjb25zdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyYpOwogCiAgICAgICAgIHZvaWQgY2xl YXJSZXNvdXJjZSgpOwogCkBAIC0xMDEsNyArMTAxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZFJhd1Jlc291cmNlPiBtX3Jlc291 cmNlOwogICAgICAgICBUaHJlYWRhYmxlTG9hZGVyQ2xpZW50KiBtX2NsaWVudDsKLSAgICAgICAg RG9jdW1lbnQqIG1fZG9jdW1lbnQ7CisgICAgICAgIERvY3VtZW50JiBtX2RvY3VtZW50OwogICAg ICAgICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyBtX29wdGlvbnM7CiAgICAgICAgIGJvb2wgbV9z YW1lT3JpZ2luUmVxdWVzdDsKICAgICAgICAgYm9vbCBtX3NpbXBsZVJlcXVlc3Q7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5jcHAKaW5kZXggOGEzYTk4NS4uNTVlZmVm YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmNwcApAQCAtNTks NyArNTksNyBAQCBQYXNzUmVmUHRyPFRocmVhZGFibGVMb2FkZXI+IFRocmVhZGFibGVMb2FkZXI6 OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjbwogICAgIGlmIChjb250ZXh0LT5pc1dv cmtlckdsb2JhbFNjb3BlKCkpCiAgICAgICAgIHJldHVybiBXb3JrZXJUaHJlYWRhYmxlTG9hZGVy OjpjcmVhdGUoc3RhdGljX2Nhc3Q8V29ya2VyR2xvYmFsU2NvcGUqPihjb250ZXh0KSwgY2xpZW50 LCBXb3JrZXJSdW5Mb29wOjpkZWZhdWx0TW9kZSgpLCByZXF1ZXN0LCBvcHRpb25zKTsKIAotICAg IHJldHVybiBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZSh0b0RvY3VtZW50KGNvbnRl eHQpLCBjbGllbnQsIHJlcXVlc3QsIG9wdGlvbnMpOworICAgIHJldHVybiBEb2N1bWVudFRocmVh ZGFibGVMb2FkZXI6OmNyZWF0ZSh0b0RvY3VtZW50KCpjb250ZXh0KSwgKmNsaWVudCwgcmVxdWVz dCwgb3B0aW9ucyk7CiB9CiAKIHZvaWQgVGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlc291cmNlU3lu Y2hyb25vdXNseShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXh0LCBjb25zdCBSZXNvdXJj ZVJlcXVlc3QmIHJlcXVlc3QsIFRocmVhZGFibGVMb2FkZXJDbGllbnQmIGNsaWVudCwgY29uc3Qg VGhyZWFkYWJsZUxvYWRlck9wdGlvbnMmIG9wdGlvbnMpCkBAIC03MSw3ICs3MSw3IEBAIHZvaWQg VGhyZWFkYWJsZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25vdXNseShTY3JpcHRFeGVjdXRp b25Db250ZXh0KiBjb250ZXh0CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBEb2N1bWVu dFRocmVhZGFibGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkodG9Eb2N1bWVudChj b250ZXh0KSwgcmVxdWVzdCwgY2xpZW50LCBvcHRpb25zKTsKKyAgICBEb2N1bWVudFRocmVhZGFi bGVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoKnRvRG9jdW1lbnQoY29udGV4dCks IHJlcXVlc3QsIGNsaWVudCwgb3B0aW9ucyk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Xb3JrZXJUaHJlYWRhYmxlTG9hZGVyLmNwcApp bmRleCBkMTBlZjdlLi4wZWJiYTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv V29ya2VyVGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1dv cmtlclRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgdm9pZCBXb3JrZXJU aHJlYWRhYmxlTG9hZGVyOjpNYWluVGhyZWFkQnJpZGdlOjptYWluVGhyZWFkQ3JlYXRlTG9hZGVy KFNjcmlwdEV4ZWMKICAgICAvLyBGSVhNRTogSWYgdGhlIGEgc2l0ZSByZXF1ZXN0cyBhIGxvY2Fs IHJlc291cmNlLCB0aGVuIHRoaXMgd2lsbCByZXR1cm4gYSBub24temVybyB2YWx1ZSBidXQgdGhl IHN5bmMgcGF0aAogICAgIC8vIHdpbGwgcmV0dXJuIGEgMCB2YWx1ZS4gIEVpdGhlciB0aGlzIHNo b3VsZCByZXR1cm4gMCBvciB0aGUgb3RoZXIgY29kZSBwYXRoIHNob3VsZCBkbyBhIGNhbGxiYWNr IHdpdGgKICAgICAvLyBhIGZhaWx1cmUuCi0gICAgdGhpc1B0ci0+bV9tYWluVGhyZWFkTG9hZGVy ID0gRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpjcmVhdGUoZG9jdW1lbnQsIHRoaXNQdHIsICpy ZXF1ZXN0LCBvcHRpb25zKTsKKyAgICB0aGlzUHRyLT5tX21haW5UaHJlYWRMb2FkZXIgPSBEb2N1 bWVudFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZSgqZG9jdW1lbnQsICp0aGlzUHRyLCAqcmVxdWVz dCwgb3B0aW9ucyk7CiAgICAgQVNTRVJUKHRoaXNQdHItPm1fbWFpblRocmVhZExvYWRlcik7CiB9 CiAK