b=630184; SetPixelFormat crash fix attempt; r=jrmuizel, a=crashfix
authorVladimir Vukicevic <vladimir@pobox.com>
Tue, 01 Feb 2011 15:08:55 -0800
changeset 61757 5c92181d4b31c1b67a98af74711c7a89fabc7f87
parent 61756 3568f13924d2e7ba1cb06465e0cfbda05dc823bb
child 61758 84c8b33619e0f950e4f024f1fd3824891f0396e8
push id18472
push uservladimir@mozilla.com
push dateTue, 01 Feb 2011 23:09:10 +0000
treeherdermozilla-central@84c8b33619e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, crashfix
bugs630184
milestone2.0b11pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=630184; SetPixelFormat crash fix attempt; r=jrmuizel, a=crashfix
gfx/thebes/GLContextProviderWGL.cpp
--- a/gfx/thebes/GLContextProviderWGL.cpp
+++ b/gfx/thebes/GLContextProviderWGL.cpp
@@ -98,17 +98,19 @@ CreateDummyWindow(HDC *aWindowDC = nsnul
         pfd.cBlueBits = 8;
         pfd.cAlphaBits = 8;
         pfd.cDepthBits = 0;
         pfd.iLayerType = PFD_MAIN_PLANE;
 
         gSharedWindowPixelFormat = ChoosePixelFormat(dc, &pfd);
     }
 
-    if (!SetPixelFormat(dc, gSharedWindowPixelFormat, NULL)) {
+    if (!gSharedWindowPixelFormat ||
+        !SetPixelFormat(dc, gSharedWindowPixelFormat, NULL))
+    {
         NS_WARNING("SetPixelFormat failed!");
         DestroyWindow(win);
         return NULL;
     }
 
     if (aWindowDC) {
         *aWindowDC = dc;
     }