41118 2010-06-23 17:59:11 -0700 Have the UI process compute the plug-in data 2010-06-23 18:39:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 242199 0 andersca 2010-06-23 17:59:11 -0700 Have the UI process compute the plug-in data 242203 1 59590 andersca 2010-06-23 18:02:37 -0700 Created attachment 59590 Patch 242208 2 webkit.review.bot 2010-06-23 18:05:17 -0700 Attachment 59590 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/UIProcess/WebProcessProxy.cpp:179: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 242231 3 andersca 2010-06-23 18:39:52 -0700 Committed r61725: <http://trac.webkit.org/changeset/61725> 59590 2010-06-23 18:02:37 -0700 2010-06-23 18:34:07 -0700 Patch bug-41118-20100623180236.patch text/plain 12088 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTcyMikKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzkgQEAKKzIwMTAtMDYtMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBIYXZlIHRoZSBVSSBwcm9jZXNzIGNvbXB1dGUgdGhlIHBsdWctaW4gZGF0YQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDExMTgKKworICAgICAgICAq IFNoYXJlZC9Db3JlSVBDU3VwcG9ydC9XZWJQcm9jZXNzUHJveHlNZXNzYWdlS2luZHMuaDoKKyAg ICAgICAgKFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6Oik6CisgICAgICAgIEFkZCBHZXRQbHVnaW4g bWVzc2FnZSBraW5kLgorCisgICAgICAgICogU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVycy5o OgorICAgICAgICBBZGQgYXJndW1lbnQgY29kZXJzIGZvciBQbHVnaW5JbmZvIGFuZCBNaW1lQ2xh c3NJbmZvLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2lu SW5mb1N0b3JlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpzYWZlQ3JlYXRlQ0ZTdHJpbmcpOgor ICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OnBsdWdpblBhdGhzSW5EaXJlY3Rvcnkp OgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OmdldFBsdWdpbkluZm8pOgorICAg ICAgICBVc2Ugc2FmZUNyZWF0ZUNGU3RyaW5nLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5 OjpnZXRQbHVnaW5zKToKKyAgICAgICAgQXNrIHRoZSBwbHVnLWluIGluZm8gc3RvcmUgZm9yIHRo ZSBwbHVnLWluIGxpc3QuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpkaWRS ZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICBIYW5kbGUgR2V0UGx1Z2lucy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKToKKyAgICAgICAgSW1wbGVt ZW50LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0 cmF0ZWdpZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6OnBv cHVsYXRlUGx1Z2luQ2FjaGUpOgorICAgICAgICBTZW5kIGEgc3luYyBHZXRQbHVnaW5zIG1lc3Nh Z2UuCisKIDIwMTAtMDYtMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogV2ViS2l0Mi9TaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQv V2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgJKHJldmlzaW9uIDYxNzE5KQorKysgV2ViS2l0Mi9TaGFy ZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDYgKzMzLDcg QEAKICNpbmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50 UmVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1TdHJpbmcuaD4KKyNpbmNsdWRlIDxX ZWJDb3JlL1BsdWdpbkRhdGEuaD4KIAogbmFtZXNwYWNlIENvcmVJUEMgewogCkBAIC02NCw2ICs2 NSw1MSBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBBcmd1bWVudENvZGVyPFdlYkNvcmU6CiAgICAgfQog fTsKIAordGVtcGxhdGU8PiBzdHJ1Y3QgQXJndW1lbnRDb2RlcjxXZWJDb3JlOjpNaW1lQ2xhc3NJ bmZvPiB7CisgICAgc3RhdGljIHZvaWQgZW5jb2RlKEFyZ3VtZW50RW5jb2RlciogZW5jb2Rlciwg Y29uc3QgV2ViQ29yZTo6TWltZUNsYXNzSW5mbyYgbWltZUNsYXNzSW5mbykKKyAgICB7CisgICAg ICAgIGVuY29kZXItPmVuY29kZShtaW1lQ2xhc3NJbmZvLnR5cGUpOworICAgICAgICBlbmNvZGVy LT5lbmNvZGUobWltZUNsYXNzSW5mby5kZXNjKTsKKyAgICAgICAgZW5jb2Rlci0+ZW5jb2RlKG1p bWVDbGFzc0luZm8uZXh0ZW5zaW9ucyk7CisgICAgfQorCisgICAgc3RhdGljIGJvb2wgZGVjb2Rl KEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgV2ViQ29yZTo6TWltZUNsYXNzSW5mbyYgbWltZUNs YXNzSW5mbykKKyAgICB7CisgICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKG1pbWVDbGFzc0lu Zm8udHlwZSkpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIGlmICghZGVjb2Rl ci0+ZGVjb2RlKG1pbWVDbGFzc0luZm8uZGVzYykpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICAgICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucykp CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorfTsKKyAgICAKK3RlbXBsYXRlPD4gc3RydWN0IEFyZ3VtZW50Q29kZXI8V2ViQ29yZTo6UGx1 Z2luSW5mbz4geworICAgIHN0YXRpYyB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29k ZXIsIGNvbnN0IFdlYkNvcmU6OlBsdWdpbkluZm8mIHBsdWdpbkluZm8pCisgICAgeworICAgICAg ICBlbmNvZGVyLT5lbmNvZGUocGx1Z2luSW5mby5uYW1lKTsKKyAgICAgICAgZW5jb2Rlci0+ZW5j b2RlKHBsdWdpbkluZm8uZmlsZSk7CisgICAgICAgIGVuY29kZXItPmVuY29kZShwbHVnaW5JbmZv LmRlc2MpOworICAgICAgICBlbmNvZGVyLT5lbmNvZGUocGx1Z2luSW5mby5taW1lcyk7CisgICAg fQorICAgIAorICAgIHN0YXRpYyBib29sIGRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIs IFdlYkNvcmU6OlBsdWdpbkluZm8mIHBsdWdpbkluZm8pCisgICAgeworICAgICAgICBpZiAoIWRl Y29kZXItPmRlY29kZShwbHVnaW5JbmZvLm5hbWUpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5JbmZvLmZpbGUpKQorICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29kZXItPmRlY29kZShwbHVnaW5J bmZvLmRlc2MpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWRlY29k ZXItPmRlY29kZShwbHVnaW5JbmZvLm1pbWVzKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK KworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cit9OworCiB9IC8vIG5hbWVzcGFjZSBDb3Jl SVBDCiAKICNlbmRpZiAvLyBXZWJDb3JlQXJndW1lbnRDb2RlcnNfaApJbmRleDogV2ViS2l0Mi9T aGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVz c2FnZUtpbmRzLmgJKHJldmlzaW9uIDYxNjk4KQorKysgV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1 cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMz LDcgKzMzLDggQEAKIG5hbWVzcGFjZSBXZWJQcm9jZXNzUHJveHlNZXNzYWdlIHsKIAogZW51bSBL aW5kIHsKLSAgICBQb3N0TWVzc2FnZQorICAgIFBvc3RNZXNzYWdlLAorICAgIEdldFBsdWdpbnMK IH07CiAKIH0KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNp b24gNjE2OTgpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNSw2ICsyNSw3IEBACiAKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHku aCIKIAorI2luY2x1ZGUgIlBsdWdpbkluZm9TdG9yZS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHQu aCIKICNpbmNsdWRlICJXZWJQYWdlTmFtZXNwYWNlLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCkBAIC0xMjgsMjMgKzEyOSwzNSBAQCBzaXplX3QgV2ViUHJvY2Vzc1Byb3h5OjpudW1iZXJP ZlBhZ2VzKCkKICAgICByZXR1cm4gbV9wYWdlTWFwLnNpemUoKTsKIH0KIAotdm9pZCBXZWJQcm9j ZXNzUHJveHk6OmZvcndhcmRNZXNzYWdlVG9XZWJDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYgbWVzc2FnZSkKK3ZvaWQgV2ViUHJvY2Vzc1Byb3h5Ojpmb3J3YXJkTWVzc2FnZVRvV2ViQ29u dGV4dChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiB7CiAgICAgbV9jb250ZXh0LT5kaWRSZWNpZXZl TWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShtZXNzYWdlKTsKIH0KIAordm9pZCBXZWJQcm9jZXNz UHJveHk6OmdldFBsdWdpbnMoYm9vbCByZWZyZXNoLCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdp bnMpCit7CisgICAgaWYgKHJlZnJlc2gpCisgICAgICAgIFBsdWdpbkluZm9TdG9yZTo6c2hhcmVk KCkucmVmcmVzaCgpOworICAgIFBsdWdpbkluZm9TdG9yZTo6c2hhcmVkKCkuZ2V0UGx1Z2lucyhw bHVnaW5zKTsKK30KKwogdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENv cmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdl SUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIGlmIChtZXNz YWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViUHJvY2Vzc1Byb3h5PigpKSB7CiAgICAg ICAgIHN3aXRjaCAobWVzc2FnZUlELmdldDxXZWJQcm9jZXNzUHJveHlNZXNzYWdlOjpLaW5kPigp KSB7CiAgICAgICAgICAgICBjYXNlIFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6OlBvc3RNZXNzYWdl OiB7Ci0gICAgICAgICAgICAgICAgV2ViQ29yZTo6U3RyaW5nIG1lc3NhZ2U7CisgICAgICAgICAg ICAgICAgU3RyaW5nIG1lc3NhZ2U7CiAgICAgICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRl Y29kZShDb3JlSVBDOjpPdXQobWVzc2FnZSkpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgICAgICAgICBmb3J3YXJkTWVzc2FnZVRvV2ViQ29udGV4dChtZXNzYWdlKTsK ICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg CisgICAgICAgICAgICAvLyBUaGVzZSBhcmUgc3luY2hyb25vdXMgbWVzc2FnZXMgYW5kIHNob3Vs ZCBuZXZlciBiZSBoYW5kbGVkIGhlcmUuCisgICAgICAgICAgICBjYXNlIFdlYlByb2Nlc3NQcm94 eU1lc3NhZ2U6OkdldFBsdWdpbnM6CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CiAKQEAgLTE2MSw2 ICsxNzQsMjggQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKAogCiB2 b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5l Y3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzLCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqIHJl cGx5KQogeworICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViUHJv Y2Vzc1Byb3h5PigpKSB7CisgICAgICAgIHN3aXRjaCAobWVzc2FnZUlELmdldDxXZWJQcm9jZXNz UHJveHlNZXNzYWdlOjpLaW5kPigpKSB7CisgICAgICAgICAgICBjYXNlIFdlYlByb2Nlc3NQcm94 eU1lc3NhZ2U6OkdldFBsdWdpbnM6IHsKKyAgICAgICAgICAgICAgICBib29sIHJlZnJlc2g7Cisg ICAgICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShyZWZyZXNoKSkKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgbm90IGRvIHRoaXMgb24gdGhlIG1haW4gdGhyZWFkIQorICAgICAg ICAgICAgICAgIFZlY3RvcjxQbHVnaW5JbmZvPiBwbHVnaW5zOworICAgICAgICAgICAgICAgIGdl dFBsdWdpbnMocmVmcmVzaCwgcGx1Z2lucyk7CisKKyAgICAgICAgICAgICAgICByZXBseS0+ZW5j b2RlKHBsdWdpbnMpOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAvLyBUaGVzZSBhcmUgYXN5bmNocm9ub3VzIG1lc3NhZ2VzIGFuZCBzaG91bGQg bmV2ZXIgYmUgaGFuZGxlZCBoZXJlLgorICAgICAgICAgICAgY2FzZSBXZWJQcm9jZXNzUHJveHlN ZXNzYWdlOjpQb3N0TWVzc2FnZToKKyAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKyAgICAKICAgICB1 aW50NjRfdCBwYWdlSUQgPSBhcmd1bWVudHMtPmRlc3RpbmF0aW9uSUQoKTsKICAgICBpZiAoIXBh Z2VJRCkKICAgICAgICAgcmV0dXJuOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmgJKHJldmlzaW9uIDYxNjk4KQorKysgV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmgJKHdvcmtpbmcgY29weSkKQEAgLTc3LDcgKzc3LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGNv bm5lY3QoKTsKIAogICAgIHZvaWQgZm9yd2FyZE1lc3NhZ2VUb1dlYkNvbnRleHQoY29uc3QgV2Vi Q29yZTo6U3RyaW5nJik7Ci0KKyAgICB2b2lkIGdldFBsdWdpbnMoYm9vbCByZWZyZXNoLCBWZWN0 b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mKTsKKyAgICAKICAgICAvLyBDb3JlSVBDOjpDb25uZWN0 aW9uOjpDbGllbnQKICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rp b24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciopOwogICAg IHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBD OjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIENvcmVJUEM6OkFyZ3VtZW50 RW5jb2RlciopOwpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5m b1N0b3JlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFj L1BsdWdpbkluZm9TdG9yZU1hYy5tbQkocmV2aXNpb24gNjE2OTgpCisrKyBXZWJLaXQyL1VJUHJv Y2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg LTQzLDE0ICs0MywyMiBAQCBWZWN0b3I8U3RyaW5nPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbkRp CiAgICAgcmV0dXJuIHBsdWdpbkRpcmVjdG9yaWVzOwogfQogCisvLyBGSVhNRTogT25jZSB0aGUg VUkgcHJvY2VzcyBrbm93cyB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSBtYWluIHRocmVhZCBh bmQgdGhlIHdlYiB0aHJlYWQgd2UgY2FuIGRyb3AgdGhpcyBhbmQganVzdCB1c2UKKy8vIFN0cmlu Zzo6Y3JlYXRlQ0ZTdHJpbmcuCitzdGF0aWMgQ0ZTdHJpbmdSZWYgc2FmZUNyZWF0ZUNGU3RyaW5n KGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5KQoreworICAgIHJldHVybiBDRlN0cmluZ0NyZWF0ZVdp dGhDaGFyYWN0ZXJzKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgVW5pQ2hhcio+KGRpcmVjdG9y eS5jaGFyYWN0ZXJzKCkpLCBkaXJlY3RvcnkubGVuZ3RoKCkpOworfQorICAgIAogVmVjdG9yPFN0 cmluZz4gUGx1Z2luSW5mb1N0b3JlOjpwbHVnaW5QYXRoc0luRGlyZWN0b3J5KGNvbnN0IFN0cmlu ZyYgZGlyZWN0b3J5KQogewogICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpblBhdGhzOwogCi0gICAg TlNTdHJpbmcgKmRpcmVjdG9yeU5TU3RyaW5nID0gZGlyZWN0b3J5OwotICAgIE5TQXJyYXkgKmZp bGVuYW1lcyA9IFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gY29udGVudHNPZkRpcmVj dG9yeUF0UGF0aDpkaXJlY3RvcnkgZXJyb3I6bmlsXTsKKyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdS ZWY+IGRpcmVjdG9yeUNGU3RyaW5nKEFkb3B0Q0YsIHNhZmVDcmVhdGVDRlN0cmluZyhkaXJlY3Rv cnkpKTsKKyAgICAKKyAgICBOU0FycmF5ICpmaWxlbmFtZXMgPSBbW05TRmlsZU1hbmFnZXIgZGVm YXVsdE1hbmFnZXJdIGNvbnRlbnRzT2ZEaXJlY3RvcnlBdFBhdGg6KE5TU3RyaW5nICopZGlyZWN0 b3J5Q0ZTdHJpbmcuZ2V0KCkgZXJyb3I6bmlsXTsKICAgICBmb3IgKE5TU3RyaW5nICpmaWxlbmFt ZSBpbiBmaWxlbmFtZXMpCi0gICAgICAgIHBsdWdpblBhdGhzLmFwcGVuZChbZGlyZWN0b3J5TlNT dHJpbmcgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmZpbGVuYW1lXSk7CisgICAgICAg IHBsdWdpblBhdGhzLmFwcGVuZChbKE5TU3RyaW5nICopZGlyZWN0b3J5Q0ZTdHJpbmcuZ2V0KCkg c3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50OmZpbGVuYW1lXSk7CiAgICAgCiAgICAgcmV0 dXJuIHBsdWdpblBhdGhzOwogfQpAQCAtMzA2LDcgKzMxNCw3IEBAIHN0YXRpYyBib29sIGdldFBs dWdpbkluZm9Gcm9tQ2FyYm9uUmVzb3UKIAogYm9vbCBQbHVnaW5JbmZvU3RvcmU6OmdldFBsdWdp bkluZm8oY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW4mIHBsdWdpbikK IHsKLSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGJ1bmRsZVBhdGgoQWRvcHRDRiwgcGx1Z2lu UGF0aC5jcmVhdGVDRlN0cmluZygpKTsKKyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGJ1bmRs ZVBhdGgoQWRvcHRDRiwgc2FmZUNyZWF0ZUNGU3RyaW5nKHBsdWdpblBhdGgpKTsKICAgICBSZXRh aW5QdHI8Q0ZVUkxSZWY+IGJ1bmRsZVVSTChBZG9wdENGLCBDRlVSTENyZWF0ZVdpdGhGaWxlU3lz dGVtUGF0aChrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBidW5kbGVQYXRoLmdldCgpLCBrQ0ZVUkxQT1NJ WFBhdGhTdHlsZSwgZmFsc2UpKTsKIAogICAgIC8vIFRyeSB0byBpbml0aWFsaXplIHRoZSBidW5k bGUuCkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2Fk ZXJDbGllbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9uIDYxNzE5KQorKysgV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDMsNyArNDMsOSBAQAogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2Fk UmVxdWVzdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9IVE1MRm9ybUVsZW1lbnQuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0 cnkuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1BsdWdp bkRhdGEuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Byb2dyZXNzVHJhY2tlci5oPgogI2luY2x1ZGUg PFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvV2lkZ2V0Lmg+CkBA IC03NzksNiArNzgxLDIxIEBAIFBhc3NSZWZQdHI8V2lkZ2V0PiBXZWJGcmFtZUxvYWRlckNsaWVu dDoKIAogT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRl bnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIHsKKyAgICBp ZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7CisgICAgICAgIC8vIEZJWE1FOiBUcnkgdG8gZmluZCB0 aGUgTUlNRSB0eXBlIGJhc2VkIG9uIHRoZSBleHRlbnNpb24gb2YgdGhlIFVSTC4KKyAgICAgICAg cmV0dXJuIE9iamVjdENvbnRlbnROb25lOworICAgIH0KKworICAgIGlmIChXZWJQYWdlKiB3ZWJQ YWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7CisgICAgICAgIGlmIChQbHVnaW5EYXRhKiBwbHVnaW5E YXRhID0gd2ViUGFnZS0+Y29yZVBhZ2UoKS0+cGx1Z2luRGF0YSgpKSB7CisgICAgICAgICAgICBp ZiAocGx1Z2luRGF0YS0+c3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZSkpCisgICAgICAgICAgICAg ICAgcmV0dXJuIE9iamVjdENvbnRlbnROZXRzY2FwZVBsdWdpbjsKKyAgICAgICAgfQorICAgIH0K KworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUobWlt ZVR5cGUpKQorICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudEltYWdlOworCiAgICAgbm90SW1w bGVtZW50ZWQoKTsKICAgICByZXR1cm4gT2JqZWN0Q29udGVudE5vbmU7CiB9CkluZGV4OiBXZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZv cm1TdHJhdGVnaWVzLmNwcAkocmV2aXNpb24gNjE3MDIpCisrKyBXZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjgsNiArMjgsOSBAQAogI2lmIFVTRShQTEFURk9STV9TVFJBVEVHSUVTKQogCiAjaW5jbHVk ZSAiUGx1Z2luSW5mb1N0b3JlLmgiCisjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50Q29kZXJzLmgi CisjaW5jbHVkZSAiV2ViUHJvY2Vzcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eU1lc3Nh Z2VLaW5kcy5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtNTksMTEgKzYyLDEy IEBAIHZvaWQgV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpwb3B1bGF0ZVBsdWcKIAogICAgIEFTU0VS VChtX2NhY2hlZFBsdWdpbnMuaXNFbXB0eSgpKTsKICAgICAKLSAgICAvLyBGSVhNRTogVGhpcyBz aG91bGQgY2FsbCBvdXQgdG8gdGhlIFVJIHByb2Nlc3MuCi0gICAgaWYgKG1fc2hvdWxkUmVmcmVz aFBsdWdpbnMpCi0gICAgICAgIFBsdWdpbkluZm9TdG9yZTo6c2hhcmVkKCkucmVmcmVzaCgpOwor ICAgIFZlY3RvcjxQbHVnaW5JbmZvPiBwbHVnaW5zOworICAgIAorICAgIC8vIEZJWE1FOiBTaG91 bGQgd2UgZG8gc29tZXRoaW5nIGluIGNhc2Ugb2YgZXJyb3IgaGVyZT8KKyAgICBXZWJQcm9jZXNz OjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmRTeW5jKFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6 OkdldFBsdWdpbnMsIDAsIENvcmVJUEM6OkluKG1fc2hvdWxkUmVmcmVzaFBsdWdpbnMpLCBDb3Jl SVBDOjpPdXQocGx1Z2lucyksIENvcmVJUEM6OkNvbm5lY3Rpb246Ok5vVGltZW91dCk7CisgICAg bV9jYWNoZWRQbHVnaW5zLnN3YXAocGx1Z2lucyk7CiAgICAgCi0gICAgUGx1Z2luSW5mb1N0b3Jl OjpzaGFyZWQoKS5nZXRQbHVnaW5zKG1fY2FjaGVkUGx1Z2lucyk7CiAgICAgbV9zaG91bGRSZWZy ZXNoUGx1Z2lucyA9IGZhbHNlOwogICAgIG1fcGx1Z2luQ2FjaGVJc1BvcHVsYXRlZCA9IHRydWU7 CiB9Cg==