[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

arv at chromium.org arv at chromium.org
Wed Dec 22 15:29:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6866bb0c0ae1ced76ee711bb984614d7f4461afa
Author: arv at chromium.org <arv at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 18:35:09 2010 +0000

    2010-11-04  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Support box-sizing without the vendor prefix
            https://bugs.webkit.org/show_bug.cgi?id=36713
    
            Based on patch by Peter Beverloo <peter at lvp-media.com>
    
            Update the tests to use box-sizing instead of -webkit-box-sizing.
    
            * fast/borders/borderRadiusDashed05.html:
            * fast/css/box-sizing-backwards-compat-prefix-expected.txt: Added.
            * fast/css/box-sizing-backwards-compat-prefix.html: Added. This tests that both box-sizing and -webkit-box-sizing works.
            * fast/css/getComputedStyle/computed-style-expected.txt:
            * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
            * platform/chromium-mac/fast/css/computed-style-expected.txt:
            * platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt:
            * platform/chromium-win/fast/css/computed-style-expected.txt:
            * platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt:
            * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
            * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
            * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
            * platform/chromium-win/transforms/2d/transform-borderbox-expected.txt:
            * platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt:
            * platform/gtk/transforms/2d/transform-borderbox-expected.txt:
            * platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt:
            * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
            * platform/mac/transforms/2d/transform-borderbox-expected.checksum:
            * platform/mac/transforms/2d/transform-borderbox-expected.txt:
            * platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum:
            * platform/mac/transforms/2d/transform-origin-borderbox-expected.txt:
            * platform/qt/fast/css/getComputedStyle/computed-style-expected.txt:
            * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
            * svg/css/getComputedStyle-basic-expected.txt:
            * transforms/2d/transform-borderbox.html:
            * transforms/2d/transform-origin-borderbox.html:
    2010-11-04  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Support box-sizing without the vendor prefix
            https://bugs.webkit.org/show_bug.cgi?id=36713
    
            Based on patch by Peter Beverloo <peter at lvp-media.com>
    
            Test: fast/css/box-sizing-backwards-compat-prefix.html
    
            * css/CSSComputedStyleDeclaration.cpp:
            (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
            * css/CSSParser.cpp:
            (WebCore::CSSParser::parseValue):
            (WebCore::cssPropertyID): This handles -webkit-box-sizing and maps it to box-sizing.
            * css/CSSPropertyNames.in:
            * css/CSSStyleSelector.cpp:
            (WebCore::CSSStyleSelector::applyProperty):
            * css/quirks.css: Change -webkit-box-sizing to box-sizing.
            (input:not([type=image]), textarea):
            * css/view-source.css: Ditto.
            (.webkit-line-gutter-backdrop, .webkit-line-number):
            * css/wml.css: Ditto.
            (do):
            (select):
    2010-11-04  Erik Arvidsson  <arv at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Support box-sizing without the vendor prefix
            https://bugs.webkit.org/show_bug.cgi?id=36713
    
            Based on patch by Peter Beverloo <peter at lvp-media.com>
    
            * iExploder/htdocs/cssproperties.in: Change -webkit-box-sizing to box-sizing.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7430949..f33ed32 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,41 @@
+2010-11-04  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Support box-sizing without the vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=36713
+
+        Based on patch by Peter Beverloo <peter at lvp-media.com>
+
+        Update the tests to use box-sizing instead of -webkit-box-sizing.
+
+        * fast/borders/borderRadiusDashed05.html:
+        * fast/css/box-sizing-backwards-compat-prefix-expected.txt: Added.
+        * fast/css/box-sizing-backwards-compat-prefix.html: Added. This tests that both box-sizing and -webkit-box-sizing works.
+        * fast/css/getComputedStyle/computed-style-expected.txt:
+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/chromium-mac/fast/css/computed-style-expected.txt:
+        * platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt:
+        * platform/chromium-win/fast/css/computed-style-expected.txt:
+        * platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt:
+        * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt:
+        * platform/chromium-win/transforms/2d/transform-borderbox-expected.txt:
+        * platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt:
+        * platform/gtk/transforms/2d/transform-borderbox-expected.txt:
+        * platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt:
+        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * platform/mac/transforms/2d/transform-borderbox-expected.checksum:
+        * platform/mac/transforms/2d/transform-borderbox-expected.txt:
+        * platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum:
+        * platform/mac/transforms/2d/transform-origin-borderbox-expected.txt:
+        * platform/qt/fast/css/getComputedStyle/computed-style-expected.txt:
+        * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+        * svg/css/getComputedStyle-basic-expected.txt:
+        * transforms/2d/transform-borderbox.html:
+        * transforms/2d/transform-origin-borderbox.html:
+
 2010-11-04  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/fast/borders/borderRadiusDashed05.html b/LayoutTests/fast/borders/borderRadiusDashed05.html
index 8e53ab9..7ce68e1 100644
--- a/LayoutTests/fast/borders/borderRadiusDashed05.html
+++ b/LayoutTests/fast/borders/borderRadiusDashed05.html
@@ -11,7 +11,7 @@
           border-left-color: rgba(0,0,255,1);
           border-bottom-color: rgba(0,128,0,0.5);
           border-right-color: rgba(0,128,0,0.5);
-          -webkit-box-sizing: border-box;
+          box-sizing: border-box;
           margin: 20px;
       }
       div {
diff --git a/LayoutTests/fast/css/box-sizing-backwards-compat-prefix-expected.txt b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix-expected.txt
new file mode 100644
index 0000000..79b63ae
--- /dev/null
+++ b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix-expected.txt
@@ -0,0 +1,19 @@
+Testing whether box-sizing works with and withou the -webkit-prefix (bug 36713).
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS prefixStyle.getPropertyValue('box-sizing') is "border-box"
+PASS prefixStyle.getPropertyValue('-webkit-box-sizing') is "border-box"
+PASS prefixStyle.boxSizing is "border-box"
+PASS prefixStyle.WebkitBoxSizing is "border-box"
+PASS prefixStyle.webkitBoxSizing is "border-box"
+PASS prefixLessStyle.getPropertyValue('box-sizing') is "border-box"
+PASS prefixLessStyle.getPropertyValue('-webkit-box-sizing') is "border-box"
+PASS prefixLessStyle.boxSizing is "border-box"
+PASS prefixLessStyle.WebkitBoxSizing is "border-box"
+PASS prefixLessStyle.webkitBoxSizing is "border-box"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.html b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.html
new file mode 100644
index 0000000..b0e2c86
--- /dev/null
+++ b/LayoutTests/fast/css/box-sizing-backwards-compat-prefix.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="test-prefixed-sizing" style="-webkit-box-sizing: border-box;"></div>
+<div id="test-prefixless-sizing" style="box-sizing: border-box;"></div>
+<div id="console"></div>
+<script>
+description("Testing whether box-sizing works with and withou the -webkit-prefix (bug 36713).");
+
+var prefixStyle = document.getElementById('test-prefixed-sizing').style;
+shouldBeEqualToString("prefixStyle.getPropertyValue('box-sizing')", "border-box");
+shouldBeEqualToString("prefixStyle.getPropertyValue('-webkit-box-sizing')", "border-box");
+shouldBeEqualToString("prefixStyle.boxSizing", "border-box");
+shouldBeEqualToString("prefixStyle.WebkitBoxSizing", "border-box");
+shouldBeEqualToString("prefixStyle.webkitBoxSizing", "border-box");
+
+var prefixLessStyle = document.getElementById('test-prefixless-sizing').style;
+shouldBeEqualToString("prefixLessStyle.getPropertyValue('box-sizing')", "border-box");
+shouldBeEqualToString("prefixLessStyle.getPropertyValue('-webkit-box-sizing')", "border-box");
+shouldBeEqualToString("prefixLessStyle.boxSizing", "border-box");
+shouldBeEqualToString("prefixLessStyle.WebkitBoxSizing", "border-box");
+shouldBeEqualToString("prefixLessStyle.webkitBoxSizing", "border-box");
+
+var successfullyParsed = true;
+</script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt b/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
index dd21e2b..28dd8a1 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
@@ -26,6 +26,7 @@ border-top-right-radius: 0px;
 border-top-style: none;
 border-top-width: 0px;
 bottom: auto;
+box-sizing: content-box;
 caption-side: top;
 clear: none;
 clip: auto;
@@ -122,7 +123,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-box-sizing: content-box;
 -webkit-color-correction: default;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
diff --git a/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index bfe5942..44771c7 100644
--- a/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -25,6 +25,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 16px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     clip: auto
@@ -121,7 +122,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-color-correction: default
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
diff --git a/LayoutTests/platform/chromium-mac/fast/css/computed-style-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/computed-style-expected.txt
index 3962c87..41c7aae 100644
--- a/LayoutTests/platform/chromium-mac/fast/css/computed-style-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/css/computed-style-expected.txt
@@ -19,6 +19,7 @@ border-top-color: rgb(0, 0, 0);
 border-top-style: none;
 border-top-width: 0px;
 bottom: auto;
+box-sizing: content-box;
 caption-side: top;
 clear: none;
 color: rgb(0, 0, 0);
@@ -108,7 +109,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-box-sizing: content-box;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
diff --git a/LayoutTests/platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt b/LayoutTests/platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt
index 4a84f43..a9683f7 100644
--- a/LayoutTests/platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/css/computed-style-without-renderer-expected.txt
@@ -18,6 +18,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 16px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     color: rgb(0, 0, 0)
@@ -107,7 +108,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
     -webkit-column-break-inside: auto
diff --git a/LayoutTests/platform/chromium-win/fast/css/computed-style-expected.txt b/LayoutTests/platform/chromium-win/fast/css/computed-style-expected.txt
index 3962c87..41c7aae 100644
--- a/LayoutTests/platform/chromium-win/fast/css/computed-style-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/css/computed-style-expected.txt
@@ -19,6 +19,7 @@ border-top-color: rgb(0, 0, 0);
 border-top-style: none;
 border-top-width: 0px;
 bottom: auto;
+box-sizing: content-box;
 caption-side: top;
 clear: none;
 color: rgb(0, 0, 0);
@@ -108,7 +109,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-box-sizing: content-box;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
diff --git a/LayoutTests/platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt b/LayoutTests/platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt
index 4a84f43..a9683f7 100644
--- a/LayoutTests/platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/css/computed-style-without-renderer-expected.txt
@@ -18,6 +18,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 16px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     color: rgb(0, 0, 0)
@@ -107,7 +108,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
     -webkit-column-break-inside: auto
diff --git a/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt b/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
index bee526e..afffbf1 100644
--- a/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
@@ -26,6 +26,7 @@ border-top-right-radius: 0px;
 border-top-style: none;
 border-top-width: 0px;
 bottom: auto;
+box-sizing: content-box;
 caption-side: top;
 clear: none;
 clip: auto;
@@ -122,7 +123,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-box-sizing: content-box;
 -webkit-color-correction: default;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
diff --git a/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index 870133a..f1c2855 100644
--- a/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -25,6 +25,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 16px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     clip: auto
@@ -121,7 +122,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-color-correction: default
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
diff --git a/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt b/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
index c25f912..4d504eb 100644
--- a/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
+++ b/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
@@ -50,6 +50,8 @@ rect: style.getPropertyValue(border-top-width) : 0px
 rect: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(bottom) : auto
 rect: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(box-sizing) : content-box
+rect: style.getPropertyCSSValue(box-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(caption-side) : top
 rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(clear) : none
@@ -242,8 +244,6 @@ rect: style.getPropertyValue(-webkit-box-reflect) : none
 rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-box-shadow) : none
 rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-box-sizing) : content-box
-rect: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-color-correction) : default
 rect: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-after) : auto
