Title: [181225] releases/WebKitGTK/webkit-2.8/Source/bmalloc
- Revision
- 181225
- Author
- carlo...@webkit.org
- Date
- 2015-03-08 00:49:54 -0800 (Sun, 08 Mar 2015)
Log Message
Merge r180964 - bmalloc: Don't branch when setting the owner of a large object
https://bugs.webkit.org/show_bug.cgi?id=142241
Reviewed by Andreas Kling.
* bmalloc/BoundaryTag.h:
(bmalloc::BoundaryTag::owner):
(bmalloc::BoundaryTag::setOwner):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog (181224 => 181225)
--- releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog 2015-03-08 08:47:22 UTC (rev 181224)
+++ releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog 2015-03-08 08:49:54 UTC (rev 181225)
@@ -1,5 +1,16 @@
2015-03-03 Geoffrey Garen <gga...@apple.com>
+ bmalloc: Don't branch when setting the owner of a large object
+ https://bugs.webkit.org/show_bug.cgi?id=142241
+
+ Reviewed by Andreas Kling.
+
+ * bmalloc/BoundaryTag.h:
+ (bmalloc::BoundaryTag::owner):
+ (bmalloc::BoundaryTag::setOwner):
+
+2015-03-03 Geoffrey Garen <gga...@apple.com>
+
bmalloc: Miscellaneous cleanup
https://bugs.webkit.org/show_bug.cgi?id=142231
Modified: releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BoundaryTag.h (181224 => 181225)
--- releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BoundaryTag.h 2015-03-08 08:47:22 UTC (rev 181224)
+++ releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BoundaryTag.h 2015-03-08 08:49:54 UTC (rev 181225)
@@ -50,8 +50,8 @@
bool isEnd() { return m_isEnd; }
void setEnd(bool isEnd) { m_isEnd = isEnd; }
- Owner owner() { return m_ownerIsHeap ? Owner::Heap : Owner::VMHeap; }
- void setOwner(Owner owner) { m_ownerIsHeap = (owner == Owner::Heap); }
+ Owner owner() { return static_cast<Owner>(m_owner); }
+ void setOwner(Owner owner) { m_owner = static_cast<unsigned>(owner); }
bool isMarked() { return m_isMarked; }
void setMarked(bool isMarked) { m_isMarked = isMarked; }
@@ -85,7 +85,7 @@
bool m_isFree: 1;
bool m_isEnd: 1;
- bool m_ownerIsHeap: 1;
+ unsigned m_owner: 1;
bool m_isMarked: 1;
unsigned m_compactBegin: compactBeginBits;
unsigned m_size: sizeBits;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
