Backed out 2 changesets (bug 918176) for assertions

CLOSED TREE

Backed out changeset 9d5728797e77
Backed out changeset 1a895d95c88b (bug 918176)

layout/base/nsCSSFrameConstructor.cpp

@@ -1639,10 +1639,6 @@ nsCSSFrameConstructor::CreateGeneratedContent(nsFrameConstructorState& aState,
 
       break;
     }
-
-  case eStyleContentType_Uninitialized:
-    NS_NOTREACHED("uninitialized content type");
-    return nullptr;
   } // switch
 
   return nullptr;

layout/style/nsRuleNode.cpp

@@ -6994,11 +6994,10 @@ nsRuleNode::ComputeContentData(void* aStartStruct,
               type = eStyleContentType_NoCloseQuote;  break;
             default:
               NS_ERROR("bad content value");
-              type = eStyleContentType_Uninitialized; break;
             }
+            break;
           default:
             NS_ERROR("bad content type");
-            type = eStyleContentType_Uninitialized;
           }
           data.mType = type;
           if (type == eStyleContentType_Image) {

layout/style/nsStyleStruct.cpp

@@ -2573,7 +2573,7 @@ nsStyleContentData::TrackImage(nsPresContext* aContext)
   // Sanity
   NS_ABORT_IF_FALSE(!mImageTracked, "Already tracking image!");
   NS_ABORT_IF_FALSE(mType == eStyleContentType_Image,
-                    "Trying to do image tracking on non-image!");
+                    "Tryingto do image tracking on non-image!");
   NS_ABORT_IF_FALSE(mContent.mImage,
                     "Can't track image when there isn't one!");
 

layout/style/nsStyleStruct.h

@@ -1887,8 +1887,7 @@ enum nsStyleContentType {
   eStyleContentType_CloseQuote    = 41,
   eStyleContentType_NoOpenQuote   = 42,
   eStyleContentType_NoCloseQuote  = 43,
-  eStyleContentType_AltContent    = 50,
-  eStyleContentType_Uninitialized
+  eStyleContentType_AltContent    = 50
 };
 
 struct nsStyleContentData {
@@ -1903,7 +1902,7 @@ struct nsStyleContentData {
 #endif
 
   nsStyleContentData()
-    : mType(eStyleContentType_Uninitialized)
+    : mType(nsStyleContentType(0))
 #ifdef DEBUG
     , mImageTracked(false)
 #endif