61113 2011-05-19 00:04:59 -0700 Fix build with ENABLE_PLUGIN_PROCESS=1 for non-mac platforms after r86578 2011-05-19 09:51:26 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned andersca oldest_to_newest 406268 0 cgarcia 2011-05-19 00:04:59 -0700 PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization is only defined for mac. 406270 1 94048 cgarcia 2011-05-19 00:06:21 -0700 Created attachment 94048 Patch 406338 2 94048 mrobinson 2011-05-19 04:54:39 -0700 Comment on attachment 94048 Patch Wouldn't it be better to define PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization instead of introducing #ifdefs? 406342 3 cgarcia 2011-05-19 05:06:55 -0700 (In reply to comment #2) > (From update of attachment 94048 [details]) > Wouldn't it be better to define PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization instead of introducing #ifdefs? I don't know what that quirk is, that's why I filed the bug instead of just fixing the build. 406343 4 cgarcia 2011-05-19 05:16:14 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 94048 [details] [details]) > > Wouldn't it be better to define PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization instead of introducing #ifdefs? > > I don't know what that quirk is, that's why I filed the bug instead of just fixing the build. According to the changelog, the quirk is mac specific * Shared/Plugins/PluginQuirks.h: Add Mac specific CanShortCircuitSomeNPRuntimeCallsDuringInitialization quirk. 406454 5 andersca 2011-05-19 09:42:25 -0700 (In reply to comment #2) > (From update of attachment 94048 [details]) > Wouldn't it be better to define PluginQuirks::CanShortCircuitSomeNPRuntimeCallsDuringInitialization instead of introducing #ifdefs? I'd really like platform-specific quirks to be #ifdeffed out so we know which platforms they apply to. 406461 6 cgarcia 2011-05-19 09:51:26 -0700 Committed r86848: <http://trac.webkit.org/changeset/86848> 94048 2011-05-19 00:06:21 -0700 2011-05-19 09:42:38 -0700 Patch wk2-build-fix.diff text/plain 2322 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAyMGU2MWU2Li4zMjI1ZjMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDUtMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBi dWlsZCB3aXRoIEVOQUJMRV9QTFVHSU5fUFJPQ0VTUz0xIGZvciBub24tbWFjIHBsYXRmb3JtcyBh ZnRlciByODY1NzgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTYxMTEzCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9y dENpcmN1aXRJbnZva2UpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6 OnRyeVRvU2hvcnRDaXJjdWl0RXZhbHVhdGUpOgorCiAyMDExLTA1LTE4ICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBcyBvcmlnaW5hbGx5IHJldmlld2VkIGJ5 IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcAppbmRleCA1NDExZmI3Li43NThjZjNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVy UHJveHkuY3BwCkBAIC0yOTAsOSArMjkwLDEzIEBAIGJvb2wgUGx1Z2luQ29udHJvbGxlclByb3h5 OjpldmFsdWF0ZShOUE9iamVjdCogbnBPYmplY3QsIGNvbnN0IFN0cmluZyYgc2NyaXB0U3RyCiBi b29sIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6dHJ5VG9TaG9ydENpcmN1aXRJbnZva2UoTlBPYmpl Y3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBh cmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIGJvb2wmIHJldHVyblZhbHVlLCBOUFZh cmlhbnQmIHJlc3VsdCkKIHsKICAgICAvLyBPbmx5IHRyeSB0byBzaG9ydCBjaXJjdWl0IGV2YWx1 YXRlIGZvciBwbHVnLWlucyB0aGF0IGhhdmUgdGhlIHF1aXJrIHNwZWNpZmllZC4KKyNpZiBQTFVH SU5fQVJDSElURUNUVVJFKE1BQykKICAgICBpZiAoIVBsdWdpblByb2Nlc3M6OnNoYXJlZCgpLm5l dHNjYXBlUGx1Z2luTW9kdWxlKCktPnBsdWdpblF1aXJrcygpLmNvbnRhaW5zKFBsdWdpblF1aXJr czo6Q2FuU2hvcnRDaXJjdWl0U29tZU5QUnVudGltZUNhbGxzRHVyaW5nSW5pdGlhbGl6YXRpb24p KQogICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgCisjZWxzZQorICAgIHJldHVybiBmYWxzZTsK KyNlbmRpZgorCiAgICAgLy8gQW5kIG9ubHkgd2hlbiB3ZSdyZSBpbiBpbml0aWFsaXplLgogICAg IGlmICghaW5Jbml0aWFsaXplKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTU4OSw4ICs1 OTMsMTIgQEAgdm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnByaXZhdGVCcm93c2luZ1N0YXRl Q2hhbmdlZChib29sIGlzUHJpdmF0ZUJyb3dzaW5nRW4KIGJvb2wgUGx1Z2luQ29udHJvbGxlclBy b3h5Ojp0cnlUb1Nob3J0Q2lyY3VpdEV2YWx1YXRlKE5QT2JqZWN0KiBucE9iamVjdCwgY29uc3Qg U3RyaW5nJiBzY3JpcHRTdHJpbmcsIE5QVmFyaWFudCogcmVzdWx0KQogewogICAgIC8vIE9ubHkg dHJ5IHRvIHNob3J0IGNpcmN1aXQgZXZhbHVhdGUgZm9yIHBsdWctaW5zIHRoYXQgaGF2ZSB0aGUg cXVpcmsgc3BlY2lmaWVkLgorI2lmIFBMVUdJTl9BUkNISVRFQ1RVUkUoTUFDKQogICAgIGlmICgh UGx1Z2luUHJvY2Vzczo6c2hhcmVkKCkubmV0c2NhcGVQbHVnaW5Nb2R1bGUoKS0+cGx1Z2luUXVp cmtzKCkuY29udGFpbnMoUGx1Z2luUXVpcmtzOjpDYW5TaG9ydENpcmN1aXRTb21lTlBSdW50aW1l Q2FsbHNEdXJpbmdJbml0aWFsaXphdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbHNl CisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCiAKICAgICAvLyBBbmQgb25seSB3aGVuIHdlJ3Jl IGluIGluaXRpYWxpemUuCiAgICAgaWYgKCFpbkluaXRpYWxpemUoKSkK