[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit a1b111fac9c07762ee5ddda682271336d2ff9a61
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 9 17:44:56 2009 +0000

    2009-11-09  Keishi Hattori  <casey.hattori at gmail.com>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: CSS syntax highlighter doesn't recognize negative numbers
            https://bugs.webkit.org/show_bug.cgi?id=31257
    
            * inspector/syntax-highlight-css-expected.txt:
            * inspector/syntax-highlight-css.html:
    2009-11-09  Keishi Hattori  <casey.hattori at gmail.com>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: CSS syntax highlighter doesn't recognize negative numbers
            https://bugs.webkit.org/show_bug.cgi?id=31257
    
            * inspector/front-end/SourceFrame.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 79a78a3..b1de815 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-09  Keishi Hattori  <casey.hattori at gmail.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: CSS syntax highlighter doesn't recognize negative numbers
+        https://bugs.webkit.org/show_bug.cgi?id=31257
+
+        * inspector/syntax-highlight-css-expected.txt:
+        * inspector/syntax-highlight-css.html:
+
 2009-11-09  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
 
         Rubber-stamped by Holger Hans Peter Freyther.
diff --git a/LayoutTests/inspector/syntax-highlight-css-expected.txt b/LayoutTests/inspector/syntax-highlight-css-expected.txt
index 3f3067d..e558ee2 100644
--- a/LayoutTests/inspector/syntax-highlight-css-expected.txt
+++ b/LayoutTests/inspector/syntax-highlight-css-expected.txt
@@ -7,5 +7,5 @@ webkit-css-at-rule,*,webkit-css-url,*,webkit-css-keyword,*,webkit-css-keyword,*
 webkit-css-at-rule,*,webkit-css-keyword,*,webkit-css-selector,*,webkit-css-property,*,webkit-css-keyword,*
 webkit-css-at-rule,*,webkit-css-property,*
 webkit-css-selector,*,webkit-css-property,*,webkit-css-keyword,*
-webkit-css-selector,*,webkit-css-property,*,webkit-css-keyword,*,webkit-css-important,*
+webkit-css-selector,*,webkit-css-property,*,webkit-css-number,*,webkit-css-important,*
 
diff --git a/LayoutTests/inspector/syntax-highlight-css.html b/LayoutTests/inspector/syntax-highlight-css.html
index de6b766..fb7217d 100644
--- a/LayoutTests/inspector/syntax-highlight-css.html
+++ b/LayoutTests/inspector/syntax-highlight-css.html
@@ -20,7 +20,7 @@ function frontend_doitAndDump() {
     result.push(frontend_dumpSyntaxHighlightCSS("@media screen { body { color: red; } }"));
     result.push(frontend_dumpSyntaxHighlightCSS("@font-face { font-family: MyHelvetica; }"));
     result.push(frontend_dumpSyntaxHighlightCSS("p { color: color; red: red; }"));
-    result.push(frontend_dumpSyntaxHighlightCSS("p { color: red !important; }"));
+    result.push(frontend_dumpSyntaxHighlightCSS("p { margin: -10px !important; }"));
     return result;
 }
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b81ee3e..fb153e2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-09  Keishi Hattori  <casey.hattori at gmail.com>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: CSS syntax highlighter doesn't recognize negative numbers
+        https://bugs.webkit.org/show_bug.cgi?id=31257
+
+        * inspector/front-end/SourceFrame.js:
+
 2009-11-09  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/front-end/SourceFrame.js b/WebCore/inspector/front-end/SourceFrame.js
index 00155fe..b8ec4ea 100644
--- a/WebCore/inspector/front-end/SourceFrame.js
+++ b/WebCore/inspector/front-end/SourceFrame.js
@@ -947,7 +947,7 @@ WebInspector.CSSSourceSyntaxHighlighter = function(table, sourceFrame) {
         action: colorAction,
         lexStateCondition: this.LexState.DeclarationValue
     }, {
-        pattern: /^(?:(?:\d+|\d*\.\d+)(?:em|rem|__qem|ex|px|cm|mm|in|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|%)?)/i,
+        pattern: /^(?:-?(?:\d+|\d*\.\d+)(?:em|rem|__qem|ex|px|cm|mm|in|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|%)?)/i,
         action: numvalueAction,
         lexStateCondition: this.LexState.DeclarationValue
     }, {

-- 
WebKit Debian packaging