Moved remaining cairo code from Renderable to Drawing