Title: [121231] trunk/Source/WebCore
- Revision
- 121231
- Author
- psola...@apple.com
- Date
- 2012-06-25 23:05:25 -0700 (Mon, 25 Jun 2012)
Log Message
_javascript_ resources have low priority when SVG is enabled
https://bugs.webkit.org/show_bug.cgi?id=89932
<rdar://problem/11741325>
Reviewed by Adele Peterson.
r108785 inadvertently lowered the priority of _javascript_ resources. Fix the code so we set
the correct priority for scripts. Also, move the code so that all ifdefs are together at the
bottom to make it a bit easier to read..
* loader/cache/CachedResource.cpp:
(WebCore::defaultPriorityForResourceType):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121230 => 121231)
--- trunk/Source/WebCore/ChangeLog 2012-06-26 05:32:44 UTC (rev 121230)
+++ trunk/Source/WebCore/ChangeLog 2012-06-26 06:05:25 UTC (rev 121231)
@@ -1,3 +1,18 @@
+2012-06-25 Pratik Solanki <psola...@apple.com>
+
+ _javascript_ resources have low priority when SVG is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=89932
+ <rdar://problem/11741325>
+
+ Reviewed by Adele Peterson.
+
+ r108785 inadvertently lowered the priority of _javascript_ resources. Fix the code so we set
+ the correct priority for scripts. Also, move the code so that all ifdefs are together at the
+ bottom to make it a bit easier to read..
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::defaultPriorityForResourceType):
+
2012-06-25 Luke Macpherson <macpher...@chromium.org>
Add runtime flag to enable/disable CSS variables (in addition to existing compile-time flag).
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (121230 => 121231)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-06-26 05:32:44 UTC (rev 121230)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2012-06-26 06:05:25 UTC (rev 121231)
@@ -56,20 +56,21 @@
{
switch (type) {
case CachedResource::CSSStyleSheet:
+ return ResourceLoadPriorityHigh;
+ case CachedResource::Script:
+ case CachedResource::FontResource:
+ case CachedResource::RawResource:
+ return ResourceLoadPriorityMedium;
+ case CachedResource::ImageResource:
+ return ResourceLoadPriorityLow;
#if ENABLE(XSLT)
case CachedResource::XSLStyleSheet:
+ return ResourceLoadPriorityHigh;
#endif
- return ResourceLoadPriorityHigh;
- case CachedResource::Script:
#if ENABLE(SVG)
case CachedResource::SVGDocumentResource:
return ResourceLoadPriorityLow;
#endif
- case CachedResource::FontResource:
- case CachedResource::RawResource:
- return ResourceLoadPriorityMedium;
- case CachedResource::ImageResource:
- return ResourceLoadPriorityLow;
#if ENABLE(LINK_PREFETCH)
case CachedResource::LinkPrefetch:
return ResourceLoadPriorityVeryLow;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes