mozilla-inbound: changeset 246024:ef991e9a6395d08bd9064b7bf3b9de2db9b66e67

author	Mark Capella <markcapella@twcny.rr.com>
	Thu, 28 May 2015 02:20:15 -0400
changeset 246024	ef991e9a6395d08bd9064b7bf3b9de2db9b66e67
parent 246023	cab24498e09595dcf086c93b6fd2ad21d189c30f
child 246025	e67ddc64b010aadfcfcd54e63f841bbc7e0b6882
push id	60333
push user	ryanvm@gmail.com
push date	Thu, 28 May 2015 14:20:47 +0000
treeherder	mozilla-inbound@8225a3b75df6 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	tylin
bugs	1168881
milestone	41.0a1
first release with	nightly linux32 f986e55c4e0b / 41.0a1 / 20150529030205 / files nightly linux64 f986e55c4e0b / 41.0a1 / 20150529030205 / files nightly mac f986e55c4e0b / 41.0a1 / 20150529030205 / files nightly win32 f986e55c4e0b / 41.0a1 / 20150529030205 / files nightly win64 f986e55c4e0b / 41.0a1 / 20150529030205 / files
last release without	nightly linux32 baa9c64fea6f / 41.0a1 / 20150528030206 / files nightly linux64 baa9c64fea6f / 41.0a1 / 20150528030206 / files nightly mac baa9c64fea6f / 41.0a1 / 20150528030206 / files nightly win32 baa9c64fea6f / 41.0a1 / 20150528030206 / files nightly win64 baa9c64fea6f / 41.0a1 / 20150528030206 / files

--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -2554,17 +2554,18 @@ PresShell::CheckVisibilityContent(nsICon
   *aRetval = false;
   DoCheckVisibility(mPresContext, aNode, aStartOffset, aEndOffset, aRetval);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 PresShell::GetSelectionCaretsVisibility(bool* aOutVisibility)
 {
-  *aOutVisibility = (SelectionCaretPrefEnabled() && mSelectionCarets->GetVisibility());
+  *aOutVisibility = (SelectionCaretPrefEnabled() &&
+    mSelectionCarets && mSelectionCarets->GetVisibility());
   return NS_OK;
 }
 
 NS_IMETHODIMP
 PresShell::SetSelectionCaretsVisibility(bool aVisibility)
 {
   if (SelectionCaretPrefEnabled() && mSelectionCarets) {
     if (aVisibility) {