Bug 155927 – [TexMap] Trim redundant guards

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

[Emanuele Aina]

[TexMap] Trim redundant guards

[Emanuele Aina]

Created attachment 274993 [details]
Patch

[WebKit Commit Bot]

Attachment 274993 [details] did not pass style-queue:


ERROR: Source/WebCore/ChangeLog:1:  ChangeLog entry has no bug number  [changelog/bugnumber] [5]
Total errors found: 1 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Gyuyoung Kim]

Comment on attachment 274993 [details]
Patch

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

r- because of missing bug url in ChangeLog.

> Source/WebCore/ChangeLog:4
> +        Need the bug URL (OOPS!).

Missing bug number.

> Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:-114
> -#elif USE(TEXTURE_MAPPER) && !USE(COORDINATED_GRAPHICS_THREADED)

It seems to me that TEXTIRE_MAPPER is always on, but COORDINATED_GRAPHICS_THREADED is able to be enabled only when ENABLE_OPENGL is on. So I wonder if this !USE(COORDINATED_GRAPHICS_THREADED) guard can be removed.

[Emanuele Aina]

Comment on attachment 274993 [details]
Patch

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

>> Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:-114
>> -#elif USE(TEXTURE_MAPPER) && !USE(COORDINATED_GRAPHICS_THREADED)
> 
> It seems to me that TEXTIRE_MAPPER is always on, but COORDINATED_GRAPHICS_THREADED is able to be enabled only when ENABLE_OPENGL is on. So I wonder if this !USE(COORDINATED_GRAPHICS_THREADED) guard can be removed.

Indeed it seem there's no relation in the buildsystem between those two variable.

That said, CoordinatedGraphicsState.h uses TextureMapperPlatformLayerProxy if COORDINATED_GRAPHICS_THREADED is enabled without checking for TEXTURE_MAPPER, which seems to support my assumption that COORDINATED_GRAPHICS_THREADED implies TEXTURE_MAPPER.

Now that I'm looking at CoordinatedGraphicsScene.cpp it seems that COORDINATED_GRAPHICS even unconditionally depends on TEXTURE_MAPPER_GL as the TextureMapperGL type is used unguarded...

[Emanuele Aina]

Created attachment 275422 [details]
Patch

[Emanuele Aina]

I've reuploaded after adding the missing bug reference in the ChangeLog. Sorry, I was assuming that using webkit-patch to open the bug and uploading the patch in a single step would have taken care of that (or I may just have missed the right option).

[Zan Dobersek]

Comment on attachment 275422 [details]
Patch

Looks good.

[WebKit Commit Bot]

Comment on attachment 275422 [details]
Patch

Rejecting attachment 275422 [details] from commit-queue.

[e-mail] does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/contributors.json.

- If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags.

- If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/contributors.json by adding yourself to the file (no review needed).  The commit-queue restarts itself every 2 hours.  After restart the commit-queue will correctly respect your committer rights.

[WebKit Commit Bot]

Comment on attachment 275422 [details]
Patch

Clearing flags on attachment: 275422

Committed r199001: <http://trac.webkit.org/changeset/199001>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.