Bug 105847 – [Texmap] Rename TextureMapperShaderManager.* TextureMapperShaderProgram.*

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

[Noam Rosenthal]

[Texmap] Rename TextureMapperShaderManager.* TextureMapperShaderProgram.*

[Noam Rosenthal]

Created attachment 180914 [details]
Patch

[WebKit Review Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1
Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:125:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Total errors found: 1 in 7 files


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

[Noam Rosenthal]

Created attachment 180917 [details]
Patch

[Noam Rosenthal]

Created attachment 183545 [details]
Patch

[WebKit Review Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1
Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:125:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Total errors found: 1 in 7 files


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

[Noam Rosenthal]

(In reply to comment #5)
> Attachment 183545 [details] did not pass style-queue:
> 
> Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1
> Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp:125:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
> Total errors found: 1 in 7 files
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

False positive. Already filed.

[Kenneth Rohde Christiansen]

Comment on attachment 183545 [details]
Patch

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

r+ given you add a comment in the changelog:

> Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:96
> -        TextureMapperShaderManager textureMapperShaderManager;
> +        PassRefPtr<TextureMapperShaderProgram> getShaderProgram(TextureMapperShaderProgram::Options options)
> +        {
> +            HashMap<TextureMapperShaderProgram::Options, RefPtr<TextureMapperShaderProgram> >::iterator it = m_programs.find(options);
> +            if (it != m_programs.end())
> +                return it->value;
> +
> +            RefPtr<TextureMapperShaderProgram> program = TextureMapperShaderProgram::create(m_context, options);
> +            m_programs.add(options, program);
> +            return program;

this looks like more than refactorings, should be described shortly in the changelog

[Noam Rosenthal]

Created attachment 184164 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 184164 [details]
Patch for landing

Clearing flags on attachment: 184164

Committed r140518: <http://trac.webkit.org/changeset/140518>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[WebKit Review Bot]

Re-opened since this is blocked by bug 107691