Title: [173017] trunk/Source/WebCore
- Revision
- 173017
- Author
- an...@apple.com
- Date
- 2014-08-27 14:17:27 -0700 (Wed, 27 Aug 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173016 => 173017)
--- trunk/Source/WebCore/ChangeLog 2014-08-27 20:31:35 UTC (rev 173016)
+++ trunk/Source/WebCore/ChangeLog 2014-08-27 21:17:27 UTC (rev 173017)
@@ -1,3 +1,17 @@
+2014-08-27 Antti Koivisto <an...@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 <timo...@apple.com>
Web Inspector: Crash when you open Web Inspector in a private window (due to IndexedDB)
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (173016 => 173017)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-08-27 20:31:35 UTC (rev 173016)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-08-27 21:17:27 UTC (rev 173017)
@@ -277,8 +277,11 @@
}
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();
if (CFDictionaryRef headers = CFURLRequestCopyAllHTTPHeaderFields(m_cfRequest.get())) {
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (173016 => 173017)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-08-27 20:31:35 UTC (rev 173016)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-08-27 21:17:27 UTC (rev 173017)
@@ -78,8 +78,11 @@
m_httpMethod = method;
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];
NSEnumerator *e = [headers keyEnumerator];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
