Title: [186224] trunk/Source/WebKit2
- Revision
- 186224
- Author
- commit-qu...@webkit.org
- Date
- 2015-07-02 05:13:58 -0700 (Thu, 02 Jul 2015)
Log Message
Unreviewed, rolling out r185704.
https://bugs.webkit.org/show_bug.cgi?id=146544
Didn't fix the problem (Requested by anttik on #webkit).
Reverted changeset:
"~4% Membuster regression after WebKit r185452"
https://bugs.webkit.org/show_bug.cgi?id=146112
http://trac.webkit.org/changeset/185704
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186223 => 186224)
--- trunk/Source/WebKit2/ChangeLog 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-02 12:13:58 UTC (rev 186224)
@@ -1,3 +1,16 @@
+2015-07-02 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r185704.
+ https://bugs.webkit.org/show_bug.cgi?id=146544
+
+ Didn't fix the problem (Requested by anttik on #webkit).
+
+ Reverted changeset:
+
+ "~4% Membuster regression after WebKit r185452"
+ https://bugs.webkit.org/show_bug.cgi?id=146112
+ http://trac.webkit.org/changeset/185704
+
2015-07-02 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Accelerated Compositing stops working after a web process crash
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (186223 => 186224)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-02 12:13:58 UTC (rev 186224)
@@ -176,10 +176,6 @@
void NetworkProcess::lowMemoryHandler(Critical critical)
{
platformLowMemoryHandler(critical);
-#if ENABLE(NETWORK_CACHE)
- if (NetworkCache::singleton().isEnabled())
- NetworkCache::singleton().handleMemoryPressureNotification(critical);
-#endif
WTF::releaseFastMallocFreeMemory();
}
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (186223 => 186224)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-07-02 12:13:58 UTC (rev 186224)
@@ -563,16 +563,6 @@
clear(std::chrono::system_clock::time_point::min(), nullptr);
}
-void Cache::handleMemoryPressureNotification(WebCore::Critical critical)
-{
- if (critical != WebCore::Critical::Yes)
- return;
- // There can be substantial amount of memory in the write queue and we don't know how long it will take to write it out.
- // We may also be about to suspend the process.
- if (m_storage)
- m_storage->clearWriteQueue();
-}
-
String Cache::recordsPath() const
{
return m_storage ? m_storage->recordsPath() : String();
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (186223 => 186224)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-07-02 12:13:58 UTC (rev 186224)
@@ -31,7 +31,6 @@
#include "NetworkCacheEntry.h"
#include "NetworkCacheStorage.h"
#include "ShareableResource.h"
-#include <WebCore/MemoryPressureHandler.h>
#include <WebCore/ResourceResponse.h>
#include <wtf/text/WTFString.h>
@@ -104,8 +103,6 @@
void clear();
void clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler);
- void handleMemoryPressureNotification(WebCore::Critical);
-
void dumpContentsToFile();
String recordsPath() const;
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (186223 => 186224)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-07-02 12:13:58 UTC (rev 186224)
@@ -908,13 +908,6 @@
});
}
-void Storage::clearWriteQueue()
-{
- LOG(NetworkCacheStorage, "(NetworkProcess) clearing write queue");
-
- m_pendingWriteOperations.clear();
-}
-
void Storage::deleteOldVersions()
{
backgroundIOQueue().dispatch([this] {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (186223 => 186224)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-07-02 07:36:19 UTC (rev 186223)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-07-02 12:13:58 UTC (rev 186224)
@@ -80,8 +80,6 @@
// Null record signals end.
void traverse(TraverseFlags, TraverseHandler&&);
- void clearWriteQueue();
-
void setCapacity(size_t);
size_t capacity() const { return m_capacity; }
size_t approximateSize() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
