101777 2012-11-09 10:55:37 -0800 NetworkRequest refactoring 2012-11-13 20:36:57 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 98537 1 beidson beidson ap webkit.review.bot oldest_to_newest 763159 0 beidson 2012-11-09 10:55:37 -0800 NetworkRequest refactoring We should break out all of the ResourceHandleClient methods from the .h to the .cpp so it will be easier to start filling them in. 763166 1 173338 beidson 2012-11-09 11:00:54 -0800 Created attachment 173338 Patch v1 763170 2 173338 ap 2012-11-09 11:03:45 -0800 Comment on attachment 173338 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=173338&action=review Seems OK to land, although I don't think that we'll have all of these necessarily implemented. > Source/WebKit2/NetworkProcess/NetworkRequest.cpp:188 > + notImplemented(); I don't know if notImplemented is of any use here. I think it's not. You are not saying that all these callbacks should be implemented differently, and the platform you are working on doesn't do anything in notImplemented AFAIK. 763173 3 webkit.review.bot 2012-11-09 11:06:21 -0800 Attachment 173338 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/NetworkProcess/NetworkRequest.h:89: The parameter name "response" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/NetworkProcess/NetworkRequest.h:91: The parameter name "response" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 763177 4 beidson 2012-11-09 11:12:27 -0800 (In reply to comment #2) > (From update of attachment 173338 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=173338&action=review > > Seems OK to land, although I don't think that we'll have all of these necessarily implemented. I totally agree. An earlier version of the comment mentioned this, I'll restore that. > > > Source/WebKit2/NetworkProcess/NetworkRequest.cpp:188 > > + notImplemented(); > > I don't know if notImplemented is of any use here. I think it's not. > > You are not saying that all these callbacks should be implemented differently, and the platform you are working on doesn't do anything in notImplemented AFAIK. I recall finding notImplemented() being useful in bring ups of other WebKit ports, especially in looking out for the logging of a notImplemented method getting called. 763180 5 beidson 2012-11-09 11:16:06 -0800 http://trac.webkit.org/changeset/134090 173338 2012-11-09 11:00:54 -0800 2012-11-09 11:03:45 -0800 Patch v1 patch.txt text/plain 9904 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4OTk1MDVjLi43OTA4ZDM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTItMTEtMDkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIE5ldHdvcmtSZXF1ZXN0IHJlZmFjdG9yaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE3NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIGFsbCBvZiB0aGUgUmVzb3VyY2VIYW5kbGVDbGll bnQgc3R1YnMgZnJvbSB0aGUgLmggdG8gdGhlIC5jcHAgaW4gb25lIHBhdGNoCisgICAgICAgIHRv IG1ha2UgZnV0dXJlIHBhdGNoZXMgY2xlYW5lci4KKworICAgICAgICBBbHNvIGNvbXBsZXRlbHkg cmVtb3ZlIHRoZSBkZWNsYXJhdGlvbiBmb3Igc2hvdWxkQ2FjaGVSZXNwb25zZSgpIGZvciBub3cu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0Ojp3aWxsU2VuZFJlcXVlc3QpOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVxdWVzdDo6ZGlkU2VuZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrUmVxdWVzdDo6ZGlkUmVjZWl2ZUNhY2hlZE1ldGFkYXRhKToKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya1JlcXVlc3Q6Ondhc0Jsb2NrZWQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUmVx dWVzdDo6Y2Fubm90U2hvd1VSTCk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0Ojp3 aWxsQ2FjaGVSZXNwb25zZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0OjpzaG91 bGRVc2VDcmVkZW50aWFsU3RvcmFnZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0 OjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrUmVxdWVzdDo6ZGlkQ2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUmVxdWVzdDo6cmVjZWl2ZWRDYW5jZWxsYXRpb24pOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrUmVxdWVzdDo6Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rp b25TcGFjZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0OjpzdXBwb3J0c0RhdGFB cnJheSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YUFy cmF5KToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JlcXVlc3Q6OndpbGxTdG9wQnVmZmVyaW5n RGF0YSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSZXF1ZXN0OjpjcmVhdGVBc3luY0ZpbGVT dHJlYW0pOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXF1ZXN0Lmg6CisKIDIw MTItMTEtMDkgIHBlYXZvQG91dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAg ICAgV2luQ2Fpcm8gYnVpbGQgZmFpbHMgdG8gbGluawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1JlcXVlc3QuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvTmV0d29ya1JlcXVlc3QuY3BwCmluZGV4IGRiODJkOTMuLjgwNjY5NWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXF1ZXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5jcHAK QEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJSZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oIgog I2luY2x1ZGUgIlNoYXJlZE1lbW9yeS5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVy cy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KICNpbmNsdWRlIDxXZWJD b3JlL1Jlc291cmNlQnVmZmVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZUhhbmRsZS5o PgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CkBAIC0xODAsNiArMTgxLDEwOSBAQCB2b2lk IE5ldHdvcmtSZXF1ZXN0OjpkaWRGYWlsKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VFcgogICAgIHNjaGVkdWxlU3RvcE9uTWFpblRocmVhZCgpOwogfQog CisvLyBGSVhNRSAoTmV0d29ya1Byb2Nlc3MpOiBNYW55IG9mIHRoZSBmb2xsb3dpbmcgUmVzb3Vy Y2VIYW5kbGVDbGllbnQgbWV0aG9kcyBkZWZpbml0ZWx5IG5lZWQgaW1wbGVtZW50YXRpb25zLgor Cit2b2lkIE5ldHdvcmtSZXF1ZXN0Ojp3aWxsU2VuZFJlcXVlc3QoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGUqLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlc3BvbnNlJiAvKnJlZGlyZWN0UmVzcG9uc2UqLykKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgp OworfQorCit2b2lkIE5ldHdvcmtSZXF1ZXN0OjpkaWRTZW5kRGF0YShXZWJDb3JlOjpSZXNvdXJj ZUhhbmRsZSosIHVuc2lnbmVkIGxvbmcgbG9uZyAvKmJ5dGVzU2VudCovLCB1bnNpZ25lZCBsb25n IGxvbmcgLyp0b3RhbEJ5dGVzVG9CZVNlbnQqLykKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOwor fQorCit2b2lkIE5ldHdvcmtSZXF1ZXN0OjpkaWRSZWNlaXZlQ2FjaGVkTWV0YWRhdGEoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBjaGFyKiwgaW50KQoreworICAgIG5vdEltcGxlbWVu dGVkKCk7Cit9CisKK3ZvaWQgTmV0d29ya1JlcXVlc3Q6Ondhc0Jsb2NrZWQoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGUqKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKK3ZvaWQgTmV0d29y a1JlcXVlc3Q6OmNhbm5vdFNob3dVUkwoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqKQoreworICAg IG5vdEltcGxlbWVudGVkKCk7Cit9CisKK3ZvaWQgTmV0d29ya1JlcXVlc3Q6OndpbGxDYWNoZVJl c3BvbnNlKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgV2ViQ29yZTo6Q2FjaGVTdG9yYWdlUG9s aWN5JikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCitib29sIE5ldHdvcmtSZXF1ZXN0 OjpzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSopCit7 CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK3ZvaWQgTmV0 d29ya1JlcXVlc3Q6OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXZWJDb3JlOjpS ZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikK K3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCit2b2lkIE5ldHdvcmtSZXF1ZXN0OjpkaWRD YW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNv bnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikKK3sKKyAgICBub3RJbXBsZW1l bnRlZCgpOworfQorCit2b2lkIE5ldHdvcmtSZXF1ZXN0OjpyZWNlaXZlZENhbmNlbGxhdGlvbihX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hh bGxlbmdlJikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCisjaWYgVVNFKFBST1RFQ1RJ T05fU1BBQ0VfQVVUSF9DQUxMQkFDSykKK2Jvb2wgTmV0d29ya1JlcXVlc3Q6OmNhbkF1dGhlbnRp Y2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25z dCBXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2UmKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgcmV0dXJuIGZhbHNlOworfQorI2VuZGlmCisKKyNpZiBIQVZFKE5FVFdPUktfQ0ZEQVRBX0FS UkFZX0NBTExCQUNLKQorYm9vbCBOZXR3b3JrUmVxdWVzdDo6c3VwcG9ydHNEYXRhQXJyYXkoKQor eworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIE5l dHdvcmtSZXF1ZXN0OjpkaWRSZWNlaXZlRGF0YUFycmF5KFdlYkNvcmU6OlJlc291cmNlSGFuZGxl KiwgQ0ZBcnJheVJlZikKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorI2VuZGlmCisKKyNp ZiBQTEFURk9STShNQUMpCisjaWYgVVNFKENGTkVUV09SSykKK0NGQ2FjaGVkVVJMUmVzcG9uc2VS ZWYgTmV0d29ya1JlcXVlc3Q6OndpbGxDYWNoZVJlc3BvbnNlKFdlYkNvcmU6OlJlc291cmNlSGFu ZGxlKiwgQ0ZDYWNoZWRVUkxSZXNwb25zZVJlZiByZXNwb25zZSkKK3sKKyAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIHJldHVybiByZXNwb25zZTsKK30KKyNlbHNlCitOU0NhY2hlZFVSTFJlc3Bv bnNlKiBOZXR3b3JrUmVxdWVzdDo6d2lsbENhY2hlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VI YW5kbGUqLCBOU0NhY2hlZFVSTFJlc3BvbnNlKiByZXNwb25zZSkKK3sKKyAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIHJldHVybiByZXNwb25zZTsKK30KKyNlbmRpZgorCit2b2lkIE5ldHdvcmtS ZXF1ZXN0Ojp3aWxsU3RvcEJ1ZmZlcmluZ0RhdGEoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBj b25zdCBjaGFyKiwgaW50KQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisjZW5kaWYgLy8g UExBVEZPUk0oTUFDKQorCisjaWYgRU5BQkxFKEJMT0IpCitXZWJDb3JlOjpBc3luY0ZpbGVTdHJl YW0qIE5ldHdvcmtSZXF1ZXN0OjpjcmVhdGVBc3luY0ZpbGVTdHJlYW0oV2ViQ29yZTo6RmlsZVN0 cmVhbUNsaWVudCopCit7CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1cm4gMDsKK30K KyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8vIEVOQUJMRShORVRX T1JLX1BST0NFU1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUmVxdWVzdC5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jl cXVlc3QuaAppbmRleCBjOGMzZTJlLi4xYzljYjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVxdWVzdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL05l dHdvcmtQcm9jZXNzL05ldHdvcmtSZXF1ZXN0LmgKQEAgLTYwLDQyICs2MCw0MSBAQCBwdWJsaWM6 CiAgICAgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MqIGNvbm5lY3Rpb25Ub1dlYlByb2Nl c3MoKSB7IHJldHVybiBtX2Nvbm5lY3Rpb24uZ2V0KCk7IH0KIAogICAgIC8vIFJlc291cmNlSGFu ZGxlQ2xpZW50IG1ldGhvZHMKLSAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFdlYkNv cmU6OlJlc291cmNlSGFuZGxlKiwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXNwb25zZSYgLypyZWRpcmVjdFJlc3BvbnNlKi8pIE9WRVJSSURFIHsg fQotICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5kRGF0YShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSos IHVuc2lnbmVkIGxvbmcgbG9uZyAvKmJ5dGVzU2VudCovLCB1bnNpZ25lZCBsb25nIGxvbmcgLyp0 b3RhbEJ5dGVzVG9CZVNlbnQqLykgT1ZFUlJJREUgeyB9CisgICAgdmlydHVhbCB2b2lkIHdpbGxT ZW5kUmVxdWVzdChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIC8qcmVkaXJlY3RSZXNwb25z ZSovKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkU2VuZERhdGEoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGUqLCB1bnNpZ25lZCBsb25nIGxvbmcgLypieXRlc1NlbnQqLywgdW5zaWduZWQg bG9uZyBsb25nIC8qdG90YWxCeXRlc1RvQmVTZW50Ki8pIE9WRVJSSURFOwogICAgIHZpcnR1YWwg dm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJikgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIGRp ZFJlY2VpdmVEYXRhKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgY2hhciosIGludCwg aW50IC8qZW5jb2RlZERhdGFMZW5ndGgqLykgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIGRp ZFJlY2VpdmVDYWNoZWRNZXRhZGF0YShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IGNo YXIqLCBpbnQpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlQ2FjaGVk TWV0YWRhdGEoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBjaGFyKiwgaW50KSBPVkVS UklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZyhXZWJDb3JlOjpSZXNvdXJj ZUhhbmRsZSosIGRvdWJsZSAvKmZpbmlzaFRpbWUqLykgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2 b2lkIGRpZEZhaWwoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBXZWJDb3JlOjpSZXNv dXJjZUVycm9yJikgT1ZFUlJJREU7Ci0gICAgdmlydHVhbCB2b2lkIHdhc0Jsb2NrZWQoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGUqKSBPVkVSUklERSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgY2Fubm90 U2hvd1VSTChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSopIE9WRVJSSURFIHsgfQotI2lmIEhBVkUo TkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0spCi0gICAgdmlydHVhbCBib29sIHN1cHBvcnRz RGF0YUFycmF5KCkgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVjZWl2ZURhdGFBcnJheShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIENGQXJyYXlSZWYp IE9WRVJSSURFIHsgfQotI2VuZGlmCi0gICAgdmlydHVhbCB2b2lkIHdpbGxDYWNoZVJlc3BvbnNl KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgV2ViQ29yZTo6Q2FjaGVTdG9yYWdlUG9saWN5Jikg T1ZFUlJJREUgeyB9Ci0gICAgdmlydHVhbCBib29sIHNob3VsZFVzZUNyZWRlbnRpYWxTdG9yYWdl KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKikgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0KLSAg ICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2Um KSBPVkVSUklERSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlkQ2FuY2VsQXV0aGVudGljYXRpb25D aGFsbGVuZ2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBXZWJDb3JlOjpBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZSYpIE9WRVJSSURFIHsgfQorICAgIHZpcnR1YWwgdm9pZCB3YXNCbG9j a2VkKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lk IGNhbm5vdFNob3dVUkwoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqKSBPVkVSUklERTsKKyAgICB2 aXJ0dWFsIHZvaWQgd2lsbENhY2hlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBX ZWJDb3JlOjpDYWNoZVN0b3JhZ2VQb2xpY3kmKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wg c2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdl KFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25D aGFsbGVuZ2UmKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkQ2FuY2VsQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBjb25zdCBXZWJDb3JlOjpB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCByZWNl aXZlZENhbmNlbGxhdGlvbihXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNvcmU6 OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJikgT1ZFUlJJREU7CisKICNpZiBVU0UoUFJPVEVDVElP Tl9TUEFDRV9BVVRIX0NBTExCQUNLKQotICAgIHZpcnR1YWwgYm9vbCBjYW5BdXRoZW50aWNhdGVB Z2FpbnN0UHJvdGVjdGlvblNwYWNlKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2Vi Q29yZTo6UHJvdGVjdGlvblNwYWNlJikgT1ZFUlJJREUgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2 aXJ0dWFsIGJvb2wgY2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZShXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZSYpIE9WRVJS SURFOwogI2VuZGlmCi0gICAgdmlydHVhbCB2b2lkIHJlY2VpdmVkQ2FuY2VsbGF0aW9uKFdlYkNv cmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3QgV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVu Z2UmKSBPVkVSUklERSB7IH0KKworI2lmIEhBVkUoTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJB Q0spCisgICAgdmlydHVhbCBib29sIHN1cHBvcnRzRGF0YUFycmF5KCkgT1ZFUlJJREU7CisgICAg dmlydHVhbCB2b2lkIGRpZFJlY2VpdmVEYXRhQXJyYXkoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUq LCBDRkFycmF5UmVmKSBPVkVSUklERTsKKyNlbmRpZgorCiAjaWYgUExBVEZPUk0oTUFDKQogI2lm IFVTRShDRk5FVFdPUkspCi0gICAgdmlydHVhbCBDRkNhY2hlZFVSTFJlc3BvbnNlUmVmIHdpbGxD YWNoZVJlc3BvbnNlKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgQ0ZDYWNoZWRVUkxSZXNwb25z ZVJlZiByZXNwb25zZSkgT1ZFUlJJREUgeyByZXR1cm4gcmVzcG9uc2U7IH0KKyAgICB2aXJ0dWFs IENGQ2FjaGVkVVJMUmVzcG9uc2VSZWYgd2lsbENhY2hlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3Vy Y2VIYW5kbGUqLCBDRkNhY2hlZFVSTFJlc3BvbnNlUmVmIHJlc3BvbnNlKSBPVkVSUklERTsKICNl bHNlCi0gICAgdmlydHVhbCBOU0NhY2hlZFVSTFJlc3BvbnNlKiB3aWxsQ2FjaGVSZXNwb25zZShX ZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIE5TQ2FjaGVkVVJMUmVzcG9uc2UqIHJlc3BvbnNlKSBP VkVSUklERSB7IHJldHVybiByZXNwb25zZTsgfQorICAgIHZpcnR1YWwgTlNDYWNoZWRVUkxSZXNw b25zZSogd2lsbENhY2hlUmVzcG9uc2UoV2ViQ29yZTo6UmVzb3VyY2VIYW5kbGUqLCBOU0NhY2hl ZFVSTFJlc3BvbnNlKiByZXNwb25zZSkgT1ZFUlJJREU7CiAjZW5kaWYKLSAgICB2aXJ0dWFsIHZv aWQgd2lsbFN0b3BCdWZmZXJpbmdEYXRhKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlKiwgY29uc3Qg Y2hhciosIGludCkgT1ZFUlJJREUgeyB9CisgICAgdmlydHVhbCB2b2lkIHdpbGxTdG9wQnVmZmVy aW5nRGF0YShXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIGNvbnN0IGNoYXIqLCBpbnQpIE9WRVJS SURFOwogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAotI2lmIFBMQVRGT1JNKFdJTikgJiYgVVNF KENGTkVUV09SSykKLSAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkQ2FjaGVSZXNwb25zZShXZWJDb3Jl OjpSZXNvdXJjZUhhbmRsZSosIENGQ2FjaGVkVVJMUmVzcG9uc2VSZWYpIE9WRVJSSURFIHsgcmV0 dXJuIHRydWU7IH0KLSNlbmRpZgotCiAjaWYgRU5BQkxFKEJMT0IpCi0gICAgdmlydHVhbCBXZWJD b3JlOjpBc3luY0ZpbGVTdHJlYW0qIGNyZWF0ZUFzeW5jRmlsZVN0cmVhbShXZWJDb3JlOjpGaWxl U3RyZWFtQ2xpZW50KikgT1ZFUlJJREUgeyByZXR1cm4gMDsgfQorICAgIHZpcnR1YWwgV2ViQ29y ZTo6QXN5bmNGaWxlU3RyZWFtKiBjcmVhdGVBc3luY0ZpbGVTdHJlYW0oV2ViQ29yZTo6RmlsZVN0 cmVhbUNsaWVudCopIE9WRVJSSURFOwogI2VuZGlmCiAKIHByaXZhdGU6Cg==