diff --git a/content/shared/public/nsLayoutAtomList.h b/content/shared/public/nsLayoutAtomList.h
index c577ef3c640..36f93688ef7 100644
--- a/content/shared/public/nsLayoutAtomList.h
+++ b/content/shared/public/nsLayoutAtomList.h
@@ -103,13 +103,23 @@ LAYOUT_ATOM(blockFrame, "BlockFrame")
 LAYOUT_ATOM(boxFrame, "BoxFrame")
 LAYOUT_ATOM(brFrame, "BRFrame")
 LAYOUT_ATOM(bulletFrame, "BulletFrame")
+LAYOUT_ATOM(comboBoxFrame, "ComboBoxFrame");
+LAYOUT_ATOM(fieldSetFrame, "FieldSetFrame");
+LAYOUT_ATOM(fileControlFrame, "FileControlFrame")
+LAYOUT_ATOM(formControlFrame, "FormControlFrame")
 LAYOUT_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
+LAYOUT_ATOM(gfxCheckBoxFrame, "gfxCheckBoxFrame")
+LAYOUT_ATOM(gfxRadioControlFrame, "gfxRadioControlFrame")
 LAYOUT_ATOM(hrFrame, "HRFrame")
+LAYOUT_ATOM(htmlButtonFrame, "htmlButtonFrame")
 LAYOUT_ATOM(htmlFrameInnerFrame, "htmlFrameInnerFrame")
 LAYOUT_ATOM(htmlFrameOuterFrame, "htmlFrameOuterFrame")
 LAYOUT_ATOM(imageFrame, "ImageFrame")
 LAYOUT_ATOM(imageControlFrame, "ImageControlFrame")
 LAYOUT_ATOM(inlineFrame, "InlineFrame")
+LAYOUT_ATOM(isIndexFrame, "IsIndexFrame")
+LAYOUT_ATOM(labelFrame, "LabelFrame")
+LAYOUT_ATOM(legendFrame, "LegendFrame")
 LAYOUT_ATOM(letterFrame, "LetterFrame")
 LAYOUT_ATOM(lineFrame, "LineFrame")
 LAYOUT_ATOM(listControlFrame,"ListControlFrame")
diff --git a/layout/base/nsLayoutAtomList.h b/layout/base/nsLayoutAtomList.h
index c577ef3c640..36f93688ef7 100644
--- a/layout/base/nsLayoutAtomList.h
+++ b/layout/base/nsLayoutAtomList.h
@@ -103,13 +103,23 @@ LAYOUT_ATOM(blockFrame, "BlockFrame")
 LAYOUT_ATOM(boxFrame, "BoxFrame")
 LAYOUT_ATOM(brFrame, "BRFrame")
 LAYOUT_ATOM(bulletFrame, "BulletFrame")
+LAYOUT_ATOM(comboBoxFrame, "ComboBoxFrame");
+LAYOUT_ATOM(fieldSetFrame, "FieldSetFrame");
+LAYOUT_ATOM(fileControlFrame, "FileControlFrame")
+LAYOUT_ATOM(formControlFrame, "FormControlFrame")
 LAYOUT_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
+LAYOUT_ATOM(gfxCheckBoxFrame, "gfxCheckBoxFrame")
+LAYOUT_ATOM(gfxRadioControlFrame, "gfxRadioControlFrame")
 LAYOUT_ATOM(hrFrame, "HRFrame")
+LAYOUT_ATOM(htmlButtonFrame, "htmlButtonFrame")
 LAYOUT_ATOM(htmlFrameInnerFrame, "htmlFrameInnerFrame")
 LAYOUT_ATOM(htmlFrameOuterFrame, "htmlFrameOuterFrame")
 LAYOUT_ATOM(imageFrame, "ImageFrame")
 LAYOUT_ATOM(imageControlFrame, "ImageControlFrame")
 LAYOUT_ATOM(inlineFrame, "InlineFrame")
+LAYOUT_ATOM(isIndexFrame, "IsIndexFrame")
+LAYOUT_ATOM(labelFrame, "LabelFrame")
+LAYOUT_ATOM(legendFrame, "LegendFrame")
 LAYOUT_ATOM(letterFrame, "LetterFrame")
 LAYOUT_ATOM(lineFrame, "LineFrame")
 LAYOUT_ATOM(listControlFrame,"ListControlFrame")