Changeset 142024 in webkit

Timestamp:

Feb 6, 2013 1:11:35 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r141136): Apple's internal PLT test suite doesn't finish
​https://bugs.webkit.org/show_bug.cgi?id=108380

Reviewed by Alexey Proskuryakov.

Source/WebCore:

Re-enable the main resource cache since the regression had been fixed in r141615.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):

LayoutTests:

Re-enable tests that have been temporarily disabled.

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r141136): Apple's internal PLT test suite doesn't finish
+        https://bugs.webkit.org/show_bug.cgi?id=108380
+
+        Reviewed by Alexey Proskuryakov.
+
+        Re-enable tests that have been temporarily disabled.
+
+        * platform/mac/TestExpectations:
+
 2013-02-06  Uday Kiran  <udaykiran@motorola.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1330 +1330 @@
 webkit.org/b/108257 [ Debug ] compositing/overflow/composited-scrolling-creates-a-stacking-container.html [ Crash ]
 webkit.org/b/108257 [ Debug ] compositing/overflow/automatically-opt-into-composited-scrolling.html [ Crash ]
-
-webkit.org/b/108380 http/tests/cache/cached-main-resource.html [ Failure ]
-webkit.org/b/108380 http/tests/cache/iframe-304-crash.html [ Failure ]
-webkit.org/b/108380 http/tests/inspector/resource-har-pages.html [ Failure ]
-webkit.org/b/108380 http/tests/loading/redirect-methods.html [ Failure ]
-webkit.org/b/108380 http/tests/misc/link-rel-icon-beforeload.html [ Failure ]
-webkit.org/b/108380 http/tests/misc/favicon-loads-with-images-disabled.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-06  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r141136): Apple's internal PLT test suite doesn't finish
+        https://bugs.webkit.org/show_bug.cgi?id=108380
+
+        Reviewed by Alexey Proskuryakov.
+
+        Re-enable the main resource cache since the regression had been fixed in r141615.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::requestResource):
+
 2013-02-06  Uday Kiran  <udaykiran@motorola.com>
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -480 +480 @@
     }
 
-#if PLATFORM(CHROMIUM) || PLATFORM(MAC)
+#if PLATFORM(CHROMIUM)
     // FIXME: Temporarily leave main resource caching disabled for chromium, see https://bugs.webkit.org/show_bug.cgi?id=107962
     // Ensure main resources aren't preloaded, and other main resource loads are removed from cache to prevent reuse.
-    // FIXME: Temporarily leave main resource caching disabled on Mac port per webkit.org/b/108380 until we track down the root cause.
     if (type == CachedResource::MainResource) {
         ASSERT(policy != Use);