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

Wed Dec 22 12:54:00 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 5b8a973fad2bd79e4ac7e14fdd313dac593bbfad
Author: justin.garcia at apple.com <justin.garcia at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 1 06:14:02 2010 +0000

    WebCore: https://bugs.webkit.org/show_bug.cgi?id=44915
    Need to handle CSSValueAuto in CSSPrimitiveValue::operator ETextAlign()
    
    Reviewed by Dan Bernstein.
    
    * css/CSSPrimitiveValueMappings.h:
    (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Map TAAUTO to -webkit-auto.  "auto" is
    not a valid text-align value.  We use TAAUTO internally for the nameless value that acts
    as left if direction:ltr and right for direction:rtl.
    
    LayoutTests: https://bugs.webkit.org/show_bug.cgi?id=44915
    Need to handle CSSValueAuto in CSSPrimitiveValue::operator ETextAlign()
    
    Reviewed by Dan Bernstein.
    
    * fast/css/text-align-webkit-auto-expected.txt: Added.
    * fast/css/text-align-webkit-auto.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8a7fa03..9799d92 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Justin Garcia  <justin.garcia at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44915
+        Need to handle CSSValueAuto in CSSPrimitiveValue::operator ETextAlign()
+
+        * fast/css/text-align-webkit-auto-expected.txt: Added.
+        * fast/css/text-align-webkit-auto.html: Added.
+
 2010-08-31  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/editing/execCommand/copy-without-selection-expected.txt b/LayoutTests/fast/css/text-align-webkit-auto-expected.txt
similarity index 100%
copy from LayoutTests/editing/execCommand/copy-without-selection-expected.txt
copy to LayoutTests/fast/css/text-align-webkit-auto-expected.txt
diff --git a/LayoutTests/fast/css/text-align-webkit-auto.html b/LayoutTests/fast/css/text-align-webkit-auto.html
new file mode 100644
index 0000000..250365c
--- /dev/null
+++ b/LayoutTests/fast/css/text-align-webkit-auto.html
@@ -0,0 +1,17 @@
+<head>
+<script>
+function runTest() {
+    if (window.layoutTestController)
+        window.layoutTestController.dumpAsText();
+        
+    var textAlign = window.getComputedStyle(document.getElementById("div")).textAlign;
+    if (textAlign == "-webkit-auto")
+        document.body.innerText = "SUCCESS";
+    else
+        document.body.innerText = "FAILURE.  text-align was " + textAlign + ", it should have been -webkit-auto";   
+}
+</script>
+</head>
+<body onLoad="runTest();">
+<div id="div" style="direction:rtl;">test</div>
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 54cc4b7..b9e5da8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-31  Justin Garcia  <justin.garcia at apple.com>
+
+        Reviewed by Dan Bernstein.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=44915
+        Need to handle CSSValueAuto in CSSPrimitiveValue::operator ETextAlign()
+        
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Map TAAUTO to -webkit-auto.  "auto" is
+        not a valid text-align value.  We use TAAUTO internally for the nameless value that acts
+        as left if direction:ltr and right for direction:rtl.
+
 2010-08-31  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index 1cebf39..3da5cf6 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -1611,7 +1611,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAlign e)
 {
     switch (e) {
         case TAAUTO:
-            m_value.ident = CSSValueAuto;
+            m_value.ident = CSSValueWebkitAuto;
             break;
         case LEFT:
             m_value.ident = CSSValueLeft;

-- 
WebKit Debian packaging

