EFL build fix after r180797.

* bmalloc/BoundaryTag.h:
(bmalloc::BoundaryTag::owner):
(bmalloc::BoundaryTag::setOwner):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index fdac3724d0f18eb5481607c5090e3df6db99916d..82abcb63de8ce3e8aedd10bd7f892b81bed0e8a5 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        EFL build fix after r180797.
+
+        * bmalloc/BoundaryTag.h:
+        (bmalloc::BoundaryTag::owner):
+        (bmalloc::BoundaryTag::setOwner):
+
 2015-02-27  Geoffrey Garen  <ggaren@apple.com>
 
         bmalloc: Pathological madvise churn on the free(malloc(x)) benchmark

diff --git a/Source/bmalloc/bmalloc/BoundaryTag.h b/Source/bmalloc/bmalloc/BoundaryTag.h
index 408a4fa49e25cf75ddafb55cc615cffa669be387..4c293400b6a4a5249aff7667cbc8e6391579963d 100644 (file)
--- a/Source/bmalloc/bmalloc/BoundaryTag.h
+++ b/Source/bmalloc/bmalloc/BoundaryTag.h
@@ -50,8 +50,8 @@ public:
     bool isEnd() { return m_isEnd; }
     void setEnd(bool isEnd) { m_isEnd = isEnd; }
 
-    Owner owner() { return m_owner; }
-    void setOwner(Owner owner) { m_owner = owner; }
+    Owner owner() { return m_ownerIsHeap ? Owner::Heap : Owner::VMHeap; }
+    void setOwner(Owner owner) { m_ownerIsHeap = (owner == Owner::VMHeap); }
     
     bool isMarked() { return m_isMarked; }
     void setMarked(bool isMarked) { m_isMarked = isMarked; }
@@ -85,7 +85,7 @@ private:
 
     bool m_isFree: 1;
     bool m_isEnd: 1;
-    Owner m_owner: 1;
+    bool m_ownerIsHeap: 1;
     bool m_isMarked: 1;
     unsigned m_compactBegin: compactBeginBits;
     unsigned m_size: sizeBits;