Bug 108548 – [Qt][WK2] Another attempt to fix build after recent WebKit2 changes

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Rafael Brandao]

[Qt][WK2] Another attempt to fix build after recent WebKit2 changes

[Rafael Brandao]

Created attachment 185892 [details]
Patch

[Rafael Brandao]

I believe one of the errors came after patch from bug #108407

[Rafael Brandao]

(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).

[Rafael Brandao]

Comment on attachment 185892 [details]
Patch

There are now other build failures, I will try to solve them all at once.

[Anders Carlsson]

(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;

[Rafael Brandao]

Created attachment 185907 [details]
Patch

[Rafael Brandao]

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.

[Rafael Brandao]

Comment on attachment 185907 [details]
Patch

Also, I need to leave now. Please cq+ if you feel like this is correct.

[WebKit Review Bot]

Comment on attachment 185907 [details]
Patch

Clearing flags on attachment: 185907

Committed r141528: <http://trac.webkit.org/changeset/141528>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Simon Hausmann]

Thanks Rafael