Title: [129070] trunk
- Revision
- 129070
- Author
- simon...@chromium.org
- Date
- 2012-09-19 16:53:31 -0700 (Wed, 19 Sep 2012)
Log Message
[Chromium] Disable resource load scheduling
https://bugs.webkit.org/show_bug.cgi?id=97131
Reviewed by Nate Chapin.
Source/WebCore:
We'll use Chrome's network stack for scheduling instead.
No new tests.
* loader/ResourceLoadScheduler.cpp:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::preload):
LayoutTests:
The preload scanner loads resources sooner and these tests are affected.
* platform/chromium/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt: Added.
* platform/chromium/http/tests/inspector/network/network-initiator-expected.txt: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (129069 => 129070)
--- trunk/LayoutTests/ChangeLog 2012-09-19 23:49:55 UTC (rev 129069)
+++ trunk/LayoutTests/ChangeLog 2012-09-19 23:53:31 UTC (rev 129070)
@@ -1,3 +1,15 @@
+2012-09-19 James Simonsen <simon...@chromium.org>
+
+ [Chromium] Disable resource load scheduling
+ https://bugs.webkit.org/show_bug.cgi?id=97131
+
+ Reviewed by Nate Chapin.
+
+ The preload scanner loads resources sooner and these tests are affected.
+
+ * platform/chromium/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt: Added.
+ * platform/chromium/http/tests/inspector/network/network-initiator-expected.txt: Added.
+
2012-09-19 Dirk Pranke <dpra...@chromium.org>
fix MISSING after TestExpectations conversion
Added: trunk/LayoutTests/platform/chromium/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt (0 => 129070)
--- trunk/LayoutTests/platform/chromium/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error-expected.txt 2012-09-19 23:53:31 UTC (rev 129070)
@@ -0,0 +1,19 @@
+Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Testing value of 'disabled' prior to load just after setting them
+PASS mainSheetLink.sheet is non-null.
+FAIL alternateSheetLink.sheet should be null. Was [object CSSStyleSheet].
+PASS mainSheetLink.disabled is true
+PASS alternateSheetLink.disabled is false
+Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)
+PASS mainSheetLink.sheet is non-null.
+PASS alternateSheetLink.sheet is non-null.
+PASS mainSheetLink.disabled is true
+PASS alternateSheetLink.disabled is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt (0 => 129070)
--- trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt 2012-09-19 23:53:31 UTC (rev 129070)
@@ -0,0 +1,18 @@
+CONSOLE MESSAGE: line 34: Done.
+Tests resources initiator for images initiated by IMG tag, static CSS, CSS class added from _javascript_ and XHR.
+
+Bug 65105
+This div has background image set from CSS.
+This div will have background image set from _javascript_.
+Page reloaded.
+http://127.0.0.1:8000/inspector/network/resources/initiator.css: parser
+ http://127.0.0.1:8000/inspector/network/network-initiator.html 3
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=100: parser
+ http://127.0.0.1:8000/inspector/network/network-initiator.html 4
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=200: parser
+ http://127.0.0.1:8000/inspector/network/network-initiator.html 108
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: script
+ addClassToDivStep2 http://127.0.0.1:8000/inspector/network/network-initiator.html 17
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: script
+ loadData http://127.0.0.1:8000/inspector/network/network-initiator.html 29
+
Modified: trunk/Source/WebCore/ChangeLog (129069 => 129070)
--- trunk/Source/WebCore/ChangeLog 2012-09-19 23:49:55 UTC (rev 129069)
+++ trunk/Source/WebCore/ChangeLog 2012-09-19 23:53:31 UTC (rev 129070)
@@ -1,3 +1,18 @@
+2012-09-19 James Simonsen <simon...@chromium.org>
+
+ [Chromium] Disable resource load scheduling
+ https://bugs.webkit.org/show_bug.cgi?id=97131
+
+ Reviewed by Nate Chapin.
+
+ We'll use Chrome's network stack for scheduling instead.
+
+ No new tests.
+
+ * loader/ResourceLoadScheduler.cpp:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::preload):
+
2012-09-19 Dan Bernstein <m...@apple.com>
When kerning is enabled, word spacing is doubly accounted for in RenderText::computePreferredLogicalWidths
Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (129069 => 129070)
--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-09-19 23:49:55 UTC (rev 129069)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2012-09-19 23:53:31 UTC (rev 129070)
@@ -39,7 +39,11 @@
#include <wtf/MainThread.h>
#include <wtf/text/CString.h>
+#if PLATFORM(CHROMIUM)
+#define REQUEST_MANAGEMENT_ENABLED 0
+#else
#define REQUEST_MANAGEMENT_ENABLED 1
+#endif
namespace WebCore {
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (129069 => 129070)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-09-19 23:49:55 UTC (rev 129069)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2012-09-19 23:53:31 UTC (rev 129070)
@@ -733,7 +733,7 @@
UNUSED_PARAM(referencedFromBody);
bool delaySubresourceLoad = true;
-#if PLATFORM(IOS)
+#if PLATFORM(IOS) || PLATFORM(CHROMIUM)
delaySubresourceLoad = false;
#endif
if (delaySubresourceLoad) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
