mozilla-central: changeset 61757:5c92181d4b31c1b67a98af74711c7a89fabc7f87

author	Vladimir Vukicevic <vladimir@pobox.com>
	Tue, 01 Feb 2011 15:08:55 -0800
changeset 61757	5c92181d4b31c1b67a98af74711c7a89fabc7f87
parent 61756	3568f13924d2e7ba1cb06465e0cfbda05dc823bb
child 61758	84c8b33619e0f950e4f024f1fd3824891f0396e8
push id	18472
push user	vladimir@mozilla.com
push date	Tue, 01 Feb 2011 23:09:10 +0000
treeherder	mozilla-central@84c8b33619e0 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jrmuizel, crashfix
bugs	630184
milestone	2.0b11pre
first release with	nightly linux32 1c2d53a2dcfb / 4.0b11pre / 20110202030356 / files nightly linux64 1c2d53a2dcfb / 4.0b11pre / 20110202030356 / files nightly mac 1c2d53a2dcfb / 4.0b11pre / 20110202030356 / files nightly win32 1c2d53a2dcfb / 4.0b11pre / 20110202030356 / files nightly win64 298c555d0c6e / 4.0b11pre / 20110201172615 / files
last release without	nightly linux32 8b5cb26bbb10 / 4.0b11pre / 20110201030339 / files nightly linux64 8b5cb26bbb10 / 4.0b11pre / 20110201030339 / files nightly mac 8b5cb26bbb10 / 4.0b11pre / 20110201030339 / files nightly win32 8b5cb26bbb10 / 4.0b11pre / 20110201030339 / files nightly win64 1c6e36066e73 / 4.0b11pre / 20110201135147 / files

--- 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;
     }