mozilla-central: changeset 110620:205475d5c2b77c88cc040fe7ad3a9d6994f48553

author	Ehsan Akhgari <ehsan@mozilla.com>
	Wed, 17 Oct 2012 20:07:05 -0400
changeset 110620	205475d5c2b77c88cc040fe7ad3a9d6994f48553
parent 110619	357a60386b52860f2d96a8903d4e13bd7bb25b7b
child 110621	054604aa00bd159fcd06a54efdaafef35ec40e79
push id	23704
push user	emorley@mozilla.com
push date	Thu, 18 Oct 2012 17:12:58 +0000
treeherder	mozilla-central@3779eb3f036f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
bugs	802884
milestone	19.0a1
first release with	nightly linux32 0ff60bfb3442 / 19.0a1 / 20121019030551 / files nightly linux64 0ff60bfb3442 / 19.0a1 / 20121019030551 / files nightly mac 0ff60bfb3442 / 19.0a1 / 20121019030551 / files nightly win32 0ff60bfb3442 / 19.0a1 / 20121019030551 / files nightly win64 0ff60bfb3442 / 19.0a1 / 20121019030551 / files
last release without	nightly linux32 dac5700acf8b / 19.0a1 / 20121017030548 / files nightly linux64 dac5700acf8b / 19.0a1 / 20121017030548 / files nightly mac dac5700acf8b / 19.0a1 / 20121017030548 / files nightly win32 dac5700acf8b / 19.0a1 / 20121017030548 / files nightly win64 dac5700acf8b / 19.0a1 / 20121017030548 / files

--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -758,17 +758,21 @@ nsHTMLEditor::NodeIsBlockStatic(const do
       tagAtom==nsEditProperty::dt         ||
       tagAtom==nsEditProperty::dd         ||
       tagAtom==nsEditProperty::pre)
   {
     return true;
   }
 
   bool isBlock;
-  DebugOnly<nsresult> rv = nsContentUtils::GetParserService()->
+#ifdef DEBUG
+  // XXX we can't use DebugOnly here because VC++ is stupid (bug 802884)
+  nsresult rv =
+#endif
+    nsContentUtils::GetParserService()->
     IsBlock(nsContentUtils::GetParserService()->HTMLAtomTagToId(tagAtom),
             isBlock);
   MOZ_ASSERT(rv == NS_OK);
 
   AssertParserServiceIsCorrect(tagAtom, isBlock);
 
   return isBlock;
 }