[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d7f5436e21fb49cb1e5cbd58d742216bb201c8a1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 28 22:14:38 2010 +0000

    2010-12-28  Takashi Toyoshima  <toyoshim at google.com>
    
            Reviewed by Eric Seidel.
    
            gcc detected 'control reaches end of non-void function' with
            -finstrument-functions option.
            https://bugs.webkit.org/show_bug.cgi?id=51669
    
            No new tests. These fixes are trivial.
    
            * dom/Element.cpp:
            (WebCore::Element::childTypeAllowed):
            * inspector/InspectorResourceAgent.cpp:
            (WebCore::cachedResourceTypeString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b033e5b..354a835 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-28  Takashi Toyoshima  <toyoshim at google.com>
+
+        Reviewed by Eric Seidel.
+
+        gcc detected 'control reaches end of non-void function' with
+        -finstrument-functions option.
+        https://bugs.webkit.org/show_bug.cgi?id=51669
+
+        No new tests. These fixes are trivial.
+
+        * dom/Element.cpp:
+        (WebCore::Element::childTypeAllowed):
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::cachedResourceTypeString):
+
 2010-12-28  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index a7cd7ba..9b4578f 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -1112,17 +1112,17 @@ void Element::removeShadowRoot()
 bool Element::childTypeAllowed(NodeType type)
 {
     switch (type) {
-        case ELEMENT_NODE:
-        case TEXT_NODE:
-        case COMMENT_NODE:
-        case PROCESSING_INSTRUCTION_NODE:
-        case CDATA_SECTION_NODE:
-        case ENTITY_REFERENCE_NODE:
-            return true;
-            break;
-        default:
-            return false;
+    case ELEMENT_NODE:
+    case TEXT_NODE:
+    case COMMENT_NODE:
+    case PROCESSING_INSTRUCTION_NODE:
+    case CDATA_SECTION_NODE:
+    case ENTITY_REFERENCE_NODE:
+        return true;
+    default:
+        break;
     }
+    return false;
 }
 
 static void checkForSiblingStyleChanges(Element* e, RenderStyle* style, bool finishedParsingCallback,
diff --git a/WebCore/inspector/InspectorResourceAgent.cpp b/WebCore/inspector/InspectorResourceAgent.cpp
index 8f54578..9fc562c 100644
--- a/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/WebCore/inspector/InspectorResourceAgent.cpp
@@ -237,7 +237,6 @@ static String cachedResourceTypeString(const CachedResource& cachedResource)
     switch (cachedResource.type()) {
     case CachedResource::ImageResource:
         return "Image";
-        break;
     case CachedResource::FontResource:
         return "Font";
     case CachedResource::CSSStyleSheet:
@@ -249,8 +248,9 @@ static String cachedResourceTypeString(const CachedResource& cachedResource)
     case CachedResource::Script:
         return "Script";
     default:
-        return "Other";
+        break;
     }
+    return "Other";
 }
 
 static PassRefPtr<InspectorObject> buildObjectForCachedResource(DocumentLoader* loader, const CachedResource& cachedResource)

-- 
WebKit Debian packaging