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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 00e3de3d796d026080b8dd1266b7f7661025c54b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 12:43:22 2010 +0000

    2010-10-14  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Canvas: "currentColor" should inherit the canvas element's color
            https://bugs.webkit.org/show_bug.cgi?id=40273
    
            Warning fix after r69755. Missing default cases added.
    
            * html/canvas/CanvasStyle.cpp:
            (WebCore::parseColorOrCurrentColor):
            (WebCore::CanvasStyle::createFromString):
            (WebCore::CanvasStyle::createFromStringWithOverrideAlpha):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cadf57f..9ab02aa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-14  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Canvas: "currentColor" should inherit the canvas element's color
+        https://bugs.webkit.org/show_bug.cgi?id=40273
+
+        Warning fix after r69755. Missing default cases added.
+
+        * html/canvas/CanvasStyle.cpp:
+        (WebCore::parseColorOrCurrentColor):
+        (WebCore::CanvasStyle::createFromString):
+        (WebCore::CanvasStyle::createFromStringWithOverrideAlpha):
+
 2010-10-14  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Rolling out r69757.
diff --git a/WebCore/html/canvas/CanvasStyle.cpp b/WebCore/html/canvas/CanvasStyle.cpp
index 5a30f63..068733f 100644
--- a/WebCore/html/canvas/CanvasStyle.cpp
+++ b/WebCore/html/canvas/CanvasStyle.cpp
@@ -82,6 +82,9 @@ bool parseColorOrCurrentColor(RGBA32& parsedColor, const String& colorString, HT
         return true;
     case ParseFailed:
         return false;
+    default:
+        ASSERT_NOT_REACHED();
+        return false;
     }
 }
 
@@ -139,6 +142,9 @@ PassRefPtr<CanvasStyle> CanvasStyle::createFromString(const String& color)
         return adoptRef(new CanvasStyle(CurrentColor));
     case ParseFailed:
         return 0;
+    default:
+        ASSERT_NOT_REACHED();
+        return 0;
     }
 }
 
@@ -153,6 +159,9 @@ PassRefPtr<CanvasStyle> CanvasStyle::createFromStringWithOverrideAlpha(const Str
         return adoptRef(new CanvasStyle(CurrentColorWithOverrideAlpha, alpha));
     case ParseFailed:
         return 0;
+    default:
+        ASSERT_NOT_REACHED();
+        return 0;
     }
 }
 

-- 
WebKit Debian packaging