Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / base / memory / discardable_memory_emulated.h

diff --git a/src/base/memory/discardable_memory_emulated.h b/src/base/memory/discardable_memory_emulated.h
index d928513..150c1ab 100644 (file)
--- a/src/base/memory/discardable_memory_emulated.h
+++ b/src/base/memory/discardable_memory_emulated.h
@@ -17,7 +17,7 @@ class DiscardableMemoryEmulated
       public internal::DiscardableMemoryManagerAllocation {
  public:
   explicit DiscardableMemoryEmulated(size_t bytes);
-  virtual ~DiscardableMemoryEmulated();
+  ~DiscardableMemoryEmulated() override;
 
   static bool ReduceMemoryUsage();
 
@@ -31,14 +31,15 @@ class DiscardableMemoryEmulated
   bool Initialize();
 
   // Overridden from DiscardableMemory:
-  virtual DiscardableMemoryLockStatus Lock() OVERRIDE;
-  virtual void Unlock() OVERRIDE;
-  virtual void* Memory() const OVERRIDE;
+  DiscardableMemoryLockStatus Lock() override;
+  void Unlock() override;
+  void* Memory() const override;
 
   // Overridden from internal::DiscardableMemoryManagerAllocation:
-  virtual bool AllocateAndAcquireLock() OVERRIDE;
-  virtual void ReleaseLock() OVERRIDE {}
-  virtual void Purge() OVERRIDE;
+  bool AllocateAndAcquireLock() override;
+  void ReleaseLock() override {}
+  void Purge() override;
+  bool IsMemoryResident() const override;
 
  private:
   const size_t bytes_;