Merge 136808

Source/WebCore/css/html.css

Index: Source/WebCore/css/html.css
===================================================================
--- Source/WebCore/css/html.css	(revision 137540)
+++ Source/WebCore/css/html.css	(working copy)
@@ -540,6 +540,8 @@
     white-space: pre;
 }
 
+/* If you update padding, border, or margin in the following ruleset, update
+   DateTimeFieldElement::maximumWidth too. */
 input::-webkit-datetime-edit-ampm-field,
 input::-webkit-datetime-edit-day-field,
 input::-webkit-datetime-edit-hour-field,
@@ -551,9 +553,9 @@
 input::-webkit-datetime-edit-year-field {
     -webkit-user-modify: read-only !important;
     border: none;
-    display: inline-block;
-    margin: 1px;
-    text-align: center;
+    display: inline;
+    font: inherit !important;
+    padding: 1px;
 }
 
 /* Remove focus ring from fields and use highlight color */
@@ -579,9 +581,12 @@
     color: GrayText;
 }
 
+/* If you update padding, border, or margin in the following ruleset, update
+   DateTimeEditElement::customStyelForRenderer too. */
 input::-webkit-datetime-edit-text {
     -webkit-user-modify: read-only !important;
-    display: inline-block;
+    display: inline;
+    font: inherit !important;
 }
 
 input::-webkit-date-and-time-container {