From f5b8acd9ca4cf09a5ed86f1e04ba94e3661a5894 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Wed, 19 Feb 2014 14:14:53 +0000
Subject: [PATCH] Bug 965237 - Make overflow-clip-box:content-box be the
 default for <input type=text/password/number> and <textarea>.  r=roc

---
 layout/reftests/forms/placeholder/reftest.list         |  2 +-
 .../textarea/padding-scrollbar-placement-ref.html      | 10 +++++++++-
 layout/style/forms.css                                 |  8 ++++++++
 layout/style/ua.css                                    |  4 ++++
 4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/layout/reftests/forms/placeholder/reftest.list b/layout/reftests/forms/placeholder/reftest.list
index d0af1699fff7..141394e9ab69 100644
--- a/layout/reftests/forms/placeholder/reftest.list
+++ b/layout/reftests/forms/placeholder/reftest.list
@@ -16,7 +16,7 @@
 == placeholder-3.html placeholder-overridden-ref.html
 == placeholder-4.html placeholder-overridden-ref.html
 == placeholder-5.html placeholder-visible-ref.html
-== placeholder-6.html placeholder-overflow-ref.html
+fuzzy-if(winWidget,160,6) == placeholder-6.html placeholder-overflow-ref.html
 skip-if(B2G) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
 # needs-focus == placeholder-7.html placeholder-focus-ref.html
 # needs-focus == placeholder-8.html placeholder-focus-ref.html
diff --git a/layout/reftests/forms/textarea/padding-scrollbar-placement-ref.html b/layout/reftests/forms/textarea/padding-scrollbar-placement-ref.html
index 40a639eb9416..30928bbd7de7 100644
--- a/layout/reftests/forms/textarea/padding-scrollbar-placement-ref.html
+++ b/layout/reftests/forms/textarea/padding-scrollbar-placement-ref.html
@@ -28,6 +28,14 @@
                 height: 300px;
                 background: black;
             }
+            #cover2 { /* corresponds to the bottom padding inside the textarea */
+                position: absolute;
+                left: 0px;
+                bottom: 0px;
+                width: 100%;
+                height: 50px;
+                background: white;
+            }
         </style>
     </head>
     <body>
@@ -36,7 +44,7 @@
         for (var i = 0; i < 1000; ++i) {
           ss.push(i);
         }
-        document.write("<div id='t'>" + ss.join(" ") + "</div>");
+        document.write("<div id='t'><div id=cover2></div>" + ss.join(" ") + "</div>");
         </script>
         <div id="cover"></div>
     </body>
diff --git a/layout/style/forms.css b/layout/style/forms.css
index a585a2b44d07..d965c4b97e12 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -115,6 +115,7 @@ textarea {
   -moz-user-select: text;
   text-shadow: none;
   word-wrap: break-word;
+  overflow-clip-box: content-box;
 }
 
 textarea > scrollbar {
@@ -137,6 +138,7 @@ textarea::-moz-placeholder {
   ime-mode: inherit;
   resize: inherit;
   -moz-control-character-visibility: visible;
+  overflow-clip-box: inherit;
 }
 
 textarea > .anonymous-div.wrap,
@@ -378,6 +380,11 @@ optgroup:disabled {
   background-color: transparent;
 }
 
+input[type="text"],
+input[type="password"] {
+  overflow-clip-box: content-box;
+}
+
 /* hidden inputs */
 input[type="hidden"] {
   -moz-appearance: none;
@@ -899,6 +906,7 @@ input[type="number"] {
   /* Has to revert some properties applied by the generic input rule. */
   -moz-binding: none;
   width: 149px; /* to match type=text */
+  overflow-clip-box: content-box;
 }
 
 input[type=number]::-moz-number-wrapper {
diff --git a/layout/style/ua.css b/layout/style/ua.css
index 247de944c7a8..491a58b3d732 100644
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -103,6 +103,7 @@
   position: static !important;
   unicode-bidi: inherit;
   text-overflow: inherit;
+  overflow-clip-box: inherit;
 }
 
 *|*::-moz-anonymous-block, *|*::-moz-anonymous-positioned-block {
@@ -115,6 +116,7 @@
   opacity: inherit;
   text-decoration: inherit;
   -moz-box-ordinal-group: inherit !important;
+  overflow-clip-box: inherit;
 }
 
 *|*::-moz-xul-anonymous-block {
@@ -123,6 +125,7 @@
   float: none ! important;
   -moz-box-ordinal-group: inherit !important;
   text-overflow: inherit;
+  overflow-clip-box: inherit;
 }
 
 *|*::-moz-scrolled-content, *|*::-moz-scrolled-canvas,
@@ -151,6 +154,7 @@
      frame tree. */
   position: static !important;
   float: none !important;
+  overflow-clip-box: inherit;
 }
 
 *|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas, *|*::-moz-scrolled-canvas {
