lgtm https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp File src/gpu/gl/GrGLProgram.cpp (right): https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp#n... src/gpu/gl/GrGLProgram.cpp:206: desc->fEdgeAttributeIndex = drawState.getAttribIndex(GrDrawState::kEdge_AttribIndex); minor nit: I'd no longer align the = ops now that they're in different blocks. I'll let Jim comment on the correctness of this change as I'm not sure. https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h File src/gpu/gl/GrGpuGL.h (left): https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h#oldcode382 src/gpu/gl/GrGpuGL.h:382: GrGLuint vertexBufferID() const { return fVertexBufferID; } I'd say let's axe this getter, but I'm replacing this code as we type anyway.
https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h File include/core/SkString.h (right): https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h#newc... include/core/SkString.h:53: char *ret = (char *) sk_malloc_throw(strlen(string)+1); Sheeite! How did this ever work? Do we call this code?
https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h File include/core/SkString.h (right): https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h#newc... include/core/SkString.h:53: char *ret = (char *) sk_malloc_throw(strlen(string)+1); We only call it in the new RT flag system so we would not have hit it before. https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp File src/gpu/gl/GrGLProgram.cpp (right): https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp#n... src/gpu/gl/GrGLProgram.cpp:206: desc->fEdgeAttributeIndex = drawState.getAttribIndex(GrDrawState::kEdge_AttribIndex); On 2013/03/04 19:32:15, bsalomon wrote: > minor nit: I'd no longer align the = ops now that they're in different blocks. > > I'll let Jim comment on the correctness of this change as I'm not sure. Done. https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h File src/gpu/gl/GrGpuGL.h (left): https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h#oldcode382 src/gpu/gl/GrGpuGL.h:382: GrGLuint vertexBufferID() const { return fVertexBufferID; } On 2013/03/04 19:32:15, bsalomon wrote: > I'd say let's axe this getter, but I'm replacing this code as we type anyway. Done.
LGTM On 2013/03/04 19:37:48, robertphillips wrote: > https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h > File include/core/SkString.h (right): > > https://codereview.appspot.com/7448051/diff/2001/include/core/SkString.h#newc... > include/core/SkString.h:53: char *ret = (char *) > sk_malloc_throw(strlen(string)+1); > We only call it in the new RT flag system so we would not have hit it before. > > https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp > File src/gpu/gl/GrGLProgram.cpp (right): > > https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGLProgram.cpp#n... > src/gpu/gl/GrGLProgram.cpp:206: desc->fEdgeAttributeIndex = > drawState.getAttribIndex(GrDrawState::kEdge_AttribIndex); > On 2013/03/04 19:32:15, bsalomon wrote: > > minor nit: I'd no longer align the = ops now that they're in different blocks. > > > > I'll let Jim comment on the correctness of this change as I'm not sure. > > Done. > > https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h > File src/gpu/gl/GrGpuGL.h (left): > > https://codereview.appspot.com/7448051/diff/2001/src/gpu/gl/GrGpuGL.h#oldcode382 > src/gpu/gl/GrGpuGL.h:382: GrGLuint vertexBufferID() const { return > fVertexBufferID; } > On 2013/03/04 19:32:15, bsalomon wrote: > > I'd say let's axe this getter, but I'm replacing this code as we type anyway. > > Done.
committed as r7966