Merge 88429 - 2011-06-08 Justin Novosad <junov@chromium.org>

Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1156 matching lines @@
 };
 
 void GraphicsContextLostCallbackAdapter::onContextLost()
 {
     if (m_contextLostCallback)
         m_contextLostCallback->onContextLost();
 }
 
 PassOwnPtr<GraphicsContextLostCallbackAdapter> GraphicsContextLostCallbackAdapter::create(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
 {
-    return adoptPtr(new GraphicsContextLostCallbackAdapter(cb));
+    return adoptPtr(cb.get() ? new GraphicsContextLostCallbackAdapter(cb) : 0);
 }
 
 void GraphicsContext3DInternal::setContextLostCallback(PassOwnPtr<GraphicsContext3D::ContextLostCallback> cb)
 {
     m_contextLostCallbackAdapter = GraphicsContextLostCallbackAdapter::create(cb);
     m_impl->setContextLostCallback(m_contextLostCallbackAdapter.get());
 }
 
 bool GraphicsContext3D::isGLES2Compliant() const
 {
@@ skipping 23 matching lines @@
 
 void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
 {
     m_swapBuffersCompleteCallbackAdapter = SwapBuffersCompleteCallbackAdapter::create(cb);
     m_impl->setSwapBuffersCompleteCallbackCHROMIUM(m_swapBuffersCompleteCallbackAdapter.get());
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEBGL)