Update To 11.40.268.0

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

diff --git a/src/base/memory/discardable_memory_ashmem.h b/src/base/memory/discardable_memory_ashmem.h
index 8436f5d..c1cc077 100644 (file)
--- a/src/base/memory/discardable_memory_ashmem.h
+++ b/src/base/memory/discardable_memory_ashmem.h
@@ -30,14 +30,15 @@ class DiscardableMemoryAshmem
   bool Initialize();
 
   // Overridden from DiscardableMemory:
-  virtual DiscardableMemoryLockStatus Lock() OVERRIDE;
-  virtual void Unlock() OVERRIDE;
-  virtual void* Memory() const OVERRIDE;
+  virtual DiscardableMemoryLockStatus Lock() override;
+  virtual void Unlock() override;
+  virtual void* Memory() const override;
 
   // Overridden from internal::DiscardableMemoryManagerAllocation:
-  virtual bool AllocateAndAcquireLock() OVERRIDE;
-  virtual void ReleaseLock() OVERRIDE;
-  virtual void Purge() OVERRIDE;
+  virtual bool AllocateAndAcquireLock() override;
+  virtual void ReleaseLock() override;
+  virtual void Purge() override;
+  virtual bool IsMemoryResident() const override;
 
  private:
   const size_t bytes_;