62739 2011-06-15 10:55:04 -0700 Move some argument coders to WebCoreArgumentCoders.cpp 2011-06-15 11:14:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 421443 0 andersca 2011-06-15 10:55:04 -0700 Move some argument coders to WebCoreArgumentCoders.cpp 421444 1 97323 andersca 2011-06-15 10:55:35 -0700 Created attachment 97323 Patch 421446 2 webkit.review.bot 2011-06-15 10:58:39 -0700 Attachment 97323 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/Shared/WebCoreArgumentCoders.h:69: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 421457 3 andersca 2011-06-15 11:14:40 -0700 Committed r88960: <http://trac.webkit.org/changeset/88960> 97323 2011-06-15 10:55:35 -0700 2011-06-15 11:11:32 -0700 Patch bug-62739-20110615105534.patch text/plain 11960 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4OTU4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDYtMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIHNvbWUgYXJndW1lbnQgY29kZXJzIHRvIFdlYkNv cmVBcmd1bWVudENvZGVycy5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYyNzM5CisKKyAgICAgICAgKiBHTlVtYWtlZmlsZS5hbToKKyAgICAgICAg KiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcDoKKyAgICAgICAgKENvcmVJUEM6Ojo6 ZW5jb2RlKToKKyAgICAgICAgKENvcmVJUEM6Ojo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmg6CisgICAgICAgICogV2ViS2l0Mi5wcm86CisKIDIwMTEt MDYtMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUu YW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0JKHJldmlzaW9u IDg4OTQzKQorKysgU291cmNlL1dlYktpdDIvR05VbWFrZWZpbGUuYW0JKHdvcmtpbmcgY29weSkK QEAgLTI1Niw2ICsyNTYsNyBAQCBsaWJ3ZWJraXQyZ3RrX0BXRUJLSVRHVEtfQVBJX01BSk9SX1ZF UlNJCiAJU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYkNvbnRleHRNZW51SXRlbURhdGEuY3BwIFwK IAlTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29udGV4dE1lbnVJdGVtRGF0YS5oIFwKIAlTb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29udGV4dE1lbnVJdGVtLmggXAorCVNvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwIFwKIAlTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmggXAogCVNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJE YXRhLmggXAogCVNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJFcnJvci5jcHAgXApJbmRleDogU291 cmNlL1dlYktpdDIvV2ViS2l0Mi5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2Vi S2l0Mi5wcm8JKHJldmlzaW9uIDg4OTQzKQorKysgU291cmNlL1dlYktpdDIvV2ViS2l0Mi5wcm8J KHdvcmtpbmcgY29weSkKQEAgLTM1Myw2ICszNTMsNyBAQCBTT1VSQ0VTICs9IFwKICAgICBTaGFy ZWQvV2ViQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAgXAogICAgIFNoYXJlZC9XZWJDb250ZXh0TWVu dUl0ZW0uY3BwIFwKICAgICBTaGFyZWQvV2ViQ29udGV4dE1lbnVJdGVtRGF0YS5jcHAgXAorICAg IFNoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwIFwKICAgICBTaGFyZWQvV2ViRXJyb3Iu Y3BwIFwKICAgICBTaGFyZWQvV2ViRXZlbnQuY3BwIFwKICAgICBTaGFyZWQvV2ViRXZlbnRDb252 ZXJzaW9uLmNwcCBcCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFy Z3VtZW50Q29kZXJzLmNwcAkocmV2aXNpb24gODg5NDMpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMTAgKzI2 LDEzNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENv ZGVycy5oIgogCisjaW5jbHVkZSA8V2ViQ29yZS9QbHVnaW5EYXRhLmg+CisKIHVzaW5nIG5hbWVz cGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogbmFtZXNwYWNlIENvcmVJ UEMgeworICAgIAordm9pZCBBcmd1bWVudENvZGVyPE1pbWVDbGFzc0luZm8+OjplbmNvZGUoQXJn dW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBNaW1lQ2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZv KQoreworICAgIGVuY29kZXItPmVuY29kZShtaW1lQ2xhc3NJbmZvLnR5cGUpOworICAgIGVuY29k ZXItPmVuY29kZShtaW1lQ2xhc3NJbmZvLmRlc2MpOworICAgIGVuY29kZXItPmVuY29kZShtaW1l Q2xhc3NJbmZvLmV4dGVuc2lvbnMpOworfQorCitib29sIEFyZ3VtZW50Q29kZXI8TWltZUNsYXNz SW5mbz46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIE1pbWVDbGFzc0luZm8mIG1p bWVDbGFzc0luZm8pCit7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUobWltZUNsYXNzSW5mby50 eXBlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKG1p bWVDbGFzc0luZm8uZGVzYykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29k ZXItPmRlY29kZShtaW1lQ2xhc3NJbmZvLmV4dGVuc2lvbnMpKQorICAgICAgICByZXR1cm4gZmFs c2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworCit2b2lkIEFyZ3VtZW50Q29kZXI8UGx1Z2lu SW5mbz46OmVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFBsdWdpbkluZm8m IHBsdWdpbkluZm8pCit7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpbkluZm8ubmFtZSk7Cisg ICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpbkluZm8uZmlsZSk7CisgICAgZW5jb2Rlci0+ZW5jb2Rl KHBsdWdpbkluZm8uZGVzYyk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpbkluZm8ubWltZXMp OworfQorICAgIAorYm9vbCBBcmd1bWVudENvZGVyPFBsdWdpbkluZm8+OjpkZWNvZGUoQXJndW1l bnREZWNvZGVyKiBkZWNvZGVyLCBQbHVnaW5JbmZvJiBwbHVnaW5JbmZvKQoreworICAgIGlmICgh ZGVjb2Rlci0+ZGVjb2RlKHBsdWdpbkluZm8ubmFtZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5JbmZvLmZpbGUpKQorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocGx1Z2luSW5mby5kZXNjKSkKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHBsdWdpbkluZm8u bWltZXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwor Cit2b2lkIEFyZ3VtZW50Q29kZXI8SFRUUEhlYWRlck1hcD46OmVuY29kZShBcmd1bWVudEVuY29k ZXIqIGVuY29kZXIsIGNvbnN0IEhUVFBIZWFkZXJNYXAmIGhlYWRlck1hcCkKK3sKKyAgICBlbmNv ZGVyLT5lbmNvZGUoc3RhdGljX2Nhc3Q8Y29uc3QgSGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmlu ZywgQ2FzZUZvbGRpbmdIYXNoPiY+KGhlYWRlck1hcCkpOworfQorCitib29sIEFyZ3VtZW50Q29k ZXI8SFRUUEhlYWRlck1hcD46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIEhUVFBI ZWFkZXJNYXAmIGhlYWRlck1hcCkKK3sKKyAgICByZXR1cm4gZGVjb2Rlci0+ZGVjb2RlKHN0YXRp Y19jYXN0PEhhc2hNYXA8QXRvbWljU3RyaW5nLCBTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4mPiho ZWFkZXJNYXApKTsKK30KKworCit2b2lkIEFyZ3VtZW50Q29kZXI8QXV0aGVudGljYXRpb25DaGFs bGVuZ2U+OjplbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBBdXRoZW50aWNh dGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlKQoreworICAgIGVuY29kZXItPmVuY29kZShjaGFsbGVu Z2UucHJvdGVjdGlvblNwYWNlKCkpOworICAgIGVuY29kZXItPmVuY29kZShjaGFsbGVuZ2UucHJv cG9zZWRDcmVkZW50aWFsKCkpOworICAgIGVuY29kZXItPmVuY29kZShjaGFsbGVuZ2UucHJldmlv dXNGYWlsdXJlQ291bnQoKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKGNoYWxsZW5nZS5mYWlsdXJl UmVzcG9uc2UoKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKGNoYWxsZW5nZS5lcnJvcigpKTsKK30K KworYm9vbCBBcmd1bWVudENvZGVyPEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlPjo6ZGVjb2RlKEFy Z3VtZW50RGVjb2RlciogZGVjb2RlciwgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5n ZSkKK3sgICAgCisgICAgUHJvdGVjdGlvblNwYWNlIHByb3RlY3Rpb25TcGFjZTsKKyAgICBpZiAo IWRlY29kZXItPmRlY29kZShwcm90ZWN0aW9uU3BhY2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICBDcmVkZW50aWFsIHByb3Bvc2VkQ3JlZGVudGlhbDsKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZShwcm9wb3NlZENyZWRlbnRpYWwpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICB1bnNpZ25lZCBwcmV2aW91c0ZhaWx1cmVDb3VudDsgICAgCisgICAgaWYgKCFkZWNvZGVyLT5k ZWNvZGUocHJldmlvdXNGYWlsdXJlQ291bnQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBSZXNvdXJjZVJlc3BvbnNlIGZhaWx1cmVSZXNwb25zZTsKKyAgICBpZiAoIWRlY29kZXItPmRl Y29kZShmYWlsdXJlUmVzcG9uc2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBSZXNv dXJjZUVycm9yIGVycm9yOworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKGVycm9yKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIGNoYWxsZW5nZSA9IFdlYkNvcmU6OkF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlKHByb3RlY3Rpb25TcGFjZSwgcHJvcG9zZWRDcmVkZW50aWFsLCBwcmV2 aW91c0ZhaWx1cmVDb3VudCwgZmFpbHVyZVJlc3BvbnNlLCBlcnJvcik7CisgICAgcmV0dXJuIHRy dWU7Cit9CisKKwordm9pZCBBcmd1bWVudENvZGVyPFByb3RlY3Rpb25TcGFjZT46OmVuY29kZShB cmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgc3BhY2UpCit7 CisgICAgZW5jb2Rlci0+ZW5jb2RlKHNwYWNlLmhvc3QoKSk7CisgICAgZW5jb2Rlci0+ZW5jb2Rl KHNwYWNlLnBvcnQoKSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlRW51bShzcGFjZS5zZXJ2ZXJUeXBl KCkpOworICAgIGVuY29kZXItPmVuY29kZShzcGFjZS5yZWFsbSgpKTsKKyAgICBlbmNvZGVyLT5l bmNvZGVFbnVtKHNwYWNlLmF1dGhlbnRpY2F0aW9uU2NoZW1lKCkpOworfQorCitib29sIEFyZ3Vt ZW50Q29kZXI8UHJvdGVjdGlvblNwYWNlPjo6ZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2Rl ciwgUHJvdGVjdGlvblNwYWNlJiBzcGFjZSkKK3sKKyAgICBTdHJpbmcgaG9zdDsKKyAgICBpZiAo IWRlY29kZXItPmRlY29kZShob3N0KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgaW50 IHBvcnQ7CisgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUocG9ydCkpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGUgc2VydmVyVHlwZTsKKyAgICBp ZiAoIWRlY29kZXItPmRlY29kZUVudW0oc2VydmVyVHlwZSkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIFN0cmluZyByZWFsbTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShyZWFsbSkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICBQcm90ZWN0aW9uU3BhY2VBdXRoZW50 aWNhdGlvblNjaGVtZSBhdXRoZW50aWNhdGlvblNjaGVtZTsKKyAgICBpZiAoIWRlY29kZXItPmRl Y29kZUVudW0oYXV0aGVudGljYXRpb25TY2hlbWUpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisK KyAgICBzcGFjZSA9IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZShob3N0LCBwb3J0LCBzZXJ2ZXJU eXBlLCByZWFsbSwgYXV0aGVudGljYXRpb25TY2hlbWUpOworICAgIHJldHVybiB0cnVlOworfQog CiAvLyBGb3Igbm93LCB0aGVzZSBhcmUgQ0ctb25seS4gT25jZSBvdGhlciBwbGF0Zm9ybXMgaGF2 ZSBjcmVhdGVJbWFnZSBmdW5jdGlvbnMsCiAvLyB3ZSBjYW4gY29tcGlsZSB0aGVzZSBmb3Igbm9u LUNHIGJ1aWxkcy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRD b2RlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzLmgJKHJldmlzaW9uIDg4OTQzKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YkNvcmVBcmd1bWVudENvZGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw3ICs0OSw2IEBACiAj aW5jbHVkZSA8V2ViQ29yZS9NYXRyaXgzRFRyYW5zZm9ybU9wZXJhdGlvbi5oPgogI2luY2x1ZGUg PFdlYkNvcmUvTWF0cml4VHJhbnNmb3JtT3BlcmF0aW9uLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Q ZXJzcGVjdGl2ZVRyYW5zZm9ybU9wZXJhdGlvbi5oPgotI2luY2x1ZGUgPFdlYkNvcmUvUGx1Z2lu RGF0YS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUHJvdGVjdGlvblNwYWNlLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlcXVl c3QuaD4KQEAgLTY2LDYgKzY1LDExIEBACiAjaW5jbHVkZSA8V2ViQ29yZS9XaW5kb3dGZWF0dXJl cy5oPgogI2luY2x1ZGUgPGxpbWl0cz4KIAorbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIGNsYXNz IEhUVFBIZWFkZXJNYXA7CisgICAgc3RydWN0IE1pbWVDbGFzc0luZm87CisgICAgc3RydWN0IFBs dWdpbkluZm87Cit9CiAKIG5hbWVzcGFjZSBDb3JlSVBDIHsKIApAQCAtOTAsMTA2ICs5NCwyOCBA QCB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6CiB0ZW1wbGF0ZTw+IHN0 cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlRyYW5zbGF0ZVRyYW5zZm9ybU9wZXJhdGlvbj4g OiBTaW1wbGVBcmd1bWVudENvZGVyPFdlYkNvcmU6OlRyYW5zbGF0ZVRyYW5zZm9ybU9wZXJhdGlv bj4geyB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6Ok1pbWVD bGFzc0luZm8+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNv ZGVyLCBjb25zdCBXZWJDb3JlOjpNaW1lQ2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZvKQotICAgIHsK LSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKG1pbWVDbGFzc0luZm8udHlwZSk7Ci0gICAgICAgIGVu Y29kZXItPmVuY29kZShtaW1lQ2xhc3NJbmZvLmRlc2MpOwotICAgICAgICBlbmNvZGVyLT5lbmNv ZGUobWltZUNsYXNzSW5mby5leHRlbnNpb25zKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgYm9vbCBk ZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpNaW1lQ2xhc3NJbmZvJiBt aW1lQ2xhc3NJbmZvKQotICAgIHsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUobWltZUNs YXNzSW5mby50eXBlKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYgKCFk ZWNvZGVyLT5kZWNvZGUobWltZUNsYXNzSW5mby5kZXNjKSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUobWltZUNsYXNzSW5mby5leHRlbnNp b25zKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICB9CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IFdl YkNvcmU6Ok1pbWVDbGFzc0luZm8mKTsKKyAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnRE ZWNvZGVyKiwgV2ViQ29yZTo6TWltZUNsYXNzSW5mbyYpOwogfTsKLSAgICAKLXRlbXBsYXRlPD4g c3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6UGx1Z2luSW5mbz4gewotICAgIHN0YXRpYyB2 b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFdlYkNvcmU6OlBsdWdp bkluZm8mIHBsdWdpbkluZm8pCi0gICAgewotICAgICAgICBlbmNvZGVyLT5lbmNvZGUocGx1Z2lu SW5mby5uYW1lKTsKLSAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKHBsdWdpbkluZm8uZmlsZSk7Ci0g ICAgICAgIGVuY29kZXItPmVuY29kZShwbHVnaW5JbmZvLmRlc2MpOwotICAgICAgICBlbmNvZGVy LT5lbmNvZGUocGx1Z2luSW5mby5taW1lcyk7Ci0gICAgfQotICAgIAotICAgIHN0YXRpYyBib29s IGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFdlYkNvcmU6OlBsdWdpbkluZm8mIHBs dWdpbkluZm8pCi0gICAgewotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5JbmZv Lm5hbWUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXIt PmRlY29kZShwbHVnaW5JbmZvLmZpbGUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAg ICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5JbmZvLmRlc2MpKQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5JbmZvLm1p bWVzKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICB9Cit0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlBsdWdpbklu Zm8+IHsKKyAgICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiwgY29uc3QgV2Vi Q29yZTo6UGx1Z2luSW5mbyYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29k ZXIqLCBXZWJDb3JlOjpQbHVnaW5JbmZvJik7CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1 bWVudENvZGVyPFdlYkNvcmU6OkhUVFBIZWFkZXJNYXA+IHsKLSAgICBzdGF0aWMgdm9pZCBlbmNv ZGUoQXJndW1lbnRFbmNvZGVyKiBlbmNvZGVyLCBjb25zdCBXZWJDb3JlOjpIVFRQSGVhZGVyTWFw JiBoZWFkZXJNYXApCi0gICAgewotICAgICAgICBlbmNvZGVyLT5lbmNvZGUoc3RhdGljX2Nhc3Q8 Y29uc3QgSGFzaE1hcDxBdG9taWNTdHJpbmcsIFN0cmluZywgQ2FzZUZvbGRpbmdIYXNoPiY+KGhl YWRlck1hcCkpOwotICAgIH0KLQotICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29k ZXIqIGRlY29kZXIsIFdlYkNvcmU6OkhUVFBIZWFkZXJNYXAmIGhlYWRlck1hcCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiBkZWNvZGVyLT5kZWNvZGUoc3RhdGljX2Nhc3Q8SGFzaE1hcDxBdG9taWNT dHJpbmcsIFN0cmluZywgQ2FzZUZvbGRpbmdIYXNoPiY+KGhlYWRlck1hcCkpOwotICAgIH0KKyAg ICBzdGF0aWMgdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiwgY29uc3QgV2ViQ29yZTo6SFRU UEhlYWRlck1hcCYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqLCBX ZWJDb3JlOjpIVFRQSGVhZGVyTWFwJik7CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVu dENvZGVyPFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlPiB7Ci0gICAgc3RhdGljIHZv aWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2RlciwgY29uc3QgV2ViQ29yZTo6QXV0aGVu dGljYXRpb25DaGFsbGVuZ2UmIGNoYWxsZW5nZSkKLSAgICB7Ci0gICAgICAgIGVuY29kZXItPmVu Y29kZShDb3JlSVBDOjpJbihjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCksIGNoYWxsZW5nZS5w cm9wb3NlZENyZWRlbnRpYWwoKSwgY2hhbGxlbmdlLnByZXZpb3VzRmFpbHVyZUNvdW50KCksIGNo YWxsZW5nZS5mYWlsdXJlUmVzcG9uc2UoKSwgY2hhbGxlbmdlLmVycm9yKCkpKTsKLSAgICB9Ci0K LSAgICBzdGF0aWMgYm9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3Jl OjpBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYgY2hhbGxlbmdlKQotICAgIHsgICAgCi0gICAgICAg IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZSBwcm90ZWN0aW9uU3BhY2U7Ci0gICAgICAgIFdlYkNv cmU6OkNyZWRlbnRpYWwgcHJvcG9zZWRDcmVkZW50aWFsOwotICAgICAgICB1bnNpZ25lZCBwcmV2 aW91c0ZhaWx1cmVDb3VudDsKLSAgICAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSBmYWls dXJlUmVzcG9uc2U7Ci0gICAgICAgIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgZXJyb3I7Ci0KLSAg ICAgICAgaWYgKCFkZWNvZGVyLT5kZWNvZGUoQ29yZUlQQzo6T3V0KHByb3RlY3Rpb25TcGFjZSwg cHJvcG9zZWRDcmVkZW50aWFsLCBwcmV2aW91c0ZhaWx1cmVDb3VudCwgZmFpbHVyZVJlc3BvbnNl LCBlcnJvcikpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAKLSAgICAgICAg Y2hhbGxlbmdlID0gV2ViQ29yZTo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2UocHJvdGVjdGlvblNw YWNlLCBwcm9wb3NlZENyZWRlbnRpYWwsIHByZXZpb3VzRmFpbHVyZUNvdW50LCBmYWlsdXJlUmVz cG9uc2UsIGVycm9yKTsKLQotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CisgICAgc3RhdGlj IHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlJik7CisgICAgc3RhdGljIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2Rlcios IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiB9OwogCiB0ZW1wbGF0ZTw+IHN0 cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZT4gewotICAgIHN0YXRp YyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0IFdlYkNvcmU6OlBy b3RlY3Rpb25TcGFjZSYgc3BhY2UpCi0gICAgewotICAgICAgICBlbmNvZGVyLT5lbmNvZGUoQ29y ZUlQQzo6SW4oc3BhY2UuaG9zdCgpLCBzcGFjZS5wb3J0KCksIHN0YXRpY19jYXN0PHVpbnQzMl90 PihzcGFjZS5zZXJ2ZXJUeXBlKCkpLCBzcGFjZS5yZWFsbSgpLCBzdGF0aWNfY2FzdDx1aW50MzJf dD4oc3BhY2UuYXV0aGVudGljYXRpb25TY2hlbWUoKSkpKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMg Ym9vbCBkZWNvZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBXZWJDb3JlOjpQcm90ZWN0aW9u U3BhY2UmIHNwYWNlKQotICAgIHsKLSAgICAgICAgU3RyaW5nIGhvc3Q7Ci0gICAgICAgIGludCBw b3J0OwotICAgICAgICB1aW50MzJfdCBzZXJ2ZXJUeXBlOwotICAgICAgICBTdHJpbmcgcmVhbG07 Ci0gICAgICAgIHVpbnQzMl90IGF1dGhlbnRpY2F0aW9uU2NoZW1lOwotCi0gICAgICAgIGlmICgh ZGVjb2Rlci0+ZGVjb2RlKENvcmVJUEM6Ok91dChob3N0LCBwb3J0LCBzZXJ2ZXJUeXBlLCByZWFs bSwgYXV0aGVudGljYXRpb25TY2hlbWUpKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAg ICAKLSAgICAgICAgc3BhY2UgPSBXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2UoaG9zdCwgcG9ydCwg c3RhdGljX2Nhc3Q8V2ViQ29yZTo6UHJvdGVjdGlvblNwYWNlU2VydmVyVHlwZT4oc2VydmVyVHlw ZSksIHJlYWxtLCBzdGF0aWNfY2FzdDxXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2VBdXRoZW50aWNh dGlvblNjaGVtZT4oYXV0aGVudGljYXRpb25TY2hlbWUpKTsKLQotICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICB9CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciosIGNvbnN0 IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFjZSYpOworICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1 bWVudERlY29kZXIqLCBXZWJDb3JlOjpQcm90ZWN0aW9uU3BhY2UmKTsKIH07CiAKIHRlbXBsYXRl PD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6Q3JlZGVudGlhbD4gewo=