2011-03-10 Pratik Solanki <psolanki@apple.com>
authorpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Mar 2011 18:14:44 +0000 (18:14 +0000)
committerpsolanki@apple.com <psolanki@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Mar 2011 18:14:44 +0000 (18:14 +0000)
        Reviewed by Alexey Proskuryakov.

        ASSERT_NOT_REACHED triggered in WebCore::mapHTTPPipeliningPriorityToResourceLoadPriority
        https://bugs.webkit.org/show_bug.cgi?id=56075

        Map priority value 3, which means no priority, to ResourceLoadPriorityUnresolved.

        * platform/network/cf/ResourceRequestCFNet.h:
        (WebCore::mapHTTPPipeliningPriorityToResourceLoadPriority):
        (WebCore::mapResourceLoadPriorityToHTTPPipeliningPriority):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cf/ResourceRequestCFNet.h

index 0c5d38e..c6dba59 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-10  Pratik Solanki  <psolanki@apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        ASSERT_NOT_REACHED triggered in WebCore::mapHTTPPipeliningPriorityToResourceLoadPriority
+        https://bugs.webkit.org/show_bug.cgi?id=56075
+
+        Map priority value 3, which means no priority, to ResourceLoadPriorityUnresolved.
+
+        * platform/network/cf/ResourceRequestCFNet.h:
+        (WebCore::mapHTTPPipeliningPriorityToResourceLoadPriority):
+        (WebCore::mapResourceLoadPriorityToHTTPPipeliningPriority):
+
 2011-03-10  Andrey Adaikin  <aandrey@google.com>
 
         Reviewed by Pavel Feldman.
index 09f4cea..271dcd2 100644 (file)
@@ -50,6 +50,8 @@ inline ResourceLoadPriority mapHTTPPipeliningPriorityToResourceLoadPriority(int
         return ResourceLoadPriorityMedium;
     case 2:
         return ResourceLoadPriorityHigh;
+    case 3:
+        return ResourceLoadPriorityUnresolved;
     default:
         ASSERT_NOT_REACHED();
         return ResourceLoadPriorityLowest;
@@ -67,8 +69,7 @@ inline int mapResourceLoadPriorityToHTTPPipeliningPriority(ResourceLoadPriority
     case ResourceLoadPriorityHigh:
         return 2;
     case ResourceLoadPriorityUnresolved:
-        ASSERT_NOT_REACHED();
-        return 0;
+        return 3;
     }
 
     ASSERT_NOT_REACHED();