Bug 208899 – [GPU Process] Work towards compiling out on non-Cocoa ports

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Don Olmstead]

Currently only Apple can compile.

[Don Olmstead]

Created attachment 393192 [details]
WIP Patch

[Don Olmstead]

Created attachment 393193 [details]
WIP Patch

[Darin Adler]

Comment on attachment 393193 [details]
WIP Patch

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

> Source/WebKit/WebProcess/GPU/graphics/ImageBufferShareableBitmapBackend.cpp:39
> +#include <WebCore/GraphicsContext.h>

This should just be added to unconditional includes above, rather than putting it here in the #else.

[Don Olmstead]

Comment on attachment 393193 [details]
WIP Patch

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

>> Source/WebKit/WebProcess/GPU/graphics/ImageBufferShareableBitmapBackend.cpp:39
>> +#include <WebCore/GraphicsContext.h>
> 
> This should just be added to unconditional includes above, rather than putting it here in the #else.

The GraphicsContextCG.h stuff was needed below. I actually had just WebCore/GraphicsContext.h in the previous patch but Apple builds failed.

[Darin Adler]

Comment on attachment 393193 [details]
WIP Patch

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

> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:206
> +#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))

It would be nice to have a simpler #if here, but maybe this exactly matches how the player code is if-def’d.

[Don Olmstead]

Created attachment 393198 [details]
Patch

[Don Olmstead]

Comment on attachment 393193 [details]
WIP Patch

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

>> Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp:206
>> +#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
> 
> It would be nice to have a simpler #if here, but maybe this exactly matches how the player code is if-def’d.

Yea it matches whats in that file.

[Don Olmstead]

Created attachment 393200 [details]
Patch

Make style checker happy.

Should be good to go.

[Konstantin Tokarev]

Aren't you clashing with work done in https://bugs.webkit.org/show_bug.cgi?id=208814 ?

[Don Olmstead]

(In reply to Konstantin Tokarev from comment #9)
> Aren't you clashing with work done in
> https://bugs.webkit.org/show_bug.cgi?id=208814 ?

Sure but this compiles and is a bit simpler.

[Darin Adler]

Comment on attachment 393200 [details]
Patch

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

> Source/WebKit/WebProcess/GPU/graphics/ImageBufferShareableBitmapBackend.cpp:39
> +#include <WebCore/GraphicsContext.h>

I still think this include should be unconditional in the paragraph above rather than having it inside an #else.

[Don Olmstead]

Created attachment 393204 [details]
Patch

Patch for landing

[WebKit Commit Bot]

Comment on attachment 393204 [details]
Patch

Clearing flags on attachment: 393204

Committed r258253: <https://trac.webkit.org/changeset/258253>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/60308681>