[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 08:31:19 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 15fb577a8a9ce417a5934f9199e4bd6208fda18d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 29 22:34:46 2004 +0000

    	Make sure "auto" is allowed as a valid value when parsing rect shapes (e.g., for the clip property).
    
            Reviewed by rjw
    
            * khtml/css/cssparser.cpp:
            (CSSParser::parseShape):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/clip/016-expected.txt b/LayoutTests/fast/clip/016-expected.txt
new file mode 100644
index 0000000..bf5c975
--- /dev/null
+++ b/LayoutTests/fast/clip/016-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x34
+  RenderBlock {HTML} at (0,0) size 800x34
+    RenderBody {BODY} at (8,8) size 784x18
+      RenderText {TEXT} at (0,0) size 300x18
+        text run at (0,0) width 137: "You should see a 100"
+        text run at (137,0) width 163: "x100 green square below."
+      RenderText {TEXT} at (0,0) size 0x0
+      RenderText {TEXT} at (0,0) size 0x0
+layer at (50,50) size 100x500 backgroundClip at (50,50) size 100x100 clip at (50,50) size 100x100
+  RenderBlock (positioned) {DIV} at (50,50) size 100x500 [bgcolor=#008000]
diff --git a/LayoutTests/fast/clip/016.html b/LayoutTests/fast/clip/016.html
new file mode 100644
index 0000000..ed7e4c4
--- /dev/null
+++ b/LayoutTests/fast/clip/016.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<style>
+  #clip {position:absolute; background-color: green; top:50px; left:50px; width:100px; height:500px; clip:rect(auto auto 100px auto)}
+</style>
+</head>
+<body>
+You should see a 100x100 green square below.
+<div id="clip"></div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 122336e..895c091 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-03-29  David Hyatt  <hyatt at apple.com>
 
+	Make sure "auto" is allowed as a valid value when parsing rect shapes (e.g., for the clip property).
+	
+        Reviewed by rjw
+
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseShape):
+
+2004-03-29  David Hyatt  <hyatt at apple.com>
+
 	Followup fix.  Handle the case where a hard line break occurs right after a soft hyphen.  In this
 	case we were losing a letter of the word in addition to not rendering the soft hyphen.
 	
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 4605088..1daec8e 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1409,10 +1409,11 @@ bool CSSParser::parseShape( int propId, bool important )
     int i = 0;
     Value *a = args->current();
     while ( a ) {
-	valid = validUnit( a, FLength, strict );
+	valid = a->id == CSS_VAL_AUTO || validUnit( a, FLength, strict );
 	if ( !valid )
 	    break;
-	CSSPrimitiveValueImpl *length =
+	CSSPrimitiveValueImpl *length = a->id == CSS_VAL_AUTO ?
+            new CSSPrimitiveValueImpl(CSS_VAL_AUTO) :
 	    new CSSPrimitiveValueImpl( a->fValue, (CSSPrimitiveValue::UnitTypes) a->unit );
 	if ( i == 0 )
 	    rect->setTop( length );

-- 
WebKit Debian packaging

