116018 2013-05-13 02:27:20 -0700 [WK2] PluginInformation.cpp fails to build because of missing ENABLE(NETSCAPE_PLUGIN_API) guard 2013-05-16 01:46:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 115891 1 zarvai abecsi abecsi andersca jturcotte sam zeno oldest_to_newest 888156 0 zarvai 2013-05-13 02:27:20 -0700 New file Shared/Plugins/Netscape/PluginInformation.cpp landed in http://trac.webkit.org/changeset/149904 includes WebKit2/UIProcess/Plugins/PluginInfoStore.h and refers to it in line 103 with: map.set(pluginInformationDefaultLoadPolicyKey(), WebUInt64::create(toWKPluginLoadPolicy(PluginInfoStore::policyForPlugin(plugin)))); If NETSCAPE_PLUGIN_API is not enabled, then the build will fail, because ENABLE(NETSCAPE_PLUGIN_API) guarded in PluginInfoStore.h but not in PluginInformation.cpp. It seems that happened on Qt Mountain Lion bot: /Users/admin/work/WebKit-BuildSlave/qt-mountainlion-release/build/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp:103:93: error: use of undeclared identifier 'PluginInfoStore' map.set(pluginInformationDefaultLoadPolicyKey(), WebUInt64::create(toWKPluginLoadPolicy(PluginInfoStore::policyForPlugin(plugin)))); 889251 1 201821 abecsi 2013-05-15 05:43:12 -0700 Created attachment 201821 Patch 889280 2 201821 jturcotte 2013-05-15 07:32:07 -0700 Comment on attachment 201821 Patch Ideally it feels like the whole file and its header should also be guarded, but WebPageProxy::didFailToInitializePlugin is one use that would difficult to wrap. So I guess it's fine to guard it that way, LGTM. 889738 3 abecsi 2013-05-16 01:45:50 -0700 Committed r150178: <http://trac.webkit.org/changeset/150178> 201821 2013-05-15 05:43:12 -0700 2013-05-16 01:46:17 -0700 Patch bug-116018-20130515144210.patch text/plain 1763 abecsi U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjc3ODg4MjNjMDUzODA4 YTFhMjZhNGQyNzIxMDMxMmNlNTAzMTQ1ZC4uYzI2NmQ4MjkyZjUxMmQxNjlkODYwNWY1YjM0ODNi ZWU0NTZiODhmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA1LTE1ICBBbmRy YXMgQmVjc2kgIDxhbmRyYXMuYmVjc2lAZGlnaWEuY29tPgorCisgICAgICAgIFtXSzJdIFBsdWdp bkluZm9ybWF0aW9uLmNwcCBmYWlscyB0byBidWlsZCBiZWNhdXNlIG9mIG1pc3NpbmcgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpIGd1YXJkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYwMTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05ldHNjYXBlL1BsdWdpbkluZm9y bWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z2V0UGx1Z2luTW9kdWxlSW5mb3JtYXRpb24p OgorCiAyMDEzLTA1LTE0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KIAogICAgICAgICBSZW1vdmUgV1RGX1VTRV9QTEFURk9STV9TVFJBVEVHSUVTCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9QbHVnaW5JbmZvcm1h dGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9QbHVnaW5J bmZvcm1hdGlvbi5jcHAKaW5kZXggZGM2MDJkM2IyNWMxYzQ1ZmY0MGNhY2Q1NDRlZjY4ZmQ2Y2Jh NDk1ZC4uMWE2OTUwOGFmOThiYWMxZDYyNDFmZDRiNmJmY2QwMmIyNWM2MTA5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvUGx1Z2luSW5mb3JtYXRp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL1BsdWdp bkluZm9ybWF0aW9uLmNwcApAQCAtOTgsMTEgKzk4LDEzIEBAIFN0cmluZyBwbHVnaW5JbmZvcm1h dGlvblBsdWdpblVSTEtleSgpCiAKIHZvaWQgZ2V0UGx1Z2luTW9kdWxlSW5mb3JtYXRpb24oY29u c3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luLCBJbW11dGFibGVEaWN0aW9uYXJ5OjpNYXBUeXBl JiBtYXApCiB7CisjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgbWFwLnNldChw bHVnaW5JbmZvcm1hdGlvblBhdGhLZXkoKSwgV2ViU3RyaW5nOjpjcmVhdGUocGx1Z2luLnBhdGgp KTsKICAgICBtYXAuc2V0KHBsdWdpbkluZm9ybWF0aW9uRGlzcGxheU5hbWVLZXkoKSwgV2ViU3Ry aW5nOjpjcmVhdGUocGx1Z2luLmluZm8ubmFtZSkpOwogICAgIG1hcC5zZXQocGx1Z2luSW5mb3Jt YXRpb25EZWZhdWx0TG9hZFBvbGljeUtleSgpLCBXZWJVSW50NjQ6OmNyZWF0ZSh0b1dLUGx1Z2lu TG9hZFBvbGljeShQbHVnaW5JbmZvU3RvcmU6OnBvbGljeUZvclBsdWdpbihwbHVnaW4pKSkpOwog CiAgICAgZ2V0UGxhdGZvcm1QbHVnaW5Nb2R1bGVJbmZvcm1hdGlvbihwbHVnaW4sIG1hcCk7Cisj ZW5kaWYKIH0KIAogUGFzc1JlZlB0cjxJbW11dGFibGVEaWN0aW9uYXJ5PiBjcmVhdGVQbHVnaW5J bmZvcm1hdGlvbkRpY3Rpb25hcnkoY29uc3QgUGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luKQo=