diff --git a/mozilla/content/shared/public/nsLayoutAtoms.h b/mozilla/content/shared/public/nsLayoutAtoms.h
index 8315904eb5a..c65f76af99b 100644
--- a/mozilla/content/shared/public/nsLayoutAtoms.h
+++ b/mozilla/content/shared/public/nsLayoutAtoms.h
@@ -66,6 +66,8 @@ public:
 
   // Alphabetical list of frame types
   static nsIAtom* areaFrame;
+  static nsIAtom* blockFrame;
+  static nsIAtom* inlineFrame;
   static nsIAtom* pageFrame;
   static nsIAtom* rootFrame;
   static nsIAtom* scrollFrame;
diff --git a/mozilla/content/shared/src/nsLayoutAtoms.cpp b/mozilla/content/shared/src/nsLayoutAtoms.cpp
index 3528d6c0a75..94c4b24ad6e 100644
--- a/mozilla/content/shared/src/nsLayoutAtoms.cpp
+++ b/mozilla/content/shared/src/nsLayoutAtoms.cpp
@@ -52,6 +52,8 @@ nsIAtom* nsLayoutAtoms::pagePseudo;
 
 // frame types
 nsIAtom* nsLayoutAtoms::areaFrame;
+nsIAtom* nsLayoutAtoms::blockFrame;
+nsIAtom* nsLayoutAtoms::inlineFrame;
 nsIAtom* nsLayoutAtoms::pageFrame;
 nsIAtom* nsLayoutAtoms::rootFrame;
 nsIAtom* nsLayoutAtoms::scrollFrame;
@@ -96,6 +98,8 @@ void nsLayoutAtoms::AddrefAtoms()
     pagePseudo = NS_NewAtom(":-moz-page");
 
     areaFrame = NS_NewAtom("AreaFrame");
+    blockFrame = NS_NewAtom("BlockFrame");
+    inlineFrame = NS_NewAtom("InlineFrame");
     pageFrame = NS_NewAtom("PageFrame");
     rootFrame = NS_NewAtom("RootFrame");
     scrollFrame = NS_NewAtom("ScrollFrame");
@@ -142,6 +146,8 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(pagePseudo);
     
     NS_RELEASE(areaFrame);
+    NS_RELEASE(blockFrame);
+    NS_RELEASE(inlineFrame);
     NS_RELEASE(pageFrame);
     NS_RELEASE(rootFrame);
     NS_RELEASE(scrollFrame);
diff --git a/mozilla/layout/base/nsLayoutAtoms.cpp b/mozilla/layout/base/nsLayoutAtoms.cpp
index 3528d6c0a75..94c4b24ad6e 100644
--- a/mozilla/layout/base/nsLayoutAtoms.cpp
+++ b/mozilla/layout/base/nsLayoutAtoms.cpp
@@ -52,6 +52,8 @@ nsIAtom* nsLayoutAtoms::pagePseudo;
 
 // frame types
 nsIAtom* nsLayoutAtoms::areaFrame;
+nsIAtom* nsLayoutAtoms::blockFrame;
+nsIAtom* nsLayoutAtoms::inlineFrame;
 nsIAtom* nsLayoutAtoms::pageFrame;
 nsIAtom* nsLayoutAtoms::rootFrame;
 nsIAtom* nsLayoutAtoms::scrollFrame;
@@ -96,6 +98,8 @@ void nsLayoutAtoms::AddrefAtoms()
     pagePseudo = NS_NewAtom(":-moz-page");
 
     areaFrame = NS_NewAtom("AreaFrame");
+    blockFrame = NS_NewAtom("BlockFrame");
+    inlineFrame = NS_NewAtom("InlineFrame");
     pageFrame = NS_NewAtom("PageFrame");
     rootFrame = NS_NewAtom("RootFrame");
     scrollFrame = NS_NewAtom("ScrollFrame");
@@ -142,6 +146,8 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(pagePseudo);
     
     NS_RELEASE(areaFrame);
+    NS_RELEASE(blockFrame);
+    NS_RELEASE(inlineFrame);
     NS_RELEASE(pageFrame);
     NS_RELEASE(rootFrame);
     NS_RELEASE(scrollFrame);
diff --git a/mozilla/layout/base/nsLayoutAtoms.h b/mozilla/layout/base/nsLayoutAtoms.h
index 8315904eb5a..c65f76af99b 100644
--- a/mozilla/layout/base/nsLayoutAtoms.h
+++ b/mozilla/layout/base/nsLayoutAtoms.h
@@ -66,6 +66,8 @@ public:
 
   // Alphabetical list of frame types
   static nsIAtom* areaFrame;
+  static nsIAtom* blockFrame;
+  static nsIAtom* inlineFrame;
   static nsIAtom* pageFrame;
   static nsIAtom* rootFrame;
   static nsIAtom* scrollFrame;
diff --git a/mozilla/layout/base/public/nsLayoutAtoms.h b/mozilla/layout/base/public/nsLayoutAtoms.h
index 8315904eb5a..c65f76af99b 100644
--- a/mozilla/layout/base/public/nsLayoutAtoms.h
+++ b/mozilla/layout/base/public/nsLayoutAtoms.h
@@ -66,6 +66,8 @@ public:
 
   // Alphabetical list of frame types
   static nsIAtom* areaFrame;
+  static nsIAtom* blockFrame;
+  static nsIAtom* inlineFrame;
   static nsIAtom* pageFrame;
   static nsIAtom* rootFrame;
   static nsIAtom* scrollFrame;
diff --git a/mozilla/layout/base/src/nsLayoutAtoms.cpp b/mozilla/layout/base/src/nsLayoutAtoms.cpp
index 3528d6c0a75..94c4b24ad6e 100644
--- a/mozilla/layout/base/src/nsLayoutAtoms.cpp
+++ b/mozilla/layout/base/src/nsLayoutAtoms.cpp
@@ -52,6 +52,8 @@ nsIAtom* nsLayoutAtoms::pagePseudo;
 
 // frame types
 nsIAtom* nsLayoutAtoms::areaFrame;
+nsIAtom* nsLayoutAtoms::blockFrame;
+nsIAtom* nsLayoutAtoms::inlineFrame;
 nsIAtom* nsLayoutAtoms::pageFrame;
 nsIAtom* nsLayoutAtoms::rootFrame;
 nsIAtom* nsLayoutAtoms::scrollFrame;
@@ -96,6 +98,8 @@ void nsLayoutAtoms::AddrefAtoms()
     pagePseudo = NS_NewAtom(":-moz-page");
 
     areaFrame = NS_NewAtom("AreaFrame");
+    blockFrame = NS_NewAtom("BlockFrame");
+    inlineFrame = NS_NewAtom("InlineFrame");
     pageFrame = NS_NewAtom("PageFrame");
     rootFrame = NS_NewAtom("RootFrame");
     scrollFrame = NS_NewAtom("ScrollFrame");
@@ -142,6 +146,8 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(pagePseudo);
     
     NS_RELEASE(areaFrame);
+    NS_RELEASE(blockFrame);
+    NS_RELEASE(inlineFrame);
     NS_RELEASE(pageFrame);
     NS_RELEASE(rootFrame);
     NS_RELEASE(scrollFrame);