diff --git a/mozilla/content/html/style/src/nsCSSKeywordList.h b/mozilla/content/html/style/src/nsCSSKeywordList.h
index 7c5243a502f..6cef8af569e 100644
--- a/mozilla/content/html/style/src/nsCSSKeywordList.h
+++ b/mozilla/content/html/style/src/nsCSSKeywordList.h
@@ -43,7 +43,6 @@ CSS_KEY(_moz_all)
CSS_KEY(_moz_bg_inset)
CSS_KEY(_moz_bg_outset)
CSS_KEY(_moz_center)
-CSS_KEY(_moz_default)
CSS_KEY(_moz_right)
CSS_KEY(_moz_pre_wrap)
CSS_KEY(_moz_scrollbars_none)
@@ -285,6 +284,7 @@ CSS_KEY(solid)
CSS_KEY(spell_out)
CSS_KEY(spinning)
CSS_KEY(square)
+CSS_KEY(start)
CSS_KEY(static)
CSS_KEY(status_bar)
CSS_KEY(sub)
diff --git a/mozilla/content/shared/public/nsCSSKeywordList.h b/mozilla/content/shared/public/nsCSSKeywordList.h
index 7c5243a502f..6cef8af569e 100644
--- a/mozilla/content/shared/public/nsCSSKeywordList.h
+++ b/mozilla/content/shared/public/nsCSSKeywordList.h
@@ -43,7 +43,6 @@ CSS_KEY(_moz_all)
CSS_KEY(_moz_bg_inset)
CSS_KEY(_moz_bg_outset)
CSS_KEY(_moz_center)
-CSS_KEY(_moz_default)
CSS_KEY(_moz_right)
CSS_KEY(_moz_pre_wrap)
CSS_KEY(_moz_scrollbars_none)
@@ -285,6 +284,7 @@ CSS_KEY(solid)
CSS_KEY(spell_out)
CSS_KEY(spinning)
CSS_KEY(square)
+CSS_KEY(start)
CSS_KEY(static)
CSS_KEY(status_bar)
CSS_KEY(sub)
diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp
index 37bdfe95944..3f7b9d3a201 100644
--- a/mozilla/content/shared/src/nsCSSProps.cpp
+++ b/mozilla/content/shared/src/nsCSSProps.cpp
@@ -611,7 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
- eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
+ eCSSKeyword_start, NS_STYLE_TEXT_ALIGN_DEFAULT,
-1,-1
};
diff --git a/mozilla/layout/html/document/src/html.css b/mozilla/layout/html/document/src/html.css
index 7418b32f59f..2f50ba16be3 100644
--- a/mozilla/layout/html/document/src/html.css
+++ b/mozilla/layout/html/document/src/html.css
@@ -443,7 +443,7 @@ form {
input {
vertical-align: bottom;
- text-align: -moz-default;
+ text-align: start;
border: 2px inset rgb(204, 204, 204);
color: black;
background-color: white;
@@ -1050,7 +1050,7 @@ td textarea {
/* End - Margin setting for form controls inside tables for Nav Quirks */
textarea {
- text-align: -moz-default;
+ text-align: start;
box-sizing: border-box;
font-family:-moz-fixed;
vertical-align: bottom;
diff --git a/mozilla/layout/html/style/src/nsCSSKeywordList.h b/mozilla/layout/html/style/src/nsCSSKeywordList.h
index 7c5243a502f..6cef8af569e 100644
--- a/mozilla/layout/html/style/src/nsCSSKeywordList.h
+++ b/mozilla/layout/html/style/src/nsCSSKeywordList.h
@@ -43,7 +43,6 @@ CSS_KEY(_moz_all)
CSS_KEY(_moz_bg_inset)
CSS_KEY(_moz_bg_outset)
CSS_KEY(_moz_center)
-CSS_KEY(_moz_default)
CSS_KEY(_moz_right)
CSS_KEY(_moz_pre_wrap)
CSS_KEY(_moz_scrollbars_none)
@@ -285,6 +284,7 @@ CSS_KEY(solid)
CSS_KEY(spell_out)
CSS_KEY(spinning)
CSS_KEY(square)
+CSS_KEY(start)
CSS_KEY(static)
CSS_KEY(status_bar)
CSS_KEY(sub)
diff --git a/mozilla/layout/html/style/src/nsCSSProps.cpp b/mozilla/layout/html/style/src/nsCSSProps.cpp
index 37bdfe95944..3f7b9d3a201 100644
--- a/mozilla/layout/html/style/src/nsCSSProps.cpp
+++ b/mozilla/layout/html/style/src/nsCSSProps.cpp
@@ -611,7 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
- eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
+ eCSSKeyword_start, NS_STYLE_TEXT_ALIGN_DEFAULT,
-1,-1
};
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index 7418b32f59f..2f50ba16be3 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -443,7 +443,7 @@ form {
input {
vertical-align: bottom;
- text-align: -moz-default;
+ text-align: start;
border: 2px inset rgb(204, 204, 204);
color: black;
background-color: white;
@@ -1050,7 +1050,7 @@ td textarea {
/* End - Margin setting for form controls inside tables for Nav Quirks */
textarea {
- text-align: -moz-default;
+ text-align: start;
box-sizing: border-box;
font-family:-moz-fixed;
vertical-align: bottom;
diff --git a/mozilla/layout/style/nsCSSKeywordList.h b/mozilla/layout/style/nsCSSKeywordList.h
index 7c5243a502f..6cef8af569e 100644
--- a/mozilla/layout/style/nsCSSKeywordList.h
+++ b/mozilla/layout/style/nsCSSKeywordList.h
@@ -43,7 +43,6 @@ CSS_KEY(_moz_all)
CSS_KEY(_moz_bg_inset)
CSS_KEY(_moz_bg_outset)
CSS_KEY(_moz_center)
-CSS_KEY(_moz_default)
CSS_KEY(_moz_right)
CSS_KEY(_moz_pre_wrap)
CSS_KEY(_moz_scrollbars_none)
@@ -285,6 +284,7 @@ CSS_KEY(solid)
CSS_KEY(spell_out)
CSS_KEY(spinning)
CSS_KEY(square)
+CSS_KEY(start)
CSS_KEY(static)
CSS_KEY(status_bar)
CSS_KEY(sub)
diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp
index 37bdfe95944..3f7b9d3a201 100644
--- a/mozilla/layout/style/nsCSSProps.cpp
+++ b/mozilla/layout/style/nsCSSProps.cpp
@@ -611,7 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
- eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
+ eCSSKeyword_start, NS_STYLE_TEXT_ALIGN_DEFAULT,
-1,-1
};