Title: [138672] branches/chromium/1364
- Revision
- 138672
- Author
- simon...@chromium.org
- Date
- 2013-01-02 15:56:48 -0800 (Wed, 02 Jan 2013)
Log Message
Revert 129070
> [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.
>
TBR=simon...@chromium.org
Review URL: https://codereview.chromium.org/11759004
Modified Paths
Removed Paths
Diff
Deleted: branches/chromium/1364/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt (138671 => 138672)
--- branches/chromium/1364/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt 2013-01-02 23:56:13 UTC (rev 138671)
+++ branches/chromium/1364/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt 2013-01-02 23:56:48 UTC (rev 138672)
@@ -1,18 +0,0 @@
-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: branches/chromium/1364/Source/WebCore/loader/ResourceLoadScheduler.cpp (138671 => 138672)
--- branches/chromium/1364/Source/WebCore/loader/ResourceLoadScheduler.cpp 2013-01-02 23:56:13 UTC (rev 138671)
+++ branches/chromium/1364/Source/WebCore/loader/ResourceLoadScheduler.cpp 2013-01-02 23:56:48 UTC (rev 138672)
@@ -42,11 +42,7 @@
#include <wtf/TemporaryChange.h>
#include <wtf/text/CString.h>
-#if PLATFORM(CHROMIUM)
-#define REQUEST_MANAGEMENT_ENABLED 0
-#else
#define REQUEST_MANAGEMENT_ENABLED 1
-#endif
namespace WebCore {
Modified: branches/chromium/1364/Source/WebCore/loader/cache/CachedResourceLoader.cpp (138671 => 138672)
--- branches/chromium/1364/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-01-02 23:56:13 UTC (rev 138671)
+++ branches/chromium/1364/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2013-01-02 23:56:48 UTC (rev 138672)
@@ -796,7 +796,7 @@
UNUSED_PARAM(referencedFromBody);
bool delaySubresourceLoad = true;
-#if PLATFORM(IOS) || PLATFORM(CHROMIUM)
+#if PLATFORM(IOS)
delaySubresourceLoad = false;
#endif
if (delaySubresourceLoad) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
