Summary: | [Qt][WK2] Make TextureMapperShaderManager::getShaderProgram() not be a template. | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Zeno Albisser <zeno> | ||||||||
Component: | WebKit Qt | Assignee: | Zeno Albisser <zeno> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | noam, yael | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Unspecified | ||||||||||
OS: | Unspecified | ||||||||||
Attachments: |
|
Description
Zeno Albisser
2012-03-23 06:25:46 PDT
Created attachment 133471 [details]
backtrace of the assert.
For the sake of completeness I am adding a backtrace to the bugreport.
Created attachment 133474 [details]
patch for review.
Comment on attachment 133474 [details] patch for review. View in context: https://bugs.webkit.org/attachment.cgi?id=133474&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h:123 > + if (shaderType == Simple) { > + RefPtr<TextureMapperShaderProgram> t = TextureMapperShaderProgramSimple::create(); > + m_textureMapperShaderProgramMap.add(shaderType, t); > + return t; > + } > + > + if (shaderType == OpacityAndMask) { > + RefPtr<TextureMapperShaderProgram> t = TextureMapperShaderProgramOpacityAndMask::create(); > + m_textureMapperShaderProgramMap.add(shaderType, t); > + return t; > + } This should be a switch, with only the different lines in it. The add and return can go outside the switch. > Source/WebCore/platform/graphics/texmap/TextureMapperShaderManager.h:129 > + typedef HashMap<int, RefPtr<TextureMapperShaderProgram> > TextureMapperShaderProgramMap; Why not keep the key as ShaderType? Created attachment 133497 [details]
patch for review. - fixed issues as requested.
Comment on attachment 133497 [details] patch for review. - fixed issues as requested. Clearing flags on attachment: 133497 Committed r111986: <http://trac.webkit.org/changeset/111986> All reviewed patches have been landed. Closing bug. |