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

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8b64853605afcb5cbe6b90ba790dc35c05e92280
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 22:02:31 2010 +0000

    2010-09-29  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Eric Seidel.
    
            Assertion failed when accessing -webkit-margin-top-collapse via computed style.
            https://bugs.webkit.org/show_bug.cgi?id=46798
    
            There was a switch statement which missed enum entries in getPropertyCSSValue().
            This change added these entries to prevent the leak.
            It also added extra case statements to encourage the compiler's help.
    
            Test: fast/css/getComputedStyle/margin-top-bottom-collapse-alias.html
    
            * css/CSSComputedStyleDeclaration.cpp:
            (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
    2010-09-29  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Eric Seidel.
    
            Assertion failed when accessing -webkit-margin-top-collapse via computed style.
            https://bugs.webkit.org/show_bug.cgi?id=46798
    
            * fast/css/getComputedStyle/margin-top-bottom-collapse-alias-expected.txt: Added.
            * fast/css/getComputedStyle/margin-top-bottom-collapse-alias.html: Added.
            * fast/css/getComputedStyle/script-tests/margin-top-bottom-collapse-alias.js: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68690 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 556a7e0..6f99c12 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-29  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Eric Seidel.
+
+        Assertion failed when accessing -webkit-margin-top-collapse via computed style.
+        https://bugs.webkit.org/show_bug.cgi?id=46798
+
+        * fast/css/getComputedStyle/margin-top-bottom-collapse-alias-expected.txt: Added.
+        * fast/css/getComputedStyle/margin-top-bottom-collapse-alias.html: Added.
+        * fast/css/getComputedStyle/script-tests/margin-top-bottom-collapse-alias.js: Added.
+
 2010-09-29  Stephen White  <senorblanco at chromium.org>
 
         Unreviewed; updated test results.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe84988..16f11d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-29  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Eric Seidel.
+
+        Assertion failed when accessing -webkit-margin-top-collapse via computed style.
+        https://bugs.webkit.org/show_bug.cgi?id=46798
+        
+        There was a switch statement which missed enum entries in getPropertyCSSValue().
+        This change added these entries to prevent the leak.
+        It also added extra case statements to encourage the compiler's help.
+
+        Test: fast/css/getComputedStyle/margin-top-bottom-collapse-alias.html
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
 2010-09-29  Chris Rogers  <crogers at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index e50e190..d6490ac 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -1363,8 +1363,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         case CSSPropertyWebkitFontSizeDelta:
             // Not a real style property -- used by the editing engine -- so has no computed value.
             break;
+        case CSSPropertyWebkitMarginBottomCollapse:
         case CSSPropertyWebkitMarginAfterCollapse:
             return CSSPrimitiveValue::create(style->marginAfterCollapse());
+        case CSSPropertyWebkitMarginTopCollapse:
         case CSSPropertyWebkitMarginBeforeCollapse:
             return CSSPrimitiveValue::create(style->marginBeforeCollapse());
         case CSSPropertyWebkitPerspective:
@@ -1572,10 +1574,47 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
         case CSSPropertyWebkitVariableDeclarationBlock:
             break;
 #if ENABLE(SVG)
-        // FIXME: This default case ruins the point of using an enum for
-        // properties -- it prevents us from getting a warning when we
-        // forget to list a property above.
-        default:
+        case CSSPropertyClipPath:
+        case CSSPropertyClipRule:
+        case CSSPropertyMask:
+        case CSSPropertyEnableBackground:
+        case CSSPropertyFilter:
+        case CSSPropertyFloodColor:
+        case CSSPropertyFloodOpacity:
+        case CSSPropertyLightingColor:
+        case CSSPropertyStopColor:
+        case CSSPropertyStopOpacity:
+        case CSSPropertyColorInterpolation:
+        case CSSPropertyColorInterpolationFilters:
+        case CSSPropertyColorProfile:
+        case CSSPropertyColorRendering:
+        case CSSPropertyFill:
+        case CSSPropertyFillOpacity:
+        case CSSPropertyFillRule:
+        case CSSPropertyImageRendering:
+        case CSSPropertyMarker:
+        case CSSPropertyMarkerEnd:
+        case CSSPropertyMarkerMid:
+        case CSSPropertyMarkerStart:
+        case CSSPropertyShapeRendering:
+        case CSSPropertyStroke:
+        case CSSPropertyStrokeDasharray:
+        case CSSPropertyStrokeDashoffset:
+        case CSSPropertyStrokeLinecap:
+        case CSSPropertyStrokeLinejoin:
+        case CSSPropertyStrokeMiterlimit:
+        case CSSPropertyStrokeOpacity:
+        case CSSPropertyStrokeWidth:
+        case CSSPropertyAlignmentBaseline:
+        case CSSPropertyBaselineShift:
+        case CSSPropertyDominantBaseline:
+        case CSSPropertyGlyphOrientationHorizontal:
+        case CSSPropertyGlyphOrientationVertical:
+        case CSSPropertyKerning:
+        case CSSPropertyTextAnchor:
+        case CSSPropertyVectorEffect:
+        case CSSPropertyWritingMode:
+        case CSSPropertyWebkitSvgShadow:
             return getSVGPropertyCSSValue(propertyID, DoNotUpdateLayout);
 #endif
     }

-- 
WebKit Debian packaging