Unreviewed, build fix for unused argument warning after r104954.
https://bugs.webkit.org/show_bug.cgi?id=75906

Also fixed up somebody's bad merge in Source/WebCore/ChangeLog.

* html/canvas/WebGLObject.cpp:
(WebCore::WebGLObject::WebGLObject):

git-svn-id: svn://svn.chromium.org/blink/trunk@104959 bbb929c8-8fbe-4397-9dbb-9b2b20218538
WebGLObject::WebGLObject(WebGLRenderingContext* context)
WebGLObject::WebGLObject(WebGLRenderingContext*)
     : m_object(0)
     , m_attachmentCount(0)
     , m_deleted(false)
{
}

WebGLObject::WebGLObject(WebGLRenderingContext* context)
     : m_object(0)
     , m_attachmentCount(0)
     , m_deleted(false)
{
}
