Changeset 173017 in webkit

Timestamp:

Aug 27, 2014, 2:17:27 PM (11 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r172946): Plugin tests asserting on Yosemite debug bot
​https://bugs.webkit.org/show_bug.cgi?id=136301

Reviewed by Alexey Proskuryakov.

Don't pull the priority from the platform request if it is not defined.

• platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::ResourceRequest::doUpdateResourceRequest):

• platform/network/cocoa/ResourceRequestCocoa.mm:

(WebCore::ResourceRequest::doUpdateResourceRequest):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceRequestCFNet.cpp (modified) (1 diff)
• platform/network/cocoa/ResourceRequestCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-08-27  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r172946): Plugin tests asserting on Yosemite debug bot
+        https://bugs.webkit.org/show_bug.cgi?id=136301
+
+        Reviewed by Alexey Proskuryakov.
+
+        Don't pull the priority from the platform request if it is not defined.
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::ResourceRequest::doUpdateResourceRequest):
+        * platform/network/cocoa/ResourceRequestCocoa.mm:
+        (WebCore::ResourceRequest::doUpdateResourceRequest):
+
 2014-08-27  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp ¶

@@ -278 +278 @@
     m_allowCookies = CFURLRequestShouldHandleHTTPCookies(m_cfRequest.get());
 
-    if (resourcePrioritiesEnabled())
-        m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority(m_cfRequest.get()));
+    if (resourcePrioritiesEnabled()) {
+        auto priority = toResourceLoadPriority(wkGetHTTPRequestPriority(m_cfRequest.get()));
+        if (priority > ResourceLoadPriorityUnresolved)
+            m_priority = priority;
+    }
 
     m_httpHeaderFields.clear();

trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm ¶

@@ -79 +79 @@
     m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies];
 
-    if (ResourceRequest::resourcePrioritiesEnabled())
-        m_priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
+    if (resourcePrioritiesEnabled()) {
+        auto priority = toResourceLoadPriority(wkGetHTTPRequestPriority([m_nsRequest.get() _CFURLRequest]));
+        if (priority > ResourceLoadPriorityUnresolved)
+            m_priority = priority;
+    }
 
     NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields];