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

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c632a16f58a6e460f7ec44b920ef86f731f7c06c
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 07:10:28 2010 +0000

    <rdar://problem/8767193> REGRESSION (r60822): caps-lock-indicator is accepted as a -webkit-appearance value
    https://bugs.webkit.org/show_bug.cgi?id=51096
    
    Reviewed by Maciej Stachowiak.
    
    WebCore:
    
    Test: fast/css/appearance-caps-lock-indicator.html
    
    * css/CSSValueKeywords.in: Moved caps-lock-indicator outside the range of values that should be
    accepted by the parser, and added comments about maintaining the list of appearance values.
    * platform/ThemeTypes.h: Moved CapsLockIndicatorPart to the end of the ControlPart enum.
    
    LayoutTests:
    
    * fast/css/appearance-caps-lock-indicator-expected.txt: Added.
    * fast/css/appearance-caps-lock-indicator.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0183b9d..a9852ce 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,4 +1,15 @@
+2010-12-14  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/8767193> REGRESSION (r60822): caps-lock-indicator is accepted as a -webkit-appearance value
+        https://bugs.webkit.org/show_bug.cgi?id=51096
+
+        * fast/css/appearance-caps-lock-indicator-expected.txt: Added.
+        * fast/css/appearance-caps-lock-indicator.html: Added.
+
 2010-12-14  takano takumi  <takano at apple.com>
+
         Reviewed by Dan Bernstein.
 
         text-combine value names have been changed in the css3 proposal.
diff --git a/LayoutTests/fast/css/appearance-caps-lock-indicator-expected.txt b/LayoutTests/fast/css/appearance-caps-lock-indicator-expected.txt
new file mode 100644
index 0000000..03d9b06
--- /dev/null
+++ b/LayoutTests/fast/css/appearance-caps-lock-indicator-expected.txt
@@ -0,0 +1,3 @@
+Test that the CSS parser does not accept caps-lock-indicator as a -webkit-appearance value.
+
+PASS
diff --git a/LayoutTests/fast/css/appearance-caps-lock-indicator.html b/LayoutTests/fast/css/appearance-caps-lock-indicator.html
new file mode 100644
index 0000000..678a07a
--- /dev/null
+++ b/LayoutTests/fast/css/appearance-caps-lock-indicator.html
@@ -0,0 +1,13 @@
+<p>
+    Test that the CSS parser does not accept <tt>caps-lock-indicator</tt> as a <tt>-webkit-appearance</tt>
+    value.
+</p>
+<p id="result">FAIL: Test did not run</p>
+<div id="target" style="display: none; -webkit-appearance: caps-lock-indicator;"></div>
+<script>
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
+    var appearance = document.getElementById("target").style.webkitAppearance;
+    document.getElementById("result").innerText = appearance === "" ? "PASS" : "FAIL: parsed as " + appearance;
+</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 174dc24..fd852b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-14  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        <rdar://problem/8767193> REGRESSION (r60822): caps-lock-indicator is accepted as a -webkit-appearance value
+        https://bugs.webkit.org/show_bug.cgi?id=51096
+
+        Test: fast/css/appearance-caps-lock-indicator.html
+
+        * css/CSSValueKeywords.in: Moved caps-lock-indicator outside the range of values that should be
+        accepted by the parser, and added comments about maintaining the list of appearance values.
+        * platform/ThemeTypes.h: Moved CapsLockIndicatorPart to the end of the ControlPart enum.
+
 2010-12-14  takano takumi  <takano at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/css/CSSValueKeywords.in b/WebCore/css/CSSValueKeywords.in
index 1f14c9d..c3ca1b5 100644
--- a/WebCore/css/CSSValueKeywords.in
+++ b/WebCore/css/CSSValueKeywords.in
@@ -559,9 +559,9 @@ space
 #
 after-white-space
 
-#
-# CSS_PROP__KHTML_APPEARANCE
-#
+# -webkit-appearance
+# The order here should match the order in the ControlPart enum in ThemeTypes.h.
+# All appearance values that should be accepted by the parser should be listed between 'checkbox' and 'textarea':
 checkbox
 radio
 push-button
@@ -611,12 +611,13 @@ searchfield-results-decoration
 searchfield-results-button
 searchfield-cancel-button
 textfield
-caps-lock-indicator
 relevancy-level-indicator
 continuous-capacity-level-indicator
 discrete-capacity-level-indicator
 rating-level-indicator
 textarea
+# An appearance value that should not be accepted by the parser:
+caps-lock-indicator
 
 #
 # CSS_PROP_BORDER_IMAGE
diff --git a/WebCore/platform/ThemeTypes.h b/WebCore/platform/ThemeTypes.h
index 3567004..ec45cb7 100644
--- a/WebCore/platform/ThemeTypes.h
+++ b/WebCore/platform/ThemeTypes.h
@@ -56,9 +56,9 @@ enum ControlPart {
     SliderHorizontalPart, SliderVerticalPart, SliderThumbHorizontalPart,
     SliderThumbVerticalPart, CaretPart, SearchFieldPart, SearchFieldDecorationPart,
     SearchFieldResultsDecorationPart, SearchFieldResultsButtonPart,
-    SearchFieldCancelButtonPart, TextFieldPart, CapsLockIndicatorPart,
+    SearchFieldCancelButtonPart, TextFieldPart,
     RelevancyLevelIndicatorPart, ContinuousCapacityLevelIndicatorPart, DiscreteCapacityLevelIndicatorPart, RatingLevelIndicatorPart,
-    TextAreaPart
+    TextAreaPart, CapsLockIndicatorPart
 };
 
 enum SelectionPart {

-- 
WebKit Debian packaging