[EFL] REGRESSION(r173394): MiniBrowser stucked in an infinite loop if NETWORK_CACHE...
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Dec 2015 16:42:01 +0000 (16:42 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Dec 2015 16:42:01 +0000 (16:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137692

Reviewed by Darin Adler.

Source/WebKit2:

* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::maximumBufferingTime): Disable caching if NETWORK_CACHE is disabled.

LayoutTests:

* platform/efl/TestExpectations: Unskip now passing tests.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@193752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/efl/TestExpectations
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp

index 403f2dd..2d95d84 100644 (file)
@@ -1,3 +1,12 @@
+2015-12-08  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] REGRESSION(r173394): MiniBrowser stucked in an infinite loop if NETWORK_CACHE is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=137692
+
+        Reviewed by Darin Adler.
+
+        * platform/efl/TestExpectations: Unskip now passing tests.
+
 2015-12-08  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 
         [EFL][AX] Rebaseline failing AX tests since r185662
index a77d4ca..7e12b7b 100644 (file)
@@ -2693,10 +2693,6 @@ css2.1/tables/table-anonymous-objects-206.xht [ Missing ]
 css2.1/tables/table-anonymous-objects-207.xht [ Missing ]
 css2.1/tables/table-anonymous-objects-208.xht [ Missing ]
 
-# EFL layout test has been broken since r192796. SKip web-platform-tests until fixing this problem.
-# http://trac.webkit.org/changeset/192796
-Bug(EFL) imported/w3c/web-platform-tests [ Skip ]
-
 webkit.org/b/151943 imported/blink/editing/execCommand/4128080-2.html [ Failure ]
 webkit.org/b/151943 imported/blink/fast/events/click-with-large-negative-text-indent.html [ Failure ]
 webkit.org/b/151943 imported/blink/fast/replaced/image-map-alt-content.html [ Failure ]
index dc57988..ffac503 100644 (file)
@@ -1,3 +1,13 @@
+2015-12-08  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        [EFL] REGRESSION(r173394): MiniBrowser stucked in an infinite loop if NETWORK_CACHE is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=137692
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::maximumBufferingTime): Disable caching if NETWORK_CACHE is disabled.
+
 2015-12-08  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [EFL] Add API to provide preferences before creating ewk_view
index c76e718..8788389 100644 (file)
@@ -86,6 +86,10 @@ RefPtr<NetscapePlugInStreamLoader> WebLoaderStrategy::schedulePluginStreamLoad(F
 
 static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
 {
+#if !ENABLE(NETWORK_CACHE)
+    return 0_ms;
+#endif
+
     if (!resource)
         return 0_ms;