Bug 116127 – Add a preference that can disable the fake SYSV SHM shim

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

[Simon Cooper]

Add a preference that can disable the fake SYSV SHM shim

[Simon Cooper]

Created attachment 201764 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 201764 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=201764&action=review

Looks good, please fix style nits and upload a new patch.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:161
> +    static int cachedPrefValue = 0;

Please change cachedPrefValue to cachedPreferenceValue.

This is not one of the idioms we use in WebKit. I'm OK with this code as is, but for reference, we'd do one of these:

1.
static bool preferenceValue = getShimDisabledPreference();
return preferenceValue;

2. dispatch_once(...)

#2 is the preferred option these days.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:171
> +        if (keyExistsAndHasValidFormat && prefValue) {
> +            cachedPrefValue = 1;
> +        } else {
> +            cachedPrefValue = -1;
> +        }

Please remove braces around single line blocks.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:181
> +    if (shim_disabled()) {
> +        return shmdt(sharedAddress);
> +    }

Please remove braces around single line blocks.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:202
> +    if (shim_disabled()) {
> +        return shmat(sharedMemoryIdentifier, requestedSharedAddress, shmflg);
> +    }

Ditto.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:231
> +    if (shim_disabled()) {
> +        return shmget(key, requestedSizeOfSharedMemory, sharedMemoryFlags);
> +    }

Ditto.

> Source/WebKit2/PluginProcess/mac/PluginProcessShim.mm:267
> +    if (shim_disabled()) {
> +        return shmctl(sharedMemoryIdentifier, cmd, outputDescriptor);
> +    }

Ditto.

[Simon Cooper]

Created attachment 201768 [details]
Patch

[Alexey Proskuryakov]

Comment on attachment 201768 [details]
Patch

I'm assuming that you wanted commit queue flag on this patch, too.

[WebKit Commit Bot]

Comment on attachment 201768 [details]
Patch

Clearing flags on attachment: 201768

Committed r150094: <http://trac.webkit.org/changeset/150094>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.