44452 2010-08-23 13:03:34 -0700 Add SynchronousLoader for ResourceHandleWin 2010-08-24 17:39:31 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 43712 0 paroga webkit-unassigned aroben commit-queue oldest_to_newest 268068 0 paroga 2010-08-23 13:03:34 -0700 see patch 268074 1 65157 paroga 2010-08-23 13:09:31 -0700 Created attachment 65157 Patch userAgent argument at WebCoreSynchronousLoader constructor will be used in a further patch 268526 2 65157 aroben 2010-08-24 06:41:16 -0700 Comment on attachment 65157 Patch > + WebCoreSynchronousLoader(ResourceError&, ResourceResponse &, Vector<char>&, const String& userAgent); Extra space before & here. r=me 268529 3 65268 paroga 2010-08-24 06:45:09 -0700 Created attachment 65268 Patch (In reply to comment #2) > (From update of attachment 65157 [details]) > > + WebCoreSynchronousLoader(ResourceError&, ResourceResponse &, Vector<char>&, const String& userAgent); > > Extra space before & here. Bug for stylecheker? 268533 4 aroben 2010-08-24 06:54:38 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 65157 [details] [details]) > > > + WebCoreSynchronousLoader(ResourceError&, ResourceResponse &, Vector<char>&, const String& userAgent); > > > > Extra space before & here. > Bug for stylecheker? Filing a bug would be great! 268537 5 65268 aroben 2010-08-24 06:56:27 -0700 Comment on attachment 65268 Patch r=me 268540 6 65271 paroga 2010-08-24 07:11:11 -0700 Created attachment 65271 Patch Once again, sorry for the typo. 268929 7 65271 commit-queue 2010-08-24 17:39:26 -0700 Comment on attachment 65271 Patch Clearing flags on attachment: 65271 Committed r65957: <http://trac.webkit.org/changeset/65957> 268930 8 commit-queue 2010-08-24 17:39:31 -0700 All reviewed patches have been landed. Closing bug. 65157 2010-08-23 13:09:31 -0700 2010-08-24 06:45:09 -0700 Patch bug-44452.patch text/plain 3337 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDgtMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBh cm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIFN5bmNocm9ub3VzTG9hZGVyIGZvciBSZXNzb3VyY2VIYW5kbGVXaW4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDUyCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OldlYkNvcmVTeW5jaHJvbm91c0xvYWRl cik6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6 OmRpZFJlY2VpdmVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTeW5jaHJvbm91c0xv YWRlcjo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hy b25vdXNMb2FkZXI6OmRpZEZhaWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorCiAyMDEwLTA4LTIzICBBYmhpc2hlayBBcnlh ICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBH bGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRs ZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNv dXJjZUhhbmRsZVdpbi5jcHAJKHJldmlzaW9uIDY1ODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiw2 ICsxMjIsNDkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU9mZlNjcmVlblJlc291cmNlSAogICAg ICAgICBIV05EX01FU1NBR0UsIDAsIFdlYkNvcmU6Omluc3RhbmNlSGFuZGxlKCksIDApOwogfQog CisKK2NsYXNzIFdlYkNvcmVTeW5jaHJvbm91c0xvYWRlciA6IHB1YmxpYyBSZXNvdXJjZUhhbmRs ZUNsaWVudCwgcHVibGljIE5vbmNvcHlhYmxlIHsKK3B1YmxpYzoKKyAgICBXZWJDb3JlU3luY2hy b25vdXNMb2FkZXIoUmVzb3VyY2VFcnJvciYsIFJlc291cmNlUmVzcG9uc2UgJiwgVmVjdG9yPGNo YXI+JiwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpOworCisgICAgdmlydHVhbCB2b2lkIGRpZFJl Y2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsK KyAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBj aGFyKiwgaW50LCBpbnQgbGVuZ3RoUmVjZWl2ZWQpOworICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5p c2hMb2FkaW5nKFJlc291cmNlSGFuZGxlKik7CisgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoUmVz b3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CisKK3ByaXZhdGU6CisgICAgUmVz b3VyY2VFcnJvciYgbV9lcnJvcjsKKyAgICBSZXNvdXJjZVJlc3BvbnNlJiBtX3Jlc3BvbnNlOwor ICAgIFZlY3RvcjxjaGFyPiYgbV9kYXRhOworfTsKKworV2ViQ29yZVN5bmNocm9ub3VzTG9hZGVy OjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXIoUmVzb3VyY2VFcnJvciYgZXJyb3IsIFJlc291cmNl UmVzcG9uc2UmIHJlc3BvbnNlLCBWZWN0b3I8Y2hhcj4mIGRhdGEsIGNvbnN0IFN0cmluZyYgdXNl ckFnZW50KQorICAgIDogbV9lcnJvcihlcnJvcikKKyAgICAsIG1fcmVzcG9uc2UocmVzcG9uc2Up CisgICAgLCBtX2RhdGEoZGF0YSkKK3sKK30KKwordm9pZCBXZWJDb3JlU3luY2hyb25vdXNMb2Fk ZXI6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlKQoreworICAgIG1fcmVzcG9uc2UgPSByZXNwb25zZTsKK30KKwordm9p ZCBXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OmRpZFJlY2VpdmVEYXRhKFJlc291cmNlSGFuZGxl KiwgY29uc3QgY2hhciogZGF0YSwgaW50IGxlbmd0aCwgaW50KQoreworICAgIG1fZGF0YS5hcHBl bmQoZGF0YSwgbGVuZ3RoKTsKK30KKwordm9pZCBXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OmRp ZEZpbmlzaExvYWRpbmcoUmVzb3VyY2VIYW5kbGUqKQoreworfQorCit2b2lkIFdlYkNvcmVTeW5j aHJvbm91c0xvYWRlcjo6ZGlkRmFpbChSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlRXJy b3ImIGVycm9yKQoreworICAgIG1fZXJyb3IgPSBlcnJvcjsKK30KKworCiBSZXNvdXJjZUhhbmRs ZUludGVybmFsOjp+UmVzb3VyY2VIYW5kbGVJbnRlcm5hbCgpCiB7CiAgICAgaWYgKG1fZmlsZUhh bmRsZSAhPSBJTlZBTElEX0hBTkRMRV9WQUxVRSkKQEAgLTQ0OSw2ICs0OTIsMTYgQEAgdm9pZCBS ZXNvdXJjZUhhbmRsZTo6Y2FuY2VsKCkKICAgICAgICAgY2xpZW50KCktPmRpZEZhaWwodGhpcywg UmVzb3VyY2VFcnJvcigpKTsKIH0KIAordm9pZCBSZXNvdXJjZUhhbmRsZTo6bG9hZFJlc291cmNl U3luY2hyb25vdXNseShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFN0b3JlZENyZWRl bnRpYWxzIHN0b3JlZENyZWRlbnRpYWxzLCBSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSwgRnJhbWUqIGZyYW1lKQorewor ICAgIFVOVVNFRF9QQVJBTShzdG9yZWRDcmVkZW50aWFscyk7CisKKyAgICBXZWJDb3JlU3luY2hy b25vdXNMb2FkZXIgc3luY0xvYWRlcihlcnJvciwgcmVzcG9uc2UsIGRhdGEsIHJlcXVlc3QuaHR0 cFVzZXJBZ2VudCgpKTsKKyAgICBSZXNvdXJjZUhhbmRsZSBoYW5kbGUocmVxdWVzdCwgJnN5bmNM b2FkZXIsIHRydWUsIGZhbHNlKTsKKworICAgIGhhbmRsZS5zdGFydChmcmFtZSk7Cit9CisKIHZv aWQgUmVzb3VyY2VIYW5kbGU6OnNldEhhc1JlY2VpdmVkUmVzcG9uc2UoYm9vbCBiKQogewogICAg IGQtPm1faGFzUmVjZWl2ZWRSZXNwb25zZSA9IGI7Cg== 65268 2010-08-24 06:45:09 -0700 2010-08-24 07:11:11 -0700 Patch bug-44452b.patch text/plain 3336 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDgtMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBh cm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIFN5bmNocm9ub3VzTG9hZGVyIGZvciBSZXNzb3VyY2VIYW5kbGVXaW4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDUyCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OldlYkNvcmVTeW5jaHJvbm91c0xvYWRl cik6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6OmRpZFJlY2Vp dmVSZXNwb25zZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6 OmRpZFJlY2VpdmVEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTeW5jaHJvbm91c0xv YWRlcjo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlU3luY2hy b25vdXNMb2FkZXI6OmRpZEZhaWwpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6 OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorCiAyMDEwLTA4LTIzICBBYmhpc2hlayBBcnlh ICA8aW5mZXJub0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBH bGF6a292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRs ZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNv dXJjZUhhbmRsZVdpbi5jcHAJKHJldmlzaW9uIDY1ODEzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyMiw2 ICsxMjIsNDkgQEAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZU9mZlNjcmVlblJlc291cmNlSAogICAg ICAgICBIV05EX01FU1NBR0UsIDAsIFdlYkNvcmU6Omluc3RhbmNlSGFuZGxlKCksIDApOwogfQog CisKK2NsYXNzIFdlYkNvcmVTeW5jaHJvbm91c0xvYWRlciA6IHB1YmxpYyBSZXNvdXJjZUhhbmRs ZUNsaWVudCwgcHVibGljIE5vbmNvcHlhYmxlIHsKK3B1YmxpYzoKKyAgICBXZWJDb3JlU3luY2hy b25vdXNMb2FkZXIoUmVzb3VyY2VFcnJvciYsIFJlc291cmNlUmVzcG9uc2UmLCBWZWN0b3I8Y2hh cj4mLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCk7CisKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUmVj ZWl2ZVJlc3BvbnNlKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwor ICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlRGF0YShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IGNo YXIqLCBpbnQsIGludCBsZW5ndGhSZWNlaXZlZCk7CisgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlz aExvYWRpbmcoUmVzb3VyY2VIYW5kbGUqKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmFpbChSZXNv dXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKKworcHJpdmF0ZToKKyAgICBSZXNv dXJjZUVycm9yJiBtX2Vycm9yOworICAgIFJlc291cmNlUmVzcG9uc2UmIG1fcmVzcG9uc2U7Cisg ICAgVmVjdG9yPGNoYXI+JiBtX2RhdGE7Cit9OworCitXZWJDb3JlU3luY2hyb25vdXNMb2FkZXI6 OldlYkNvcmVTeW5jaHJvbm91c0xvYWRlcihSZXNvdXJjZUVycm9yJiBlcnJvciwgUmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UsIFZlY3RvcjxjaGFyPiYgZGF0YSwgY29uc3QgU3RyaW5nJiB1c2Vy QWdlbnQpCisgICAgOiBtX2Vycm9yKGVycm9yKQorICAgICwgbV9yZXNwb25zZShyZXNwb25zZSkK KyAgICAsIG1fZGF0YShkYXRhKQoreworfQorCit2b2lkIFdlYkNvcmVTeW5jaHJvbm91c0xvYWRl cjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVzcG9uc2UpCit7CisgICAgbV9yZXNwb25zZSA9IHJlc3BvbnNlOworfQorCit2b2lk IFdlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6ZGlkUmVjZWl2ZURhdGEoUmVzb3VyY2VIYW5kbGUq LCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBpbnQpCit7CisgICAgbV9kYXRhLmFwcGVu ZChkYXRhLCBsZW5ndGgpOworfQorCit2b2lkIFdlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6ZGlk RmluaXNoTG9hZGluZyhSZXNvdXJjZUhhbmRsZSopCit7Cit9CisKK3ZvaWQgV2ViQ29yZVN5bmNo cm9ub3VzTG9hZGVyOjpkaWRGYWlsKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VFcnJv ciYgZXJyb3IpCit7CisgICAgbV9lcnJvciA9IGVycm9yOworfQorCisKIFJlc291cmNlSGFuZGxl SW50ZXJuYWw6On5SZXNvdXJjZUhhbmRsZUludGVybmFsKCkKIHsKICAgICBpZiAobV9maWxlSGFu ZGxlICE9IElOVkFMSURfSEFORExFX1ZBTFVFKQpAQCAtNDQ5LDYgKzQ5MiwxNiBAQCB2b2lkIFJl c291cmNlSGFuZGxlOjpjYW5jZWwoKQogICAgICAgICBjbGllbnQoKS0+ZGlkRmFpbCh0aGlzLCBS ZXNvdXJjZUVycm9yKCkpOwogfQogCit2b2lkIFJlc291cmNlSGFuZGxlOjpsb2FkUmVzb3VyY2VT eW5jaHJvbm91c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU3RvcmVkQ3JlZGVu dGlhbHMgc3RvcmVkQ3JlZGVudGlhbHMsIFJlc291cmNlRXJyb3ImIGVycm9yLCBSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSwgVmVjdG9yPGNoYXI+JiBkYXRhLCBGcmFtZSogZnJhbWUpCit7Cisg ICAgVU5VU0VEX1BBUkFNKHN0b3JlZENyZWRlbnRpYWxzKTsKKworICAgIFdlYkNvcmVTeW5jaHJv bm91c0xvYWRlciBzeW5jTG9hZGVyKGVycm9yLCByZXNwb25zZSwgZGF0YSwgcmVxdWVzdC5odHRw VXNlckFnZW50KCkpOworICAgIFJlc291cmNlSGFuZGxlIGhhbmRsZShyZXF1ZXN0LCAmc3luY0xv YWRlciwgdHJ1ZSwgZmFsc2UpOworCisgICAgaGFuZGxlLnN0YXJ0KGZyYW1lKTsKK30KKwogdm9p ZCBSZXNvdXJjZUhhbmRsZTo6c2V0SGFzUmVjZWl2ZWRSZXNwb25zZShib29sIGIpCiB7CiAgICAg ZC0+bV9oYXNSZWNlaXZlZFJlc3BvbnNlID0gYjsK 65271 2010-08-24 07:11:11 -0700 2010-08-24 17:39:26 -0700 Patch bug-44452c.patch text/plain 3335 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NTgyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDgtMjMgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHBh cm9nYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIFN5bmNocm9ub3VzTG9hZGVyIGZvciBSZXNvdXJjZUhhbmRsZVdpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ0NTIKKworICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OldlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6V2ViQ29yZVN5bmNocm9ub3VzTG9hZGVy KToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6ZGlkUmVjZWl2 ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6 ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZVN5bmNocm9ub3VzTG9h ZGVyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVTeW5jaHJv bm91c0xvYWRlcjo6ZGlkRmFpbCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6 bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisKIDIwMTAtMDgtMjMgIEFiaGlzaGVrIEFyeWEg IDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEds YXprb3YuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxl V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291 cmNlSGFuZGxlV2luLmNwcAkocmV2aXNpb24gNjU4MTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIyLDYg KzEyMiw0OSBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplT2ZmU2NyZWVuUmVzb3VyY2VICiAgICAg ICAgIEhXTkRfTUVTU0FHRSwgMCwgV2ViQ29yZTo6aW5zdGFuY2VIYW5kbGUoKSwgMCk7CiB9CiAK KworY2xhc3MgV2ViQ29yZVN5bmNocm9ub3VzTG9hZGVyIDogcHVibGljIFJlc291cmNlSGFuZGxl Q2xpZW50LCBwdWJsaWMgTm9uY29weWFibGUgeworcHVibGljOgorICAgIFdlYkNvcmVTeW5jaHJv bm91c0xvYWRlcihSZXNvdXJjZUVycm9yJiwgUmVzb3VyY2VSZXNwb25zZSYsIFZlY3RvcjxjaGFy PiYsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50KTsKKworICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNl aXZlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7Cisg ICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVEYXRhKFJlc291cmNlSGFuZGxlKiwgY29uc3QgY2hh ciosIGludCwgaW50IGxlbmd0aFJlY2VpdmVkKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNo TG9hZGluZyhSZXNvdXJjZUhhbmRsZSopOworICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsKFJlc291 cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VFcnJvciYpOworCitwcml2YXRlOgorICAgIFJlc291 cmNlRXJyb3ImIG1fZXJyb3I7CisgICAgUmVzb3VyY2VSZXNwb25zZSYgbV9yZXNwb25zZTsKKyAg ICBWZWN0b3I8Y2hhcj4mIG1fZGF0YTsKK307CisKK1dlYkNvcmVTeW5jaHJvbm91c0xvYWRlcjo6 V2ViQ29yZVN5bmNocm9ub3VzTG9hZGVyKFJlc291cmNlRXJyb3ImIGVycm9yLCBSZXNvdXJjZVJl c3BvbnNlJiByZXNwb25zZSwgVmVjdG9yPGNoYXI+JiBkYXRhLCBjb25zdCBTdHJpbmcmIHVzZXJB Z2VudCkKKyAgICA6IG1fZXJyb3IoZXJyb3IpCisgICAgLCBtX3Jlc3BvbnNlKHJlc3BvbnNlKQor ICAgICwgbV9kYXRhKGRhdGEpCit7Cit9CisKK3ZvaWQgV2ViQ29yZVN5bmNocm9ub3VzTG9hZGVy OjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZVJlc3Bv bnNlJiByZXNwb25zZSkKK3sKKyAgICBtX3Jlc3BvbnNlID0gcmVzcG9uc2U7Cit9CisKK3ZvaWQg V2ViQ29yZVN5bmNocm9ub3VzTG9hZGVyOjpkaWRSZWNlaXZlRGF0YShSZXNvdXJjZUhhbmRsZSos IGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgsIGludCkKK3sKKyAgICBtX2RhdGEuYXBwZW5k KGRhdGEsIGxlbmd0aCk7Cit9CisKK3ZvaWQgV2ViQ29yZVN5bmNocm9ub3VzTG9hZGVyOjpkaWRG aW5pc2hMb2FkaW5nKFJlc291cmNlSGFuZGxlKikKK3sKK30KKwordm9pZCBXZWJDb3JlU3luY2hy b25vdXNMb2FkZXI6OmRpZEZhaWwoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZUVycm9y JiBlcnJvcikKK3sKKyAgICBtX2Vycm9yID0gZXJyb3I7Cit9CisKKwogUmVzb3VyY2VIYW5kbGVJ bnRlcm5hbDo6flJlc291cmNlSGFuZGxlSW50ZXJuYWwoKQogewogICAgIGlmIChtX2ZpbGVIYW5k bGUgIT0gSU5WQUxJRF9IQU5ETEVfVkFMVUUpCkBAIC00NDksNiArNDkyLDE2IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OmNhbmNlbCgpCiAgICAgICAgIGNsaWVudCgpLT5kaWRGYWlsKHRoaXMsIFJl c291cmNlRXJyb3IoKSk7CiB9CiAKK3ZvaWQgUmVzb3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJjZVN5 bmNocm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBTdG9yZWRDcmVkZW50 aWFscyBzdG9yZWRDcmVkZW50aWFscywgUmVzb3VyY2VFcnJvciYgZXJyb3IsIFJlc291cmNlUmVz cG9uc2UmIHJlc3BvbnNlLCBWZWN0b3I8Y2hhcj4mIGRhdGEsIEZyYW1lKiBmcmFtZSkKK3sKKyAg ICBVTlVTRURfUEFSQU0oc3RvcmVkQ3JlZGVudGlhbHMpOworCisgICAgV2ViQ29yZVN5bmNocm9u b3VzTG9hZGVyIHN5bmNMb2FkZXIoZXJyb3IsIHJlc3BvbnNlLCBkYXRhLCByZXF1ZXN0Lmh0dHBV c2VyQWdlbnQoKSk7CisgICAgUmVzb3VyY2VIYW5kbGUgaGFuZGxlKHJlcXVlc3QsICZzeW5jTG9h ZGVyLCB0cnVlLCBmYWxzZSk7CisKKyAgICBoYW5kbGUuc3RhcnQoZnJhbWUpOworfQorCiB2b2lk IFJlc291cmNlSGFuZGxlOjpzZXRIYXNSZWNlaXZlZFJlc3BvbnNlKGJvb2wgYikKIHsKICAgICBk LT5tX2hhc1JlY2VpdmVkUmVzcG9uc2UgPSBiOwo=