40860 2010-06-18 14:45:16 -0700 Get rid of PluginDataMac.mm and use the plug-in strategy instead 2010-06-18 15:08:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 240152 0 andersca 2010-06-18 14:45:16 -0700 Get rid of PluginDataMac.mm and use the plug-in strategy instead 240154 1 59159 andersca 2010-06-18 14:46:07 -0700 Created attachment 59159 Patch 240170 2 andersca 2010-06-18 15:08:58 -0700 Committed r61444: <http://trac.webkit.org/changeset/61444> 59159 2010-06-18 14:46:07 -0700 2010-06-18 15:02:07 -0700 Patch bug-40860-20100618144606.patch text/plain 15153 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTQ0MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDYtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBHZXQgcmlkIG9mIFBsdWdpbkRhdGFNYWMubW0gYW5kIHVzZSB0aGUgcGx1Zy1pbiBzdHJhdGVn eSBpbnN0ZWFkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MDg2MAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogV2Vi Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHBhZ2UvbWFjL1dlYkNv cmVWaWV3RmFjdG9yeS5oOgorICAgICAgICAqIHBsdWdpbnMvUGx1Z2luRGF0YS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpQbHVnaW5EYXRhOjpyZWZyZXNoKToKKyAgICAgICAgKFdlYkNvcmU6OlBs dWdpbkRhdGE6OmluaXRQbHVnaW5zKToKKyAgICAgICAgKiBwbHVnaW5zL1BsdWdpblN0cmF0ZWd5 Lmg6CisgICAgICAgICogcGx1Z2lucy9tYWMvUGx1Z2luRGF0YU1hYy5tbTogUmVtb3ZlZC4KKwog MjAxMC0wNi0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gNjE0MzcpCisrKyBXZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5KQpAQCAtMzQ2MCw3ICsz NDYwLDYgQEAKIAkJQTlDNkU0RjAwRDc0NUUzODAwNjQ0MkU5IC8qIFBsdWdpbkFycmF5LmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOUM2RTRFRTBENzQ1 RTM4MDA2NDQyRTkgLyogUGx1Z2luQXJyYXkuaCAqLzsgfTsKIAkJQTlDNkU0RjMwRDc0NUU0ODAw NjQ0MkU5IC8qIFBsdWdpbkRhdGEuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gQTlDNkU0RjEwRDc0NUU0ODAwNjQ0MkU5IC8qIFBsdWdpbkRhdGEuY3Bw ICovOyB9OwogCQlBOUM2RTRGNDBENzQ1RTQ4MDA2NDQyRTkgLyogUGx1Z2luRGF0YS5oIGluIEhl YWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTlDNkU0RjIwRDc0NUU0 ODAwNjQ0MkU5IC8qIFBsdWdpbkRhdGEuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwotCQlBOUM2RTRGNjBENzQ1RTYxMDA2NDQyRTkgLyogUGx1Z2luRGF0 YU1hYy5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE5 QzZFNEY1MEQ3NDVFNjEwMDY0NDJFOSAvKiBQbHVnaW5EYXRhTWFjLm1tICovOyB9OwogCQlBOUM2 RTVBNTBENzQ2NDU4MDA2NDQyRTkgLyogTmF2aWdhdG9yLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE5QzZFNUEzMEQ3NDY0NTgwMDY0NDJFOSAvKiBO YXZpZ2F0b3IuY3BwICovOyB9OwogCQlBOUM2RTVBNjBENzQ2NDU4MDA2NDQyRTkgLyogTmF2aWdh dG9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBOUM2 RTVBNDBENzQ2NDU4MDA2NDQyRTkgLyogTmF2aWdhdG9yLmggKi87IH07CiAJCUE5QzZFNjQ3MEQ3 NDY1Q0EwMDY0NDJFOSAvKiBKU01pbWVUeXBlQXJyYXlDdXN0b20uY3BwIGluIFNvdXJjZXMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTlDNkU2NDYwRDc0NjVDQTAwNjQ0MkU5 IC8qIEpTTWltZVR5cGVBcnJheUN1c3RvbS5jcHAgKi87IH07CkBAIC04Nzk0LDcgKzg3OTMsNiBA QAogCQlBOUM2RTRFRTBENzQ1RTM4MDA2NDQyRTkgLyogUGx1Z2luQXJyYXkuaCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkFycmF5Lmg7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CiAJCUE5QzZFNEYxMEQ3NDVFNDgwMDY0NDJFOSAvKiBQbHVnaW5EYXRhLmNwcCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAzMDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQbHVnaW5EYXRhLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTlDNkU0RjIwRDc0NUU0ODAwNjQ0MkU5IC8qIFBs dWdpbkRhdGEuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAz MDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkRhdGEu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQTlDNkU0RjUwRDc0NUU2MTAwNjQ0MkU5 IC8qIFBsdWdpbkRhdGFNYWMubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBu YW1lID0gUGx1Z2luRGF0YU1hYy5tbTsgcGF0aCA9IG1hYy9QbHVnaW5EYXRhTWFjLm1tOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBOUM2RTVBMzBENzQ2NDU4MDA2NDQyRTkgLyogTmF2 aWdhdG9yLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSAz MDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBOYXZpZ2F0 b3IuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBOUM2RTVBNDBENzQ2NDU4MDA2 NDQyRTkgLyogTmF2aWdhdG9yLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVu Y29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBO YXZpZ2F0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTlDNkU2NDYwRDc0NjVD QTAwNjQ0MkU5IC8qIEpTTWltZVR5cGVBcnJheUN1c3RvbS5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gSlNNaW1lVHlwZUFycmF5Q3VzdG9tLmNwcDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTExODIzLDcgKzExODIxLDYgQEAKIAkJCQlBOUM2RTY2MTBE NzQ2NzFFMDA2NDQyRTkgLyogUGx1Z2luQXJyYXkuaWRsICovLAogCQkJCUE5QzZFNEYxMEQ3NDVF NDgwMDY0NDJFOSAvKiBQbHVnaW5EYXRhLmNwcCAqLywKIAkJCQlBOUM2RTRGMjBENzQ1RTQ4MDA2 NDQyRTkgLyogUGx1Z2luRGF0YS5oICovLAotCQkJCUE5QzZFNEY1MEQ3NDVFNjEwMDY0NDJFOSAv KiBQbHVnaW5EYXRhTWFjLm1tICovLAogCQkJCTFBREExNDBFMEUxQUU1RDkwMDAyM0VFNSAvKiBQ bHVnaW5NYWluVGhyZWFkU2NoZWR1bGVyLmNwcCAqLywKIAkJCQkxQURBMTQwRjBFMUFFNUQ5MDAw MjNFRTUgLyogUGx1Z2luTWFpblRocmVhZFNjaGVkdWxlci5oICovLAogCQkJCTc2RkYxN0UyMTEy MzU2NzMwMDFENjFCNSAvKiBQbHVnaW5WaWV3Tm9uZS5jcHAgKi8sCkBAIC0yMTEzNiw3ICsyMTEz Myw2IEBACiAJCQkJQTlDNkU0RUIwRDc0NUUyQjAwNjQ0MkU5IC8qIFBsdWdpbi5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQlBOUM2RTRFRjBENzQ1RTM4MDA2NDQyRTkgLyogUGx1Z2luQXJyYXkuY3Bw IGluIFNvdXJjZXMgKi8sCiAJCQkJQTlDNkU0RjMwRDc0NUU0ODAwNjQ0MkU5IC8qIFBsdWdpbkRh dGEuY3BwIGluIFNvdXJjZXMgKi8sCi0JCQkJQTlDNkU0RjYwRDc0NUU2MTAwNjQ0MkU5IC8qIFBs dWdpbkRhdGFNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCQkxQUM2OTRDNzBBM0IxNjc2MDAzRjUw NDkgLyogUGx1Z2luRG9jdW1lbnQuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNzY5M0JBRDMxMDZD MkRDQTAwN0IwODIzIC8qIFBsdWdpbkhhbHRlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkxQURB MTQxMDBFMUFFNUQ5MDAwMjNFRTUgLyogUGx1Z2luTWFpblRocmVhZFNjaGVkdWxlci5jcHAgaW4g U291cmNlcyAqLywKSW5kZXg6IFdlYkNvcmUvcGFnZS9tYWMvV2ViQ29yZVZpZXdGYWN0b3J5LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL21hYy9XZWJDb3JlVmlld0ZhY3RvcnkuaAkocmV2 aXNpb24gNjE0MzcpCisrKyBXZWJDb3JlL3BhZ2UvbWFjL1dlYkNvcmVWaWV3RmFjdG9yeS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yOCw5ICsyOCw2IEBACiAKIEBwcm90b2NvbCBXZWJDb3JlVmlld0Zh Y3RvcnkKIAotLSAoTlNBcnJheSAqKXBsdWdpbnNJbmZvOyAvLyBhcnJheSBvZiBpZCA8V2ViQ29y ZVBsdWdpbkluZm8+Ci0tICh2b2lkKXJlZnJlc2hQbHVnaW5zOwotCiAtIChOU1N0cmluZyAqKWlu cHV0RWxlbWVudEFsdFRleHQ7CiAtIChOU1N0cmluZyAqKXJlc2V0QnV0dG9uRGVmYXVsdExhYmVs OwogLSAoTlNTdHJpbmcgKilzZWFyY2hhYmxlSW5kZXhJbnRyb2R1Y3Rpb247CkBAIC0xNzEsMTMg KzE2OCwzIEBAIEBpbnRlcmZhY2UgV2ViQ29yZVZpZXdGYWN0b3J5IDogTlNPYmplY3QKIAogQGlu dGVyZmFjZSBXZWJDb3JlVmlld0ZhY3RvcnkgKFN1YmNsYXNzUmVzcG9uc2liaWxpdHkpIDxXZWJD b3JlVmlld0ZhY3Rvcnk+CiBAZW5kCi0KLUBwcm90b2NvbCBXZWJDb3JlUGx1Z2luSW5mbyA8TlNP YmplY3Q+Ci0tIChOU1N0cmluZyAqKW5hbWU7Ci0tIChOU1N0cmluZyAqKWZpbGVuYW1lOwotLSAo TlNTdHJpbmcgKilwbHVnaW5EZXNjcmlwdGlvbjsKLS0gKE5TRW51bWVyYXRvciAqKU1JTUVUeXBl RW51bWVyYXRvcjsKLS0gKE5TU3RyaW5nICopZGVzY3JpcHRpb25Gb3JNSU1FVHlwZTooTlNTdHJp bmcgKilNSU1FVHlwZTsKLS0gKE5TQXJyYXkgKilleHRlbnNpb25zRm9yTUlNRVR5cGU6KE5TU3Ry aW5nICopTUlNRVR5cGU7Ci1AZW5kCi0KSW5kZXg6IFdlYkNvcmUvcGx1Z2lucy9QbHVnaW5EYXRh LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luRGF0YS5jcHAJKHJldmlz aW9uIDYxNDM3KQorKysgV2ViQ29yZS9wbHVnaW5zL1BsdWdpbkRhdGEuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yNCw4ICsyNCwxMCBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlBs dWdpbkRhdGEuaCIKIAorI2lmIFVTRShQTEFURk9STV9TVFJBVEVHSUVTKQogI2luY2x1ZGUgIlBs YXRmb3JtU3RyYXRlZ2llcy5oIgogI2luY2x1ZGUgIlBsdWdpblN0cmF0ZWd5LmgiCisjZW5kaWYK IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02Myw0ICs2NSwxOCBAQCBTdHJpbmcgUGx1Z2lu RGF0YTo6cGx1Z2luTmFtZUZvck1pbWVUeXBlCiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCisj aWYgVVNFKFBMQVRGT1JNX1NUUkFURUdJRVMpCit2b2lkIFBsdWdpbkRhdGE6OnJlZnJlc2goKQor eworICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wbHVnaW5TdHJhdGVneSgpLT5yZWZyZXNoUGx1 Z2lucygpOworfQorCit2b2lkIFBsdWdpbkRhdGE6OmluaXRQbHVnaW5zKCkKK3sKKyAgICBBU1NF UlQobV9wbHVnaW5zLmlzRW1wdHkoKSk7CisgICAgCisgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCkt PnBsdWdpblN0cmF0ZWd5KCktPmdldFBsdWdpbkluZm8obV9wbHVnaW5zKTsKK30KKyNlbmRpZgor CiB9CkluZGV4OiBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luU3RyYXRlZ3kuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL3BsdWdpbnMvUGx1Z2luU3RyYXRlZ3kuaAkocmV2aXNpb24gNjE0MzcpCisrKyBX ZWJDb3JlL3BsdWdpbnMvUGx1Z2luU3RyYXRlZ3kuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNyAr MzcsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJlZnJlc2hQbHVnaW5zKCkgPSAwOwog ICAgIHZpcnR1YWwgdm9pZCBnZXRQbHVnaW5JbmZvKFZlY3RvcjxQbHVnaW5JbmZvPiYpID0gMDsK IAotcHJpdmF0ZToKK3Byb3RlY3RlZDoKICAgICB2aXJ0dWFsIH5QbHVnaW5TdHJhdGVneSgpIHsg fQogfTsKIApJbmRleDogV2ViQ29yZS9wbHVnaW5zL21hYy9QbHVnaW5EYXRhTWFjLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYkNvcmUvcGx1Z2lucy9tYWMvUGx1Z2luRGF0YU1hYy5tbQkocmV2aXNpb24g NjE0MzcpCisrKyBXZWJDb3JlL3BsdWdpbnMvbWFjL1BsdWdpbkRhdGFNYWMubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEsODggKzAsMCBAQAotLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNCBBcHBsZSBD b21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAw OCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKLSAqCi0gKiBS ZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9y IHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJlZGlzdHJpYnV0aW9u cyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBu b3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWlt ZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2Ug dGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4K LSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIENPTVBVVEVSLCBJTkMu IGBgQVMgSVMnJyBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotICogSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCi0gKiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgQ09NUFVURVIsIElOQy4g T1IKLSAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLAotICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFH RVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogUFJPQ1VSRU1FTlQgT0YgU1VC U1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCi0gKiBQUk9G SVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkg VEhFT1JZCi0gKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksIE9SIFRPUlQKLSAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFS SVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCi0gKi8KLQot I2ltcG9ydCAiY29uZmlnLmgiCi0jaW1wb3J0ICJQbHVnaW5EYXRhLmgiCi0KLSNpbXBvcnQgIkJs b2NrRXhjZXB0aW9ucy5oIgotI2ltcG9ydCAiTG9nZ2luZy5oIgotI2ltcG9ydCAiV2ViQ29yZVZp ZXdGYWN0b3J5LmgiCi0KLSNpZmRlZiBCVUlMRElOR19PTl9USUdFUgotdHlwZWRlZiB1bnNpZ25l ZCBOU1VJbnRlZ2VyOwotI2VuZGlmCi0KLW5hbWVzcGFjZSBXZWJDb3JlIHsKLQotdm9pZCBQbHVn aW5EYXRhOjppbml0UGx1Z2lucygpCi17Ci0gICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05T OwotCi0gICAgTlNBcnJheSogcGx1Z2lucyA9IFtbV2ViQ29yZVZpZXdGYWN0b3J5IHNoYXJlZEZh Y3RvcnldIHBsdWdpbnNJbmZvXTsKLSAgICBmb3IgKHVuc2lnbmVkIGludCBpID0gMDsgaSA8IFtw bHVnaW5zIGNvdW50XTsgKytpKSB7Ci0gICAgICAgIFBsdWdpbkluZm8gcGx1Z2luSW5mbzsKLQot ICAgICAgICBpZCA8V2ViQ29yZVBsdWdpbkluZm8+IHBsdWdpbiA9IFtwbHVnaW5zIG9iamVjdEF0 SW5kZXg6aV07Ci0gICAgCi0gICAgICAgIHBsdWdpbkluZm8ubmFtZSA9IFtwbHVnaW4gbmFtZV07 Ci0gICAgICAgIHBsdWdpbkluZm8uZmlsZSA9IFtwbHVnaW4gZmlsZW5hbWVdOwotICAgICAgICBw bHVnaW5JbmZvLmRlc2MgPSBbcGx1Z2luIHBsdWdpbkRlc2NyaXB0aW9uXTsKLQotICAgICAgICBO U0VudW1lcmF0b3IqIE1JTUVUeXBlRW51bWVyYXRvciA9IFtwbHVnaW4gTUlNRVR5cGVFbnVtZXJh dG9yXTsKLSAgICAgICAgd2hpbGUgKE5TU3RyaW5nKiBNSU1FID0gW01JTUVUeXBlRW51bWVyYXRv ciBuZXh0T2JqZWN0XSkgewotICAgICAgICAgICAgTWltZUNsYXNzSW5mbyBtaW1lOwotCi0gICAg ICAgICAgICBtaW1lLnR5cGUgPSBTdHJpbmcoTUlNRSkubG93ZXIoKTsKLSAgICAgICAgICAgIAot ICAgICAgICAgICAgTlNBcnJheSAqZXh0ZW5zaW9ucyA9IFtwbHVnaW4gZXh0ZW5zaW9uc0Zvck1J TUVUeXBlOk1JTUVdOwotICAgICAgICAgICAgTlNVSW50ZWdlciBjb3VudCA9IFtleHRlbnNpb25z IGNvdW50XTsKLSAgICAgICAgICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyAr K2kpIHsKLSAgICAgICAgICAgICAgICBOU1N0cmluZyAqZXh0ZW5zaW9uID0gW2V4dGVuc2lvbnMg b2JqZWN0QXRJbmRleDppXTsKLSAgICAgICAgICAgICAgICBtaW1lLmV4dGVuc2lvbnMuYXBwZW5k KGV4dGVuc2lvbik7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1pbWUuZGVzYyA9IFtw bHVnaW4gZGVzY3JpcHRpb25Gb3JNSU1FVHlwZTpNSU1FXTsKLSAgICAgICAgICAgIAotICAgICAg ICAgICAgcGx1Z2luSW5mby5taW1lcy5hcHBlbmQobWltZSk7Ci0gICAgICAgIH0KLQotICAgICAg ICBtX3BsdWdpbnMuYXBwZW5kKHBsdWdpbkluZm8pOwotICAgIH0KLSAgICAKLSAgICBFTkRfQkxP Q0tfT0JKQ19FWENFUFRJT05TOwotCi0gICAgcmV0dXJuOwotfQotCi12b2lkIFBsdWdpbkRhdGE6 OnJlZnJlc2goKQotewotICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLSAgICBbW1dl YkNvcmVWaWV3RmFjdG9yeSBzaGFyZWRGYWN0b3J5XSByZWZyZXNoUGx1Z2luc107Ci0gICAgRU5E X0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLX0KLQotfQotCkluZGV4OiBXZWJLaXQvbWFjL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gNjE0NDAp CisrKyBXZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDEwLTA2LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR2V0IHJpZCBvZiBQ bHVnaW5EYXRhTWFjLm1tIGFuZCB1c2UgdGhlIHBsdWctaW4gc3RyYXRlZ3kgaW5zdGVhZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NjAKKworICAg ICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaDoKKyAgICAgICAgKiBXZWJDb3Jl U3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW06CisgICAgICAgIChXZWJQbGF0Zm9ybVN0cmF0ZWdp ZXM6OmNyZWF0ZVBsdWdpblN0cmF0ZWd5KToKKyAgICAgICAgKFdlYlBsYXRmb3JtU3RyYXRlZ2ll czo6cmVmcmVzaFBsdWdpbnMpOgorICAgICAgICAoV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpnZXRQ bHVnaW5JbmZvKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJWaWV3RmFjdG9yeS5tbToK KwogMjAxMC0wNi0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdp bnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdp bnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE0MzcpCisrKyBXZWJLaXQvbWFj L1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyAr NTIsNyBAQCB0eXBlZGVmIHZvaWQgKCpCUF9DcmVhdGVQbHVnaW5NSU1FVHlwZXNQCiAjZGVmaW5l IFdlYlBsdWdpblR5cGVEZXNjcmlwdGlvbktleSAgICAgQCJXZWJQbHVnaW5UeXBlRGVzY3JpcHRp b24iCiAjZGVmaW5lIFdlYlBsdWdpblR5cGVFbmFibGVkS2V5ICAgICAgICAgQCJXZWJQbHVnaW5U eXBlRW5hYmxlZCIKIAotQGludGVyZmFjZSBXZWJCYXNlUGx1Z2luUGFja2FnZSA6IE5TT2JqZWN0 IDxXZWJDb3JlUGx1Z2luSW5mbz4KK0BpbnRlcmZhY2UgV2ViQmFzZVBsdWdpblBhY2thZ2UgOiBO U09iamVjdAogewogICAgIE5TTXV0YWJsZVNldCAqcGx1Z2luRGF0YWJhc2VzOwogICAgIApJbmRl eDogV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlBsYXRmb3JtU3RyYXRlZ2ll cy5oCShyZXZpc2lvbiA2MTQzOCkKKysrIFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxh dGZvcm1TdHJhdGVnaWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDggKzI3LDkgQEAKICNkZWZp bmUgV2ViUGxhdGZvcm1TdHJhdGVnaWVzX2gKIAogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1T dHJhdGVnaWVzLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9QbHVnaW5TdHJhdGVneS5oPgogCi1jbGFz cyBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXMgOiBwdWJsaWMgV2ViQ29yZTo6UGxhdGZvcm1TdHJhdGVn aWVzIHsKK2NsYXNzIFdlYlBsYXRmb3JtU3RyYXRlZ2llcyA6IHB1YmxpYyBXZWJDb3JlOjpQbGF0 Zm9ybVN0cmF0ZWdpZXMsIHByaXZhdGUgV2ViQ29yZTo6UGx1Z2luU3RyYXRlZ3kgewogcHVibGlj OgogICAgIHN0YXRpYyB2b2lkIGluaXRpYWxpemUoKTsKICAgICAKQEAgLTM4LDYgKzM5LDkgQEAg cHJpdmF0ZToKICAgICAvLyBXZWJDb3JlOjpQbGF0Zm9ybVN0cmF0ZWdpZXMKICAgICB2aXJ0dWFs IFdlYkNvcmU6OlBsdWdpblN0cmF0ZWd5KiBjcmVhdGVQbHVnaW5TdHJhdGVneSgpOwogCisgICAg Ly8gV2ViQ29yZTo6UGx1Z2luU3RyYXRlZ3kKKyAgICB2aXJ0dWFsIHZvaWQgcmVmcmVzaFBsdWdp bnMoKTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2V0UGx1Z2luSW5mbyhWZWN0b3I8V2ViQ29yZTo6UGx1 Z2luSW5mbz4mKTsKIH07CiAKICNlbmRpZiAvLyBXZWJQbGF0Zm9ybVN0cmF0ZWdpZXNfaApJbmRl eDogV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQbGF0Zm9ybVN0cmF0ZWdp ZXMubW0JKHJldmlzaW9uIDYxNDM4KQorKysgV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJQ bGF0Zm9ybVN0cmF0ZWdpZXMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1LDYgKzI1LDkgQEAKIAog I2ltcG9ydCAiV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgiCiAKKyNpbXBvcnQgIldlYlBsdWdpbkRh dGFiYXNlLmgiCisjaW1wb3J0ICJXZWJQbHVnaW5QYWNrYWdlLmgiCisjaW1wb3J0IDxXZWJDb3Jl L0Jsb2NrRXhjZXB0aW9ucy5oPgogI2ltcG9ydCA8d3RmL1N0ZExpYkV4dHJhcy5oPgogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTM5LDcgKzQyLDUzIEBAIFdlYlBsYXRmb3JtU3RyYXRl Z2llczo6V2ViUGxhdGZvcm1TdHJhdGUKIHsKIH0KIAorLy8gUGx1Z2luU3RyYXRlZ3kKKwogUGx1 Z2luU3RyYXRlZ3kqIFdlYlBsYXRmb3JtU3RyYXRlZ2llczo6Y3JlYXRlUGx1Z2luU3RyYXRlZ3ko KQogewotICAgIHJldHVybiAwOworICAgIHJldHVybiB0aGlzOworfQorCit2b2lkIFdlYlBsYXRm b3JtU3RyYXRlZ2llczo6cmVmcmVzaFBsdWdpbnMoKQoreworICAgIFtbV2ViUGx1Z2luRGF0YWJh c2Ugc2hhcmVkRGF0YWJhc2VdIHJlZnJlc2hdOworfQorCit2b2lkIFdlYlBsYXRmb3JtU3RyYXRl Z2llczo6Z2V0UGx1Z2luSW5mbyhWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMp Cit7CisgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJT05TOworCisgICAgTlNBcnJheSogcGx1 Z2luc0FycmF5ID0gW1tXZWJQbHVnaW5EYXRhYmFzZSBzaGFyZWREYXRhYmFzZV0gcGx1Z2luc107 CisgICAgZm9yICh1bnNpZ25lZCBpbnQgaSA9IDA7IGkgPCBbcGx1Z2luc0FycmF5IGNvdW50XTsg KytpKSB7CisgICAgICAgIFBsdWdpbkluZm8gcGx1Z2luSW5mbzsKKworICAgICAgICBXZWJQbHVn aW5QYWNrYWdlICpwbHVnaW4gPSBbcGx1Z2luc0FycmF5IG9iamVjdEF0SW5kZXg6aV07CisgICAg CisgICAgICAgIHBsdWdpbkluZm8ubmFtZSA9IFtwbHVnaW4gbmFtZV07CisgICAgICAgIHBsdWdp bkluZm8uZmlsZSA9IFtwbHVnaW4gZmlsZW5hbWVdOworICAgICAgICBwbHVnaW5JbmZvLmRlc2Mg PSBbcGx1Z2luIHBsdWdpbkRlc2NyaXB0aW9uXTsKKworICAgICAgICBOU0VudW1lcmF0b3IqIE1J TUVUeXBlRW51bWVyYXRvciA9IFtwbHVnaW4gTUlNRVR5cGVFbnVtZXJhdG9yXTsKKyAgICAgICAg d2hpbGUgKE5TU3RyaW5nKiBNSU1FID0gW01JTUVUeXBlRW51bWVyYXRvciBuZXh0T2JqZWN0XSkg eworICAgICAgICAgICAgTWltZUNsYXNzSW5mbyBtaW1lOworCisgICAgICAgICAgICBtaW1lLnR5 cGUgPSBTdHJpbmcoTUlNRSkubG93ZXIoKTsKKyAgICAgICAgICAgIAorICAgICAgICAgICAgTlNB cnJheSAqZXh0ZW5zaW9ucyA9IFtwbHVnaW4gZXh0ZW5zaW9uc0Zvck1JTUVUeXBlOk1JTUVdOwor ICAgICAgICAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBpIDwgW2V4dGVuc2lvbnMgY291bnRd OyArK2kpIHsKKyAgICAgICAgICAgICAgICBOU1N0cmluZyAqZXh0ZW5zaW9uID0gW2V4dGVuc2lv bnMgb2JqZWN0QXRJbmRleDppXTsKKyAgICAgICAgICAgICAgICBtaW1lLmV4dGVuc2lvbnMuYXBw ZW5kKGV4dGVuc2lvbik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIG1pbWUuZGVzYyA9 IFtwbHVnaW4gZGVzY3JpcHRpb25Gb3JNSU1FVHlwZTpNSU1FXTsKKyAgICAgICAgICAgIAorICAg ICAgICAgICAgcGx1Z2luSW5mby5taW1lcy5hcHBlbmQobWltZSk7CisgICAgICAgIH0KKworICAg ICAgICBwbHVnaW5zLmFwcGVuZChwbHVnaW5JbmZvKTsKKyAgICB9CisgICAgCisgICAgRU5EX0JM T0NLX09CSkNfRVhDRVBUSU9OUzsKIH0KKworCkluZGV4OiBXZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYlZpZXdGYWN0b3J5Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViVmlld0ZhY3RvcnkubW0JKHJldmlzaW9uIDYxNDM3KQorKysgV2ViS2l0L21hYy9X ZWJDb3JlU3VwcG9ydC9XZWJWaWV3RmFjdG9yeS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzUsNyAr MzUsNiBAQAogI2ltcG9ydCA8V2ViS2l0L1dlYk5TVXNlckRlZmF1bHRzRXh0cmFzLmg+CiAjaW1w b3J0IDxXZWJLaXQvV2ViTlNPYmplY3RFeHRyYXMuaD4KICNpbXBvcnQgPFdlYktpdC9XZWJOU1Zp ZXdFeHRyYXMuaD4KLSNpbXBvcnQgPFdlYktpdC9XZWJQbHVnaW5EYXRhYmFzZS5oPgogI2ltcG9y dCA8V2ViS2l0U3lzdGVtSW50ZXJmYWNlLmg+CiAjaW1wb3J0IDx3dGYvQXNzZXJ0aW9ucy5oPgog CkBAIC02NSwxNiArNjQsNiBAQCArICh2b2lkKWNyZWF0ZVNoYXJlZEZhY3RvcnkKICAgICBBU1NF UlQoW1tzZWxmIHNoYXJlZEZhY3RvcnldIGlzS2luZE9mQ2xhc3M6c2VsZl0pOwogfQogCi0tIChO U0FycmF5ICopcGx1Z2luc0luZm8KLXsKLSAgICByZXR1cm4gW1tXZWJQbHVnaW5EYXRhYmFzZSBz aGFyZWREYXRhYmFzZV0gcGx1Z2luc107Ci19Ci0KLS0gKHZvaWQpcmVmcmVzaFBsdWdpbnMKLXsK LSAgICBbW1dlYlBsdWdpbkRhdGFiYXNlIHNoYXJlZERhdGFiYXNlXSByZWZyZXNoXTsKLX0KLQog LSAoTlNTdHJpbmcgKilpbnB1dEVsZW1lbnRBbHRUZXh0CiB7CiAgICAgcmV0dXJuIFVJX1NUUklO R19LRVkoIlN1Ym1pdCIsICJTdWJtaXQgKGlucHV0IGVsZW1lbnQpIiwgImFsdCB0ZXh0IGZvciA8 aW5wdXQ+IGVsZW1lbnRzIHdpdGggbm8gYWx0LCB0aXRsZSwgb3IgdmFsdWUiKTsK