mozilla-beta: changeset 50640:0074c4f2d5613fce33517662d8c1a95b1595e966

author	Daniel Holbert <dholbert@cs.stanford.edu>
	Sun, 15 Aug 2010 15:49:21 -0700
changeset 50640	0074c4f2d5613fce33517662d8c1a95b1595e966
parent 50639	5e9c05dbe8d6a2165e0112cba51068abbc1a3b96
child 50641	420973cfb89d05d9f2529c2829890ba34c5ff1e0
push id	1
push user	root
push date	Tue, 26 Apr 2011 22:38:44 +0000
treeherder	mozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	roc, blocking
bugs	587494
milestone	2.0b4pre
first release with	nightly linux32 68b886f9b3c3 / 4.0b4pre / 20100816025806 / files nightly linux64 68b886f9b3c3 / 4.0b4pre / 20100816030743 / files nightly mac 68b886f9b3c3 / 4.0b4pre / 20100816031119 / files nightly win32 68b886f9b3c3 / 4.0b4pre / 20100816040720 / files nightly win64 33be08836cb1 / 4.0b5pre / 20100821010143 / files
last release without	nightly linux32 75caf7ab0376 / 4.0b4pre / 20100815031137 / files nightly linux64 75caf7ab0376 / 4.0b4pre / 20100815030741 / files nightly mac 75caf7ab0376 / 4.0b4pre / 20100815031139 / files nightly win32 75caf7ab0376 / 4.0b4pre / 20100815040532 / files nightly win64 452db8c688ba / 4.0b4pre / 20100813011122 / files

--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -821,17 +821,19 @@ nsExternalResourceMap::Traverse(nsCycleC
   mMap.EnumerateRead(ExternalResourceTraverser, aCallback);
 }
 
 static PLDHashOperator
 ExternalResourceHider(nsIURI* aKey,
                       nsExternalResourceMap::ExternalResource* aData,
                       void* aClosure)
 {
-  aData->mViewer->Hide();
+  if (aData->mViewer) {
+    aData->mViewer->Hide();
+  }
   return PL_DHASH_NEXT;
 }
 
 void
 nsExternalResourceMap::HideViewers()
 {
   mMap.EnumerateRead(ExternalResourceHider, nsnull);
 }