Title: [92145] trunk/Source/WebKit/chromium
Revision
92145
Author
nd...@chromium.org
Date
2011-08-01 14:46:52 -0700 (Mon, 01 Aug 2011)

Log Message

[chromium] Add null check to setSwapbuffersCompletCallbackChromium
https://bugs.webkit.org/show_bug.cgi?id=65485

Reviewed by James Robinson.

* src/GraphicsContext3DChromium.cpp:
(WebCore::SwapBuffersCompleteCallbackAdapter::create):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (92144 => 92145)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-08-01 21:41:10 UTC (rev 92144)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-08-01 21:46:52 UTC (rev 92145)
@@ -1,3 +1,13 @@
+2011-08-01  Nat Duca  <nd...@chromium.org>
+
+        [chromium] Add null check to setSwapbuffersCompletCallbackChromium
+        https://bugs.webkit.org/show_bug.cgi?id=65485
+
+        Reviewed by James Robinson.
+
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::SwapBuffersCompleteCallbackAdapter::create):
+
 2011-08-01  Yuta Kitamura  <yu...@chromium.org>
 
         WebSocket: Rename SocketStreamHandleClient member functions

Modified: trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp (92144 => 92145)


--- trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp	2011-08-01 21:41:10 UTC (rev 92144)
+++ trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp	2011-08-01 21:46:52 UTC (rev 92145)
@@ -1249,7 +1249,7 @@
 
 PassOwnPtr<SwapBuffersCompleteCallbackAdapter> SwapBuffersCompleteCallbackAdapter::create(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
 {
-    return adoptPtr(new SwapBuffersCompleteCallbackAdapter(cb));
+    return adoptPtr(cb.get() ? new SwapBuffersCompleteCallbackAdapter(cb) : 0);
 }
 
 void GraphicsContext3DInternal::setSwapBuffersCompleteCallbackCHROMIUM(PassOwnPtr<Extensions3DChromium::SwapBuffersCompleteCallbackCHROMIUM> cb)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to