Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1109)

Unified Diff: third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h

Issue 1787973002: Replace blink::WebDiscardableMemory with base::DiscardableMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing OwnPtr/PassOwnPtr includes in SharedBufferTest Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h
diff --git a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h
index 7b7efbb03e146d90bc9c62835126da45cd6ea048..5088643c50c5ce0b7d0cbded266a91af489436ce 100644
--- a/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h
+++ b/third_party/WebKit/Source/platform/testing/TestingPlatformSupport.h
@@ -34,7 +34,6 @@
#include "platform/PlatformExport.h"
#include "public/platform/Platform.h"
#include "public/platform/WebCompositorSupport.h"
-#include "public/platform/WebDiscardableMemory.h"
#include "public/platform/WebScheduler.h"
#include "public/platform/WebThread.h"
#include "wtf/Vector.h"
@@ -46,22 +45,6 @@ class TestingPlatformMockWebThread;
class WebCompositorSupport;
class WebThread;
-class TestingDiscardableMemory : public WebDiscardableMemory {
-public:
- explicit TestingDiscardableMemory(size_t);
- ~TestingDiscardableMemory() override;
-
- // WebDiscardableMemory:
- bool lock() override;
- void* data() override;
- void unlock() override;
- WebMemoryAllocatorDump* createMemoryAllocatorDump(const WebString& name, WebProcessMemoryDump*) const override;
-
-private:
- Vector<char> m_data;
- bool m_isLocked;
-};
-
class TestingCompositorSupport : public WebCompositorSupport {
};
@@ -99,12 +82,7 @@ class TestingPlatformSupport : public Platform {
WTF_MAKE_NONCOPYABLE(TestingPlatformSupport);
public:
struct Config {
- Config()
- : hasDiscardableMemorySupport(false)
- , compositorSupport(nullptr) { }
-
- bool hasDiscardableMemorySupport;
- WebCompositorSupport* compositorSupport;
+ WebCompositorSupport* compositorSupport = nullptr;
};
TestingPlatformSupport();
@@ -113,7 +91,6 @@ public:
~TestingPlatformSupport() override;
// Platform:
- WebDiscardableMemory* allocateAndLockDiscardableMemory(size_t bytes) override;
WebString defaultLocale() override;
WebCompositorSupport* compositorSupport() override;
WebThread* currentThread() override;

Powered by Google App Engine
This is Rietveld 408576698