| Summary: | [Qt][WK2] Another attempt to fix build after recent WebKit2 changes | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Rafael Brandao <rafael.lobo> | ||||||
| Component: | New Bugs | Assignee: | Rafael Brandao <rafael.lobo> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | abecsi, andersca, cmarcelo, hausmann, menard, webkit.review.bot | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Rafael Brandao
2013-01-31 16:32:58 PST
Created attachment 185892 [details]
Patch
I believe one of the errors came after patch from bug #108407 (In reply to comment #2) > I believe one of the errors came after patch from bug #108407 The problem is getPluginPath was moved to WebPageProxy but it is slightly different. It now uses some PluginModuleInfo attributes that are protected by PLATFORM(MAC) on trunk. What I did was to allow other ports to use it too, but protect only pluginArchitecture (which seems to be included by mach/machine.h). Comment on attachment 185892 [details]
Patch
There are now other build failures, I will try to solve them all at once.
(In reply to comment #3) > (In reply to comment #2) > > I believe one of the errors came after patch from bug #108407 > > The problem is getPluginPath was moved to WebPageProxy but it is slightly different. It now uses some PluginModuleInfo attributes that are protected by PLATFORM(MAC) on trunk. What I did was to allow other ports to use it too, but protect only pluginArchitecture (which seems to be included by mach/machine.h). Ah, thanks for the explanation! A better fix is to just put these lines in WebPageProxy::getPluginPath inside an #if PLATFORM(MAC) block. pluginLoadPolicy = m_uiClient.shouldInstantiatePlugin(this, plugin.bundleIdentifier, plugin.info.name) ? PluginModuleLoadNormally : PluginModuleBlocked; if (pluginLoadPolicy != PluginModuleLoadNormally) return; Created attachment 185907 [details]
Patch
Anders, please look when you have time. I've put into the ChangeLog the references to the bugs that caused each error and tried to follow those changes to get similar solutions. Comment on attachment 185907 [details]
Patch
Also, I need to leave now. Please cq+ if you feel like this is correct.
Comment on attachment 185907 [details] Patch Clearing flags on attachment: 185907 Committed r141528: <http://trac.webkit.org/changeset/141528> All reviewed patches have been landed. Closing bug. Thanks Rafael |