Title: [193752] trunk
Revision
193752
Author
o...@webkit.org
Date
2015-12-08 08:42:01 -0800 (Tue, 08 Dec 2015)

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

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (193751 => 193752)


--- trunk/LayoutTests/ChangeLog	2015-12-08 16:16:28 UTC (rev 193751)
+++ trunk/LayoutTests/ChangeLog	2015-12-08 16:42:01 UTC (rev 193752)
@@ -1,3 +1,12 @@
+2015-12-08  Csaba Osztrogonác  <o...@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....@webkit.org>
 
         [EFL][AX] Rebaseline failing AX tests since r185662

Modified: trunk/LayoutTests/platform/efl/TestExpectations (193751 => 193752)


--- trunk/LayoutTests/platform/efl/TestExpectations	2015-12-08 16:16:28 UTC (rev 193751)
+++ trunk/LayoutTests/platform/efl/TestExpectations	2015-12-08 16:42:01 UTC (rev 193752)
@@ -2693,10 +2693,6 @@
 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 ]

Modified: trunk/Source/WebKit2/ChangeLog (193751 => 193752)


--- trunk/Source/WebKit2/ChangeLog	2015-12-08 16:16:28 UTC (rev 193751)
+++ trunk/Source/WebKit2/ChangeLog	2015-12-08 16:42:01 UTC (rev 193752)
@@ -1,3 +1,13 @@
+2015-12-08  Csaba Osztrogonác  <o...@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.c...@navercorp.com>
 
         [EFL] Add API to provide preferences before creating ewk_view

Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (193751 => 193752)


--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp	2015-12-08 16:16:28 UTC (rev 193751)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp	2015-12-08 16:42:01 UTC (rev 193752)
@@ -86,6 +86,10 @@
 
 static std::chrono::milliseconds maximumBufferingTime(CachedResource* resource)
 {
+#if !ENABLE(NETWORK_CACHE)
+    return 0_ms;
+#endif
+
     if (!resource)
         return 0_ms;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to