Changeset 193752 in webkit

Timestamp:

Dec 8, 2015 8:42:01 AM (8 years ago)

Author:

Csaba Osztrogonác

Message:

[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.

Source/WebKit2:

• WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::maximumBufferingTime): Disable caching if NETWORK_CACHE is disabled.

LayoutTests:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/platform/efl/TestExpectations

@@ -2694 +2694 @@
 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 ]

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp

@@ -87 +87 @@
 static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
 {
+#if !ENABLE(NETWORK_CACHE)
+    return 0_ms;
+#endif
+
     if (!resource)
         return 0_ms;