Fixed merge error with CanvasD2D.cpp