- renamed CCanvas -> Canvas.cpp - replaced shared_ptr<Canvas> with Canvas& - removed getSurface method