@@ -474,6 +474,8 @@ g: style.getPropertyValue(border-top-width) : 0px
 g: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(bottom) : auto
 g: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(box-sizing) : content-box
+g: style.getPropertyCSSValue(box-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(caption-side) : top
 g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(clear) : none
@@ -666,8 +668,6 @@ g: style.getPropertyValue(-webkit-box-reflect) : none
 g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-box-shadow) : none
 g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-box-sizing) : content-box
-g: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-color-correction) : default
 g: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-after) : auto
diff --git a/LayoutTests/platform/chromium-win/transforms/2d/transform-borderbox-expected.txt b/LayoutTests/platform/chromium-win/transforms/2d/transform-borderbox-expected.txt
index 2cfef69..a26c97e 100644
--- a/LayoutTests/platform/chromium-win/transforms/2d/transform-borderbox-expected.txt
+++ b/LayoutTests/platform/chromium-win/transforms/2d/transform-borderbox-expected.txt
@@ -11,9 +11,9 @@ layer at (0,0) size 800x306
 layer at (38,66) size 250x100
   RenderBlock {DIV} at (0,0) size 250x100 [bgcolor=#008000] [border: (50px solid #808080) none]
     RenderText {#text} at (0,0) size 147x19
-      text run at (0,0) width 147: "-webkit-box-sizing: auto"
+      text run at (0,0) width 147: "box-sizing: auto"
 layer at (38,176) size 200x100
   RenderBlock {DIV} at (0,110) size 200x100 [bgcolor=#008000] [border: (50px solid #808080) none]
     RenderText {#text} at (0,0) size 117x39
-      text run at (0,0) width 117: "-webkit-box-sizing:"
+      text run at (0,0) width 117: "box-sizing:"
       text run at (0,20) width 70: "border-box"
diff --git a/LayoutTests/platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt b/LayoutTests/platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt
index 5737d3d..6eef100 100644
--- a/LayoutTests/platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt
+++ b/LayoutTests/platform/chromium-win/transforms/2d/transform-origin-borderbox-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x526
     RenderBody {BODY} at (8,16) size 784x480
       RenderBlock {P} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 572x19
-          text run at (0,0) width 572: "Tests that origin of rotation is the center of the border box, with and without -webkit-box-sizing"
+          text run at (0,0) width 572: "Tests that origin of rotation is the center of the border box, with and without box-sizing"
       RenderBlock {DIV} at (30,50) size 200x200 [bgcolor=#FF0000]
       RenderBlock {DIV} at (30,280) size 200x200 [bgcolor=#FF0000]
 layer at (38,66) size 200x200
diff --git a/LayoutTests/platform/gtk/transforms/2d/transform-borderbox-expected.txt b/LayoutTests/platform/gtk/transforms/2d/transform-borderbox-expected.txt
index 69c28dc..4402ac5 100644
--- a/LayoutTests/platform/gtk/transforms/2d/transform-borderbox-expected.txt
+++ b/LayoutTests/platform/gtk/transforms/2d/transform-borderbox-expected.txt
@@ -11,9 +11,9 @@ layer at (0,0) size 800x305
 layer at (38,65) size 250x100
   RenderBlock {DIV} at (0,0) size 250x100 [bgcolor=#008000] [border: (50px solid #808080) none]
     RenderText {#text} at (0,0) size 147x19
-      text run at (0,0) width 147: "-webkit-box-sizing: auto"
+      text run at (0,0) width 147: "box-sizing: auto"
 layer at (38,175) size 200x100
   RenderBlock {DIV} at (0,110) size 200x100 [bgcolor=#008000] [border: (50px solid #808080) none]
     RenderText {#text} at (0,0) size 117x38
-      text run at (0,0) width 117: "-webkit-box-sizing:"
+      text run at (0,0) width 117: "box-sizing:"
       text run at (0,19) width 70: "border-box"
diff --git a/LayoutTests/platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt b/LayoutTests/platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt
index d19d443..936dec1 100644
--- a/LayoutTests/platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt
+++ b/LayoutTests/platform/gtk/transforms/2d/transform-origin-borderbox-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x525
     RenderBody {BODY} at (8,16) size 784x479
       RenderBlock {P} at (0,0) size 784x19
         RenderText {#text} at (0,0) size 572x19
-          text run at (0,0) width 572: "Tests that origin of rotation is the center of the border box, with and without -webkit-box-sizing"
+          text run at (0,0) width 572: "Tests that origin of rotation is the center of the border box, with and without box-sizing"
       RenderBlock {DIV} at (30,49) size 200x200 [bgcolor=#FF0000]
       RenderBlock {DIV} at (30,279) size 200x200 [bgcolor=#FF0000]
 layer at (38,65) size 200x200
diff --git a/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index bfe5942..44771c7 100644
--- a/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -25,6 +25,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 16px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     clip: auto
@@ -121,7 +122,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-color-correction: default
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
diff --git a/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.checksum b/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.checksum
index e2ea272..0cb00ca 100644
--- a/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.checksum
+++ b/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.checksum
@@ -1 +1 @@
-4788409452f84ec3923f50a2e044e23a
\ No newline at end of file
+f2c579134e479a0e0a1e8d3db7ea2ca1
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.txt b/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.txt
index 0910e74..ffa6c4c 100644
--- a/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.txt
+++ b/LayoutTests/platform/mac/transforms/2d/transform-borderbox-expected.txt
@@ -10,10 +10,9 @@ layer at (0,0) size 800x304
       RenderBlock {DIV} at (30,48) size 400x210
 layer at (38,64) size 250x100
   RenderBlock {DIV} at (0,0) size 250x100 [bgcolor=#008000] [border: (50px solid #808080) none]
-    RenderText {#text} at (0,0) size 154x18
-      text run at (0,0) width 154: "-webkit-box-sizing: auto"
+    RenderText {#text} at (0,0) size 101x18
+      text run at (0,0) width 101: "box-sizing: auto"
 layer at (38,174) size 200x100
   RenderBlock {DIV} at (0,110) size 200x100 [bgcolor=#008000] [border: (50px solid #808080) none]
-    RenderText {#text} at (0,0) size 123x36
-      text run at (0,0) width 123: "-webkit-box-sizing:"
-      text run at (0,18) width 70: "border-box"
+    RenderText {#text} at (0,0) size 144x18
+      text run at (0,0) width 144: "box-sizing: border-box"
diff --git a/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum b/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum
index e691e62..1c33cb6 100644
--- a/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum
+++ b/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.checksum
@@ -1 +1 @@
-b4c25ad66caa3b3ee781d6909226431a
\ No newline at end of file
+ec036d6d0be5255b44cfad5c620d48bf
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.txt b/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.txt
index c43ddf3..fa0d5b2 100644
--- a/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.txt
+++ b/LayoutTests/platform/mac/transforms/2d/transform-origin-borderbox-expected.txt
@@ -4,17 +4,17 @@ layer at (0,0) size 800x524
   RenderBlock {HTML} at (0,0) size 800x524
     RenderBody {BODY} at (8,16) size 784x478
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 600x18
-          text run at (0,0) width 600: "Tests that origin of rotation is the center of the border box, with and without -webkit-box-sizing"
+        RenderText {#text} at (0,0) size 547x18
+          text run at (0,0) width 547: "Tests that origin of rotation is the center of the border box, with and without box-sizing"
       RenderBlock {DIV} at (30,48) size 200x200 [bgcolor=#FF0000]
       RenderBlock {DIV} at (30,278) size 200x200 [bgcolor=#FF0000]
 layer at (38,64) size 200x200
   RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000] [border: (100px solid #808080) none]
-    RenderText {#text} at (0,0) size 82x36
-      text run at (0,0) width 82: "-webkit-box-"
-      text run at (0,18) width 72: "sizing: auto"
+    RenderText {#text} at (0,0) size 70x36
+      text run at (0,0) width 70: "box-sizing:"
+      text run at (0,18) width 27: "auto"
 layer at (38,294) size 200x200
   RenderBlock {DIV} at (0,0) size 200x200 [bgcolor=#008000] [border: (100px solid #808080) none]
-    RenderText {#text} at (0,0) size 82x36
-      text run at (0,0) width 82: "-webkit-box-"
-      text run at (0,18) width 72: "sizing: auto"
+    RenderText {#text} at (0,0) size 70x36
+      text run at (0,0) width 70: "box-sizing:"
+      text run at (0,18) width 27: "auto"
diff --git a/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-expected.txt b/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-expected.txt
index 768aeef..081cd6d 100644
--- a/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-expected.txt
+++ b/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-expected.txt
@@ -26,6 +26,7 @@ border-top-right-radius: 0px;
 border-top-style: none;
 border-top-width: 0px;
 bottom: auto;
+box-sizing: content-box;
 caption-side: top;
 clear: none;
 clip: auto;
@@ -118,7 +119,6 @@ zoom: 1;
 -webkit-box-pack: start;
 -webkit-box-reflect: none;
 -webkit-box-shadow: none;
--webkit-box-sizing: content-box;
 -webkit-column-break-after: auto;
 -webkit-column-break-before: auto;
 -webkit-column-break-inside: auto;
diff --git a/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt b/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
index 7051096..63ce09a 100644
--- a/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
+++ b/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
@@ -25,6 +25,7 @@ Computed style of an element whose parent's 'display' value is 'none':
     border-top-style: solid
     border-top-width: 13px
     bottom: auto
+    box-sizing: content-box
     caption-side: top
     clear: none
     clip: auto
@@ -117,7 +118,6 @@ Computed style of an element whose parent's 'display' value is 'none':
     -webkit-box-pack: start
     -webkit-box-reflect: none
     -webkit-box-shadow: none
-    -webkit-box-sizing: content-box
     -webkit-column-break-after: auto
     -webkit-column-break-before: auto
     -webkit-column-break-inside: auto
diff --git a/LayoutTests/svg/css/getComputedStyle-basic-expected.txt b/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
index 1755873..85f2c8f 100644
--- a/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
+++ b/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
@@ -50,6 +50,8 @@ rect: style.getPropertyValue(border-top-width) : 0px
 rect: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(bottom) : auto
 rect: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(box-sizing) : content-box
+rect: style.getPropertyCSSValue(box-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(caption-side) : top
 rect: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(clear) : none
@@ -242,8 +244,6 @@ rect: style.getPropertyValue(-webkit-box-reflect) : none
 rect: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-box-shadow) : none
 rect: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-box-sizing) : content-box
-rect: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-color-correction) : default
 rect: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(-webkit-column-break-after) : auto
@@ -474,6 +474,8 @@ g: style.getPropertyValue(border-top-width) : 0px
 g: style.getPropertyCSSValue(border-top-width) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(bottom) : auto
 g: style.getPropertyCSSValue(bottom) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(box-sizing) : content-box
+g: style.getPropertyCSSValue(box-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(caption-side) : top
 g: style.getPropertyCSSValue(caption-side) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(clear) : none
@@ -666,8 +668,6 @@ g: style.getPropertyValue(-webkit-box-reflect) : none
 g: style.getPropertyCSSValue(-webkit-box-reflect) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-box-shadow) : none
 g: style.getPropertyCSSValue(-webkit-box-shadow) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-box-sizing) : content-box
-g: style.getPropertyCSSValue(-webkit-box-sizing) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-color-correction) : default
 g: style.getPropertyCSSValue(-webkit-color-correction) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(-webkit-column-break-after) : auto
diff --git a/LayoutTests/transforms/2d/transform-borderbox.html b/LayoutTests/transforms/2d/transform-borderbox.html
index 41e63b5..8146335 100644
--- a/LayoutTests/transforms/2d/transform-borderbox.html
+++ b/LayoutTests/transforms/2d/transform-borderbox.html
@@ -18,12 +18,12 @@
       margin-bottom: 10px;
       background-color: green;
       border-right: 50px solid gray;
-      -webkit-box-sizing: auto;
+      box-sizing: auto;
       -webkit-transform: scalex(2);
       -webkit-transform-origin: left;
     }
     .border-box {
-      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
     }
   </style>
 </head>
@@ -32,8 +32,8 @@
 <p>
 <p>Top box should have gray part extending outside the black outline. Lower box should lie inside the outline</p>
   <div class="container">
-    <div class="box">-webkit-box-sizing: auto</div>
-    <div class="box border-box">-webkit-box-sizing: border-box</div>
+    <div class="box">box-sizing: auto</div>
+    <div class="box border-box">box-sizing: border-box</div>
   </div>
 </body>
 </html>
diff --git a/LayoutTests/transforms/2d/transform-origin-borderbox.html b/LayoutTests/transforms/2d/transform-origin-borderbox.html
index 3c29342..e2b6655 100644
--- a/LayoutTests/transforms/2d/transform-origin-borderbox.html
+++ b/LayoutTests/transforms/2d/transform-origin-borderbox.html
@@ -18,24 +18,24 @@
       width: 100px;
       background-color: green;
       border-right: 100px solid gray;
-      -webkit-box-sizing: auto;
+      box-sizing: auto;
       -webkit-transform: rotate(90deg);
     }
     .border-box {
       width: 200px;
-      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
     }
   </style>
 </head>
 <body>
 
-<p>Tests that origin of rotation is the center of the border box, with and without -webkit-box-sizing</p>
+<p>Tests that origin of rotation is the center of the border box, with and without box-sizing</p>
   <div class="container">
-    <div class="box">-webkit-box-sizing: auto</div>
+    <div class="box">box-sizing: auto</div>
   </div>
 
   <div class="container">
-    <div class="box border-box">-webkit-box-sizing: auto</div>
+    <div class="box border-box">box-sizing: auto</div>
   </div>
 </body>
 </html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6bbb7e0..b9834f1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-11-04  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Support box-sizing without the vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=36713
+
+        Based on patch by Peter Beverloo <peter at lvp-media.com>
+
+        Test: fast/css/box-sizing-backwards-compat-prefix.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::cssPropertyID): This handles -webkit-box-sizing and maps it to box-sizing.
+        * css/CSSPropertyNames.in:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        * css/quirks.css: Change -webkit-box-sizing to box-sizing.
+        (input:not([type=image]), textarea):
+        * css/view-source.css: Ditto.
+        (.webkit-line-gutter-backdrop, .webkit-line-number):
+        * css/wml.css: Ditto.
+        (do):
+        (select):
+
 2010-11-04  John Reck  <jreck at google.com>
 
         Reviewed by Steve Block.
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index db61591..16e2530 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -76,6 +76,7 @@ static const int computedProperties[] = {
     CSSPropertyBorderTopStyle,
     CSSPropertyBorderTopWidth,
     CSSPropertyBottom,
+    CSSPropertyBoxSizing,
     CSSPropertyCaptionSide,
     CSSPropertyClear,
     CSSPropertyClip,
@@ -173,7 +174,6 @@ static const int computedProperties[] = {
     CSSPropertyWebkitBoxPack,
     CSSPropertyWebkitBoxReflect,
     CSSPropertyWebkitBoxShadow,
-    CSSPropertyWebkitBoxSizing,
     CSSPropertyWebkitColorCorrection,
     CSSPropertyWebkitColumnBreakAfter,
     CSSPropertyWebkitColumnBreakBefore,
@@ -1301,7 +1301,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
             return CSSPrimitiveValue::create(style->zIndex(), CSSPrimitiveValue::CSS_NUMBER);
         case CSSPropertyZoom:
             return CSSPrimitiveValue::create(style->zoom(), CSSPrimitiveValue::CSS_NUMBER);
-        case CSSPropertyWebkitBoxSizing:
+        case CSSPropertyBoxSizing:
             if (style->boxSizing() == CONTENT_BOX)
                 return CSSPrimitiveValue::createIdentifier(CSSValueContentBox);
             return CSSPrimitiveValue::createIdentifier(CSSValueBorderBox);
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 43df662..b1b76cf 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -1277,7 +1277,7 @@ bool CSSParser::parseValue(int propId, bool important)
     case CSSPropertyWebkitBoxOrdinalGroup:
         validPrimitive = validUnit(value, FInteger | FNonNeg, true);
         break;
-    case CSSPropertyWebkitBoxSizing:
+    case CSSPropertyBoxSizing:
         validPrimitive = id == CSSValueBorderBox || id == CSSValueContentBox;
         break;
     case CSSPropertyWebkitColorCorrection:
@@ -5835,7 +5835,12 @@ static int cssPropertyID(const UChar* propertyName, unsigned length)
         }
 
         if (hasPrefix(buffer, length, "-webkit")) {
-            if (strcmp(buffer, "-webkit-opacity") == 0) {
+            if (!strcmp(buffer, "-webkit-box-sizing")) {
+                // -webkit-box-sizing worked in Safari 4 and earlier.
+                const char* const boxSizing = "box-sizing";
+                name = boxSizing;
+                length = strlen(boxSizing);
+            } else if (!strcmp(buffer, "-webkit-opacity")) {
                 // Honor -webkit-opacity as a synonym for opacity.
                 // This was the only syntax that worked in Safari 1.1, and may be in use on some websites and widgets.
                 const char* const opacity = "opacity";
diff --git a/WebCore/css/CSSPropertyNames.in b/WebCore/css/CSSPropertyNames.in
index ab69fa7..ab75404 100644
--- a/WebCore/css/CSSPropertyNames.in
+++ b/WebCore/css/CSSPropertyNames.in
@@ -70,6 +70,7 @@ border-top-style
 border-top-width
 border-width
 bottom
+box-sizing
 caption-side
 clear
 clip
@@ -209,7 +210,6 @@ z-index
 -webkit-box-pack
 -webkit-box-reflect
 -webkit-box-shadow
--webkit-box-sizing
 -webkit-color-correction
 -webkit-column-break-after
 -webkit-column-break-before
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 0447f1e..09a6089 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -4971,7 +4971,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
             return; // Error case.
         m_style->setBoxOrdinalGroup((unsigned int)(primitiveValue->getDoubleValue()));
         return;
-    case CSSPropertyWebkitBoxSizing:
+    case CSSPropertyBoxSizing:
         HANDLE_INHERIT_AND_INITIAL(boxSizing, BoxSizing)
         if (!primitiveValue)
             return;
diff --git a/WebCore/css/quirks.css b/WebCore/css/quirks.css
index 4477708..52d07e6 100644
--- a/WebCore/css/quirks.css
+++ b/WebCore/css/quirks.css
@@ -44,7 +44,7 @@ table {
 
 /* This will apply only to text fields, since all other inputs already use border box sizing */
 input:not([type=image]), textarea {
-    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 /* Set margin-bottom for form element in quirks mode. */
diff --git a/WebCore/css/view-source.css b/WebCore/css/view-source.css
index 60467b9..afceef5 100644
--- a/WebCore/css/view-source.css
+++ b/WebCore/css/view-source.css
@@ -44,7 +44,7 @@ td {
 
 .webkit-line-gutter-backdrop, .webkit-line-number {
     /* Keep this in sync with inspector.css (.webkit-line-gutter-backdrop) */
-    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
     padding: 0 4px !important;
     width: 31px;
     background-color: rgb(240, 240, 240);
diff --git a/WebCore/css/wml.css b/WebCore/css/wml.css
index 54e5a97..4bcf08f 100644
--- a/WebCore/css/wml.css
+++ b/WebCore/css/wml.css
@@ -109,7 +109,7 @@ do {
     padding: 2px 6px 3px 6px;
     border: 2px outset ButtonFace;
     background-color: ButtonFace;
-    -webkit-box-sizing: border-box
+    box-sizing: border-box
 }
 
 input, select, do {
@@ -163,7 +163,7 @@ do:active:disabled {
 
 select {
     -webkit-appearance: menulist;
-    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
     -webkit-box-align: center;
     border: 1px solid;
     -webkit-border-radius: 5px;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index daeebe3..47c0d9b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-04  Erik Arvidsson  <arv at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Support box-sizing without the vendor prefix
+        https://bugs.webkit.org/show_bug.cgi?id=36713
+
+        Based on patch by Peter Beverloo <peter at lvp-media.com>
+
+        * iExploder/htdocs/cssproperties.in: Change -webkit-box-sizing to box-sizing.
+
 2010-11-04  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed rollout r71340, because it broke Chromium Windows bot.
diff --git a/WebKitTools/iExploder/htdocs/cssproperties.in b/WebKitTools/iExploder/htdocs/cssproperties.in
index 9ced1c3..d49eb8e 100644
--- a/WebKitTools/iExploder/htdocs/cssproperties.in
+++ b/WebKitTools/iExploder/htdocs/cssproperties.in
@@ -37,7 +37,6 @@
 -webkit-box-pack
 -webkit-box-reflect
 -webkit-box-shadow
--webkit-box-sizing
 -webkit-color-correction
 -webkit-column-break-after
 -webkit-column-break-before
@@ -156,6 +155,7 @@ border-top-style
 border-top-width
 border-width
 bottom
+box-sizing
 caption-side
 clear
 clip

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list