125403 2013-12-07 21:11:56 -0800 [Cocoa] Make WKWebProcessPlugInBrowserContextController work with WKObject wrapping 2013-12-07 21:19:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 957567 0 sam 2013-12-07 21:11:56 -0800 [Cocoa] Make WKWebProcessPlugInBrowserContextController work with WKObject wrapping 957568 1 218675 sam 2013-12-07 21:12:23 -0800 Created attachment 218675 Patch 957569 2 218675 mitz 2013-12-07 21:18:19 -0800 Comment on attachment 218675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218675&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:89 > +- (id)_initWithPrincipalClassInstance:(id<WKWebProcessPlugIn>)principalClassInstance bundle:(InjectedBundle&)bundle Can you add a space before the < while you’re here? > Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h:35 > +- (id)_initWithPrincipalClassInstance:(id<WKWebProcessPlugIn>)principalClassInstance bundle:(WebKit::InjectedBundle&)bundle; Ditto. 957570 3 sam 2013-12-07 21:19:03 -0800 Committed r160277: <http://trac.webkit.org/changeset/160277> 218675 2013-12-07 21:12:23 -0800 2013-12-07 21:18:19 -0800 Patch bug-125403-20131207211222.patch text/plain 13665 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDI3NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDEzLTEyLTA3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvY29hXSBNYWtlIFdLV2ViUHJvY2Vz c1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciB3b3JrIHdpdGggV0tPYmplY3Qgd3JhcHBp bmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTQw MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL0NvY29hL0FQSU9iamVjdC5tbToKKyAgICAgICAgKEFQSTo6T2JqZWN0OjpuZXdPYmplY3Qp OgorICAgICAgICAqIFNoYXJlZC9tYWMvT2JqQ09iamVjdEdyYXBoQ29kZXJzLm1tOgorICAgICAg ICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZU9iakNPYmplY3RHcmFwaERlY29kZXJJbXBsOjpkZWNv ZGUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlBy b2Nlc3NQbHVnSW4ubW06CisgICAgICAgIChkaWRDcmVhdGVQYWdlKToKKyAgICAgICAgKHdpbGxE ZXN0cm95UGFnZSk6CisgICAgICAgIChzZXRVcEJ1bmRsZUNsaWVudCk6CisgICAgICAgICgtW1dL V2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgX2luaXRXaXRoUHJpbmNpcGFsQ2xhc3NJbnN0YW5j ZTpidW5kbGU6XSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFj L1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5tbToKKyAgICAgICAg KC1bV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyIGRlYWxsb2NdKToK KyAgICAgICAgKC1bV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyIG1h aW5GcmFtZURvY3VtZW50XSk6CisgICAgICAgICgtW1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJD b250ZXh0Q29udHJvbGxlciBzZWxlY3RlZFJhbmdlXSk6CisgICAgICAgICgtW1dLV2ViUHJvY2Vz c1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciBBUEk6Ol0pOgorICAgICAgICAoLVtXS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgX2J1bmRsZVBhZ2VSZWZdKToK KyAgICAgICAgKC1bV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyIGhh bmRsZV0pOgorICAgICAgICAoK1tXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRy b2xsZXIgbG9va1VwQnJvd3NpbmdDb250ZXh0RnJvbUhhbmRsZTpdKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNv bnRleHRDb250cm9sbGVySW50ZXJuYWwuaDoKKyAgICAgICAgKFdlYktpdDo6d3JhcHBlcik6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1Bs dWdJbkludGVybmFsLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMv SW5qZWN0ZWRCdW5kbGVNYWMubW06CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjps b2FkKToKKwogMjAxMy0xMi0wNyAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9y Zz4KIAogICAgICAgICBGaXggQVBJIHRlc3QgZXhwZWN0YXRpb24gZm9sbG93aW5nIDE2MDIyMC4K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9BUElPYmplY3QubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQkocmV2aXNpb24g MTYwMjc2KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQkod29y a2luZyBjb3B5KQpAQCAtMzIsOCArMzIsOCBAQAogI2ltcG9ydCAiV0tCYWNrRm9yd2FyZExpc3RJ dGVtSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckludGVy bmFsLmgiCiAjaW1wb3J0ICJXS0Jyb3dzaW5nQ29udGV4dEdyb3VwSW50ZXJuYWwuaCIKLSNpbXBv cnQgIldLTlNBcnJheS5oIgogI2ltcG9ydCAiV0tDb25uZWN0aW9uSW50ZXJuYWwuaCIKKyNpbXBv cnQgIldLTlNBcnJheS5oIgogI2ltcG9ydCAiV0tOU0RpY3Rpb25hcnkuaCIKICNpbXBvcnQgIldL TlNFcnJvci5oIgogI2ltcG9ydCAiV0tOU1N0cmluZy5oIgpAQCAtNDIsNiArNDIsNyBAQAogI2lt cG9ydCAiV0tOU1VSTFByb3RlY3Rpb25TcGFjZS5oIgogI2ltcG9ydCAiV0tOYXZpZ2F0aW9uRGF0 YUludGVybmFsLmgiCiAjaW1wb3J0ICJXS1Byb2Nlc3NHcm91cEludGVybmFsLmgiCisjaW1wb3J0 ICJXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5oIgog CiBuYW1lc3BhY2UgQVBJIHsKIApAQCAtODAsNiArODEsMTAgQEAgdm9pZCogT2JqZWN0OjpuZXdP YmplY3Qoc2l6ZV90IHNpemUsIFR5cAogICAgICAgICB3cmFwcGVyID0gW1dLQmFja0ZvcndhcmRM aXN0SXRlbSBhbGxvY107CiAgICAgICAgIGJyZWFrOwogCisgICAgY2FzZSBUeXBlOjpCdW5kbGVQ YWdlOgorICAgICAgICB3cmFwcGVyID0gW1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0 Q29udHJvbGxlciBhbGxvY107CisgICAgICAgIGJyZWFrOworCiAgICAgY2FzZSBUeXBlOjpDb25u ZWN0aW9uOgogICAgICAgICB3cmFwcGVyID0gTlNBbGxvY2F0ZU9iamVjdChbV0tDb25uZWN0aW9u IHNlbGZdLCBzaXplLCBudWxscHRyKTsKICAgICAgICAgYnJlYWs7CkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL09iakNPYmplY3RHcmFwaENvZGVycy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL09iakNPYmplY3RHcmFwaENvZGVycy5tbQkocmV2aXNp b24gMTYwMjc2KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9PYmpDT2JqZWN0R3JhcGhD b2RlcnMubW0JKHdvcmtpbmcgY29weSkKQEAgLTQ2NCw3ICs0NjQsNyBAQCBwdWJsaWM6CiAgICAg ICAgICAgICBpZiAoIXdlYlBhZ2UpCiAgICAgICAgICAgICAgICAgY29kZXIubV9yb290ID0gW05T TnVsbCBudWxsXTsKICAgICAgICAgICAgIGVsc2UgCi0gICAgICAgICAgICAgICAgY29kZXIubV9y b290ID0gW1tXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyIF9zaGFyZWRdIF9icm93c2VyQ29u dGV4dENvbnRyb2xsZXJGb3JCdW5kbGVQYWdlUmVmOnRvQVBJKHdlYlBhZ2UpXTsKKyAgICAgICAg ICAgICAgICBjb2Rlci5tX3Jvb3QgPSB3cmFwcGVyKCp3ZWJQYWdlKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgV0tUeXBlUmVmV3JhcHBlclR5cGU6IHsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dl YlByb2Nlc3NQbHVnSW4ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbi5tbQkocmV2aXNpb24g MTYwMjc2KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv bWFjL1dLV2ViUHJvY2Vzc1BsdWdJbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgsMTIgKzM4LDkg QEAKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotdHlwZWRlZiBIYXNoTWFwPFdLQnVuZGxl UGFnZVJlZiwgUmV0YWluUHRyPFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJv bGxlciAqPj4gQnVuZGxlUGFnZVdyYXBwZXJDYWNoZTsKLQogQGludGVyZmFjZSBXS1dlYlByb2Nl c3NQbHVnSW5Db250cm9sbGVyICgpIHsKICAgICBSZXRhaW5QdHI8aWQgPFdLV2ViUHJvY2Vzc1Bs dWdJbj4+IF9wcmluY2lwYWxDbGFzc0luc3RhbmNlOwogICAgIFJlZlB0cjxJbmplY3RlZEJ1bmRs ZT4gX2J1bmRsZTsKLSAgICBCdW5kbGVQYWdlV3JhcHBlckNhY2hlIF9idW5kbGVQYWdlV3JhcHBl ckNhY2hlOwogICAgIFJldGFpblB0cjxXS0Nvbm5lY3Rpb24gKj4gX2Nvbm5lY3Rpb25XcmFwcGVy OwogfQogQGVuZApAQCAtNTUsMTQgKzUyLDggQEAgc3RhdGljIHZvaWQgZGlkQ3JlYXRlUGFnZShX S0J1bmRsZVJlZiBidQogICAgIFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgKnBsdWdJbkNv bnRyb2xsZXIgPSAoV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJvbGxlciAqKWNsaWVudEluZm87CiAg ICAgaWQ8V0tXZWJQcm9jZXNzUGx1Z0luPiBwcmluY2lwYWxDbGFzc0luc3RhbmNlID0gcGx1Z0lu Q29udHJvbGxlci0+X3ByaW5jaXBhbENsYXNzSW5zdGFuY2UuZ2V0KCk7CiAKLSAgICBpZiAoW3By aW5jaXBhbENsYXNzSW5zdGFuY2UgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJQcm9j ZXNzUGx1Z0luOmRpZENyZWF0ZUJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjopXSkgewotICAgICAg ICBBU1NFUlQoIXBsdWdJbkNvbnRyb2xsZXItPl9idW5kbGVQYWdlV3JhcHBlckNhY2hlLmNvbnRh aW5zKHBhZ2UpKTsKLQotICAgICAgICBXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENv bnRyb2xsZXIqIGJyb3dzZXJDb250ZXh0Q29udHJvbGxlciA9IFtbV0tXZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyIGFsbG9jXSBfaW5pdFdpdGhCdW5kbGVQYWdlUmVmOnBh Z2VdOwotICAgICAgICBwbHVnSW5Db250cm9sbGVyLT5fYnVuZGxlUGFnZVdyYXBwZXJDYWNoZS5z ZXQocGFnZSwgYnJvd3NlckNvbnRleHRDb250cm9sbGVyKTsKLQotICAgICAgICBbcHJpbmNpcGFs Q2xhc3NJbnN0YW5jZSB3ZWJQcm9jZXNzUGx1Z0luOnBsdWdJbkNvbnRyb2xsZXIgZGlkQ3JlYXRl QnJvd3NlckNvbnRleHRDb250cm9sbGVyOmJyb3dzZXJDb250ZXh0Q29udHJvbGxlcl07Ci0gICAg fQorICAgIGlmIChbcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKHdlYlByb2Nlc3NQbHVnSW46ZGlkQ3JlYXRlQnJvd3NlckNvbnRleHRDb250cm9sbGVy OildKQorICAgICAgICBbcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSB3ZWJQcm9jZXNzUGx1Z0luOnBs dWdJbkNvbnRyb2xsZXIgZGlkQ3JlYXRlQnJvd3NlckNvbnRleHRDb250cm9sbGVyOndyYXBwZXIo KnRvSW1wbChwYWdlKSldOwogfQogCiBzdGF0aWMgdm9pZCB3aWxsRGVzdHJveVBhZ2UoV0tCdW5k bGVSZWYgYnVuZGxlLCBXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5m bykKQEAgLTcwLDIxICs2MSwxMSBAQCBzdGF0aWMgdm9pZCB3aWxsRGVzdHJveVBhZ2UoV0tCdW5k bGVSZWYgCiAgICAgV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJvbGxlciAqcGx1Z0luQ29udHJvbGxl ciA9IChXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyICopY2xpZW50SW5mbzsKICAgICBpZDxX S1dlYlByb2Nlc3NQbHVnSW4+IHByaW5jaXBhbENsYXNzSW5zdGFuY2UgPSBwbHVnSW5Db250cm9s bGVyLT5fcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZS5nZXQoKTsKIAotICAgIC8vIElmIHdlIG5ldmVy IGFkZGVkIHRoZSBidW5kbGUgcGFnZSB0byB0aGUgY2FjaGUsIHdoaWNoIGNhbiBoYXBwZW4gaWYg d2ViUHJvY2Vzc1BsdWdJbjpkaWRDcmVhdGVCcm93c2VyQ29udGV4dENvbnRyb2xsZXI6IGlzIG5v dCBpbXBsZW1lbnRlZCwKLSAgICAvLyB0aGVyZSBpcyBubyByZWFzb24gdG8gY2FsbCB3ZWJQcm9j ZXNzUGx1Z0luOndpbGxEZXN0cm95QnJvd3NlckNvbnRleHRDb250cm9sbGVyOiwgc28gZG9uJ3Qu Ci0gICAgQnVuZGxlUGFnZVdyYXBwZXJDYWNoZTo6aXRlcmF0b3IgaXQgPSBwbHVnSW5Db250cm9s bGVyLT5fYnVuZGxlUGFnZVdyYXBwZXJDYWNoZS5maW5kKHBhZ2UpOwotICAgIGlmIChpdCA9PSBw bHVnSW5Db250cm9sbGVyLT5fYnVuZGxlUGFnZVdyYXBwZXJDYWNoZS5lbmQoKSkgewotICAgICAg ICBBU1NFUlQoIVtwcmluY2lwYWxDbGFzc0luc3RhbmNlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3Iod2ViUHJvY2Vzc1BsdWdJbjpkaWRDcmVhdGVCcm93c2VyQ29udGV4dENvbnRyb2xsZXI6 KV0pOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKFtwcmluY2lwYWxDbGFzc0lu c3RhbmNlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Iod2ViUHJvY2Vzc1BsdWdJbjp3aWxs RGVzdHJveUJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjopXSkKLSAgICAgICAgW3ByaW5jaXBhbENs YXNzSW5zdGFuY2Ugd2ViUHJvY2Vzc1BsdWdJbjpwbHVnSW5Db250cm9sbGVyIHdpbGxEZXN0cm95 QnJvd3NlckNvbnRleHRDb250cm9sbGVyOml0LT52YWx1ZS5nZXQoKV07Ci0KLSAgICBwbHVnSW5D b250cm9sbGVyLT5fYnVuZGxlUGFnZVdyYXBwZXJDYWNoZS5yZW1vdmUoaXQpOworICAgICAgICBb cHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSB3ZWJQcm9jZXNzUGx1Z0luOnBsdWdJbkNvbnRyb2xsZXIg d2lsbERlc3Ryb3lCcm93c2VyQ29udGV4dENvbnRyb2xsZXI6d3JhcHBlcigqdG9JbXBsKHBhZ2Up KV07CiB9CiAKLXN0YXRpYyB2b2lkIHNldFVwQnVuZGxlQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJ bkNvbnRyb2xsZXIgKnBsdWdJbkNvbnRyb2xsZXIsIFdLQnVuZGxlUmVmIGJ1bmRsZVJlZikKK3N0 YXRpYyB2b2lkIHNldFVwQnVuZGxlQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIg KnBsdWdJbkNvbnRyb2xsZXIsIEluamVjdGVkQnVuZGxlJiBidW5kbGUpCiB7CiAgICAgV0tCdW5k bGVDbGllbnRWMSBidW5kbGVDbGllbnQ7CiAgICAgbWVtc2V0KCZidW5kbGVDbGllbnQsIDAsIHNp emVvZihidW5kbGVDbGllbnQpKTsKQEAgLTk0LDcgKzc1LDcgQEAgc3RhdGljIHZvaWQgc2V0VXBC dW5kbGVDbGllbnQoV0tXZWJQcm9jZQogICAgIGJ1bmRsZUNsaWVudC5kaWRDcmVhdGVQYWdlID0g ZGlkQ3JlYXRlUGFnZTsKICAgICBidW5kbGVDbGllbnQud2lsbERlc3Ryb3lQYWdlID0gd2lsbERl c3Ryb3lQYWdlOwogCi0gICAgV0tCdW5kbGVTZXRDbGllbnQoYnVuZGxlUmVmLCAmYnVuZGxlQ2xp ZW50LmJhc2UpOworICAgIGJ1bmRsZS5pbml0aWFsaXplQ2xpZW50KCZidW5kbGVDbGllbnQuYmFz ZSk7CiB9CiAKIHN0YXRpYyBXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyICpzaGFyZWRJbnN0 YW5jZTsKQEAgLTEwNSwyOSArODYsMjMgQEAgKyAoV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJvbGxl ciAqKV9zaGFyZQogICAgIHJldHVybiBzaGFyZWRJbnN0YW5jZTsKIH0KIAotLSAoaWQpX2luaXRX aXRoUHJpbmNpcGFsQ2xhc3NJbnN0YW5jZTooaWQ8V0tXZWJQcm9jZXNzUGx1Z0luPilwcmluY2lw YWxDbGFzc0luc3RhbmNlIGJ1bmRsZVJlZjooV0tCdW5kbGVSZWYpYnVuZGxlUmVmCistIChpZClf aW5pdFdpdGhQcmluY2lwYWxDbGFzc0luc3RhbmNlOihpZDxXS1dlYlByb2Nlc3NQbHVnSW4+KXBy aW5jaXBhbENsYXNzSW5zdGFuY2UgYnVuZGxlOihJbmplY3RlZEJ1bmRsZSYpYnVuZGxlCiB7CiAg ICAgc2VsZiA9IFtzdXBlciBpbml0XTsKICAgICBpZiAoIXNlbGYpCiAgICAgICAgIHJldHVybiBu aWw7CiAKICAgICBfcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSA9IHByaW5jaXBhbENsYXNzSW5zdGFu Y2U7Ci0gICAgX2J1bmRsZSA9IHRvSW1wbChidW5kbGVSZWYpOworICAgIF9idW5kbGUgPSAmYnVu ZGxlOwogCiAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRSghc2hhcmVkSW5zdGFuY2UsICJXS1dlYlBy b2Nlc3NQbHVnSW5Db250cm9sbGVyIGluaXRpYWxpemVkIG11bHRpcGxlIHRpbWVzLiIpOwogICAg IHNoYXJlZEluc3RhbmNlID0gc2VsZjsKIAotICAgIHNldFVwQnVuZGxlQ2xpZW50KHNlbGYsIGJ1 bmRsZVJlZik7CisgICAgc2V0VXBCdW5kbGVDbGllbnQoc2VsZiwgKl9idW5kbGUpOwogCiAgICAg cmV0dXJuIHNlbGY7CiB9CiAKLS0gKFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlciAqKV9icm93c2VyQ29udGV4dENvbnRyb2xsZXJGb3JCdW5kbGVQYWdlUmVmOihXS0J1 bmRsZVBhZ2VSZWYpcGFnZVJlZgotewotICAgIEFTU0VSVChfYnVuZGxlUGFnZVdyYXBwZXJDYWNo ZS5jb250YWlucyhwYWdlUmVmKSk7Ci0gICAgcmV0dXJuIF9idW5kbGVQYWdlV3JhcHBlckNhY2hl LmdldChwYWdlUmVmKS5nZXQoKTsKLX0KLQogLSAoV0tDb25uZWN0aW9uICopY29ubmVjdGlvbgog ewogICAgIHJldHVybiB3cmFwcGVyKCpfYnVuZGxlLT53ZWJDb25uZWN0aW9uVG9VSVByb2Nlc3Mo KSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9t YWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9X S1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0JKHJldmlzaW9uIDE2 MDI3NikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21h Yy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIubW0JKHdvcmtpbmcg Y29weSkKQEAgLTQ0LDIzICs0NCwxOSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7CiAKIEBpbXBsZW1lbnRhdGlvbiBXS1dlYlByb2Nlc3NQbHVnSW5C cm93c2VyQ29udGV4dENvbnRyb2xsZXIgewotICAgIFdLUmV0YWluUHRyPFdLQnVuZGxlUGFnZVJl Zj4gX2J1bmRsZVBhZ2VSZWY7CisgICAgQVBJOjpPYmplY3RTdG9yYWdlPFdlYlBhZ2U+IF9wYWdl OwogfQogCi0tIChpZClfaW5pdFdpdGhCdW5kbGVQYWdlUmVmOihXS0J1bmRsZVBhZ2VSZWYpYnVu ZGxlUGFnZVJlZgorLSAodm9pZClkZWFsbG9jCiB7Ci0gICAgc2VsZiA9IFtzdXBlciBpbml0XTsK LSAgICBpZiAoIXNlbGYpCi0gICAgICAgIHJldHVybiBuaWw7Ci0KLSAgICBfYnVuZGxlUGFnZVJl ZiA9IGJ1bmRsZVBhZ2VSZWY7CisgICAgX3BhZ2UtPn5XZWJQYWdlKCk7CiAKLSAgICByZXR1cm4g c2VsZjsKKyAgICBbc3VwZXIgZGVhbGxvY107CiB9CiAKIC0gKFdLRE9NRG9jdW1lbnQgKiltYWlu RnJhbWVEb2N1bWVudAogewotICAgIFdlYkNvcmU6OkZyYW1lKiB3ZWJDb3JlTWFpbkZyYW1lID0g dG9JbXBsKF9idW5kbGVQYWdlUmVmLmdldCgpKS0+bWFpbkZyYW1lKCk7CisgICAgRnJhbWUqIHdl YkNvcmVNYWluRnJhbWUgPSBfcGFnZS0+bWFpbkZyYW1lKCk7CiAgICAgaWYgKCF3ZWJDb3JlTWFp bkZyYW1lKQogICAgICAgICByZXR1cm4gbmlsOwogCkBAIC02OSwyNSArNjUsMzIgQEAgLSAoV0tE T01Eb2N1bWVudCAqKW1haW5GcmFtZURvY3VtZW50CiAKIC0gKFdLRE9NUmFuZ2UgKilzZWxlY3Rl ZFJhbmdlCiB7Ci0gICAgUmVmUHRyPFdlYkNvcmU6OlJhbmdlPiByYW5nZSA9IHRvSW1wbChfYnVu ZGxlUGFnZVJlZi5nZXQoKSktPmN1cnJlbnRTZWxlY3Rpb25Bc1JhbmdlKCk7CisgICAgUmVmUHRy PFJhbmdlPiByYW5nZSA9IF9wYWdlLT5jdXJyZW50U2VsZWN0aW9uQXNSYW5nZSgpOwogICAgIGlm ICghcmFuZ2UpCiAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICByZXR1cm4gdG9XS0RPTVJhbmdl KHJhbmdlLmdldCgpKTsKIH0KIAorI3ByYWdtYSBtYXJrIFdLT2JqZWN0IHByb3RvY29sIGltcGxl bWVudGF0aW9uCisKKy0gKEFQSTo6T2JqZWN0JilfYXBpT2JqZWN0Cit7CisgICAgcmV0dXJuICpf cGFnZTsKK30KKwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV0tXZWJQcm9jZXNzUGx1Z0luQnJv d3NlckNvbnRleHRDb250cm9sbGVyIChQcml2YXRlKQogCiAtIChXS0J1bmRsZVBhZ2VSZWYpX2J1 bmRsZVBhZ2VSZWYKIHsKLSAgICByZXR1cm4gX2J1bmRsZVBhZ2VSZWYuZ2V0KCk7CisgICAgcmV0 dXJuIHRvQVBJKF9wYWdlLmdldCgpKTsKIH0KIAogLSAoV0tCcm93c2luZ0NvbnRleHRIYW5kbGUg KiloYW5kbGUKIHsKLSAgICByZXR1cm4gW1tbV0tCcm93c2luZ0NvbnRleHRIYW5kbGUgYWxsb2Nd IF9pbml0V2l0aFBhZ2VJRDp0b0ltcGwoX2J1bmRsZVBhZ2VSZWYuZ2V0KCkpLT5wYWdlSUQoKV0g YXV0b3JlbGVhc2VdOworICAgIHJldHVybiBbW1tXS0Jyb3dzaW5nQ29udGV4dEhhbmRsZSBhbGxv Y10gX2luaXRXaXRoUGFnZUlEOl9wYWdlLT5wYWdlSUQoKV0gYXV0b3JlbGVhc2VdOwogfQogCiAr IChpbnN0YW5jZXR5cGUpbG9va1VwQnJvd3NpbmdDb250ZXh0RnJvbUhhbmRsZTooV0tCcm93c2lu Z0NvbnRleHRIYW5kbGUgKiloYW5kbGUKQEAgLTk2LDcgKzk5LDcgQEAgKyAoaW5zdGFuY2V0eXBl KWxvb2tVcEJyb3dzaW5nQ29udGV4dEZybwogICAgIGlmICghd2ViUGFnZSkKICAgICAgICAgcmV0 dXJuIG5pbDsKIAotICAgIHJldHVybiBbW1dLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgX3No YXJlZF0gX2Jyb3dzZXJDb250ZXh0Q29udHJvbGxlckZvckJ1bmRsZVBhZ2VSZWY6dG9BUEkod2Vi UGFnZSldOworICAgIHJldHVybiB3cmFwcGVyKCp3ZWJQYWdlKTsKIH0KIAogQGVuZApJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlckludGVybmFsLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2Vi UHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlckludGVybmFsLmgJKHJldmlzaW9u IDE2MDI3NikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJ L21hYy9XS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXJJbnRlcm5hbC5o CSh3b3JraW5nIGNvcHkpCkBAIC0yNCwxNCArMjQsMjMgQEAKICAqLwogCiAjaW1wb3J0ICJXS1dl YlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXJQcml2YXRlLmgiCi0jaW1wb3J0 ICJXS0Jhc2UuaCIKIAogI2lmIFdLX0FQSV9FTkFCTEVECiAKLUBpbnRlcmZhY2UgV0tXZWJQcm9j ZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICgpCisjaW1wb3J0ICJXS09iamVjdC5o IgorI2ltcG9ydCAiV2ViUGFnZS5oIgogCi0tIChpZClfaW5pdFdpdGhCdW5kbGVQYWdlUmVmOihX S0J1bmRsZVBhZ2VSZWYpYnVuZGxlUGFnZVJlZjsKK25hbWVzcGFjZSBXZWJLaXQgewogCitpbmxp bmUgV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICp3cmFwcGVyKFdl YlBhZ2UmIHBhZ2UpCit7CisgICAgQVNTRVJUKFtwYWdlLndyYXBwZXIoKSBpc0tpbmRPZkNsYXNz OltXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgY2xhc3NdXSk7Cisg ICAgcmV0dXJuIChXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKilw YWdlLndyYXBwZXIoKTsKK30KKworfQorCitAaW50ZXJmYWNlIFdLV2ViUHJvY2Vzc1BsdWdJbkJy b3dzZXJDb250ZXh0Q29udHJvbGxlciAoKSA8V0tPYmplY3Q+CiBAZW5kCiAKICNlbmRpZiAvLyBX S19BUElfRU5BQkxFRApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkludGVybmFsLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJv Y2Vzc1BsdWdJbkludGVybmFsLmgJKHJldmlzaW9uIDE2MDI3NikKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW5JbnRl cm5hbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNywxMiArMjcsMTIgQEAKIAogI2lmIFdLX0FQSV9F TkFCTEVECiAKKyNpbXBvcnQgIkluamVjdGVkQnVuZGxlLmgiCisKIEBpbnRlcmZhY2UgV0tXZWJQ cm9jZXNzUGx1Z0luQ29udHJvbGxlciAoKQogCiArIChXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9s bGVyICopX3NoYXJlZDsKLS0gKGlkKV9pbml0V2l0aFByaW5jaXBhbENsYXNzSW5zdGFuY2U6KGlk PFdLV2ViUHJvY2Vzc1BsdWdJbj4pcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZSBidW5kbGVSZWY6KFdL QnVuZGxlUmVmKWJ1bmRsZVJlZjsKLQotLSAoV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRl eHRDb250cm9sbGVyICopX2Jyb3dzZXJDb250ZXh0Q29udHJvbGxlckZvckJ1bmRsZVBhZ2VSZWY6 KFdLQnVuZGxlUGFnZVJlZilwYWdlUmVmOworLSAoaWQpX2luaXRXaXRoUHJpbmNpcGFsQ2xhc3NJ bnN0YW5jZTooaWQ8V0tXZWJQcm9jZXNzUGx1Z0luPilwcmluY2lwYWxDbGFzc0luc3RhbmNlIGJ1 bmRsZTooV2ViS2l0OjpJbmplY3RlZEJ1bmRsZSYpYnVuZGxlOwogCiBAZW5kCiAKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxl TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1tCShyZXZpc2lvbiAxNjAyNzYpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1h Yy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA1LDcgKzEwNSw3IEBAIGJvb2wgSW5qZWN0ZWRCdW5k bGU6OmxvYWQoQVBJOjpPYmplY3QqIGkKICAgICB9CiAKICAgICAvLyBDcmVhdGUgdGhlIHNoYXJl ZCBXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyLgotICAgIFtbV0tXZWJQcm9jZXNzUGx1Z0lu Q29udHJvbGxlciBhbGxvY10gX2luaXRXaXRoUHJpbmNpcGFsQ2xhc3NJbnN0YW5jZTppbnN0YW5j ZSBidW5kbGVSZWY6dG9BUEkodGhpcyldOworICAgIFtbV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJv bGxlciBhbGxvY10gX2luaXRXaXRoUHJpbmNpcGFsQ2xhc3NJbnN0YW5jZTppbnN0YW5jZSBidW5k bGU6KnRoaXNdOwogCiAgICAgaWYgKFtpbnN0YW5jZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHdlYlByb2Nlc3NQbHVnSW46aW5pdGlhbGl6ZVdpdGhPYmplY3Q6KV0pIHsKICAgICAgICAg UmV0YWluUHRyPGlkPiBvYmpDSW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsK