Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

Issue 7046071: Merge 88429 - 2011-06-08 Justin Novosad <junov@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp
===================================================================
--- Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (revision 88429)
+++ Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (working copy)
@@ -1174,7 +1174,7 @@
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)
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698