Merge latest Skia into master (1 commits)
https://skia.googlesource.com/skia.git/+log/412a86d..1517224
Test: Presubmit checks will test this change.
Change-Id: I6db178eca9e96e31b30bf5786df45a75e2da22f5
diff --git a/src/core/SkArenaAlloc.cpp b/src/core/SkArenaAlloc.cpp
index 03ab9fa..d6c249b 100644
--- a/src/core/SkArenaAlloc.cpp
+++ b/src/core/SkArenaAlloc.cpp
@@ -12,21 +12,15 @@
char* operator()(char* objEnd, ptrdiff_t size) { return objEnd + size; }
};
-struct SkArenaAlloc::NextBlock {
- char* operator()(char* objEnd, ptrdiff_t size) {
- ResetBlock(objEnd + size);
- delete [] objEnd;
- return nullptr;
- }
+struct NextBlock {
+ char* operator()(char* objEnd, ptrdiff_t size) { delete [] objEnd; return objEnd + size; }
};
SkArenaAlloc::SkArenaAlloc(char* block, size_t size, size_t extraSize)
- : fDtorCursor {block}
- , fCursor {block}
- , fEnd {block + size}
- , fFirstBlock {block}
- , fFirstSize {size}
- , fExtraSize {extraSize}
+ : fDtorCursor{block}
+ , fCursor {block}
+ , fEnd {block + size}
+ , fExtraSize {extraSize}
{
if (size < sizeof(Footer)) {
fEnd = fCursor = fDtorCursor = nullptr;
@@ -38,12 +32,16 @@
}
SkArenaAlloc::~SkArenaAlloc() {
- ResetBlock(fDtorCursor);
+ this->reset();
}
void SkArenaAlloc::reset() {
- this->~SkArenaAlloc();
- new (this) SkArenaAlloc{fFirstBlock, fFirstSize, fExtraSize};
+ Footer f;
+ memmove(&f, fDtorCursor - sizeof(Footer), sizeof(Footer));
+ char* releaser = fDtorCursor;
+ while (releaser != nullptr) {
+ releaser = this->callFooterAction(releaser);
+ }
}
void SkArenaAlloc::installFooter(FooterAction* releaser, ptrdiff_t padding) {
@@ -56,6 +54,8 @@
Footer footer = (Footer)(footerData);
memmove(fCursor, &footer, sizeof(Footer));
+ Footer check;
+ memmove(&check, fCursor, sizeof(Footer));
fCursor += sizeof(Footer);
fDtorCursor = fCursor;
}
@@ -104,7 +104,7 @@
char* SkArenaAlloc::allocObjectWithFooter(size_t sizeIncludingFooter, size_t alignment) {
size_t mask = alignment - 1;
-restart:
+ restart:
size_t skipOverhead = 0;
bool needsSkipFooter = fCursor != fDtorCursor;
if (needsSkipFooter) {
@@ -132,20 +132,14 @@
return objStart;
}
-void SkArenaAlloc::ResetBlock(char* footerEnd) {
- while (footerEnd != nullptr) {
- footerEnd = CallFooterAction(footerEnd);
- }
-}
-
-char* SkArenaAlloc::CallFooterAction(char* footerEnd) {
+char* SkArenaAlloc::callFooterAction(char* end) {
Footer footer;
- memcpy(&footer, footerEnd - sizeof(Footer), sizeof(Footer));
+ memcpy(&footer, end - sizeof(Footer), sizeof(Footer));
- FooterAction* action = (FooterAction*)((char*)EndChain + (footer >> 5));
+ FooterAction* releaser = (FooterAction*)((char*)EndChain + (footer >> 5));
ptrdiff_t padding = footer & 31;
- char* r = action(footerEnd) - padding;
+ char* r = releaser(end) - padding;
return r;
}
diff --git a/src/core/SkArenaAlloc.h b/src/core/SkArenaAlloc.h
index 56006c3..8152c94 100644
--- a/src/core/SkArenaAlloc.h
+++ b/src/core/SkArenaAlloc.h
@@ -56,7 +56,7 @@
SkArenaAlloc(char* block, size_t size, size_t extraSize = 0);
template <size_t kSize>
- SkArenaAlloc(char (&block)[kSize], size_t extraSize = kSize)
+ SkArenaAlloc(char (&block)[kSize], size_t extraSize = 0)
: SkArenaAlloc(block, kSize, extraSize)
{}
@@ -116,8 +116,6 @@
using Footer = int32_t;
using FooterAction = char* (char*);
- struct NextBlock;
-
void installFooter(FooterAction* releaser, ptrdiff_t padding);
// N.B. Action is different than FooterAction. FooterAction expects the end of the Footer,
@@ -181,9 +179,7 @@
return objStart;
}
- static char* CallFooterAction(char* end);
-
- static void ResetBlock(char* footerEnd);
+ char* callFooterAction(char* end);
static char* EndChain(char*);
@@ -199,12 +195,10 @@
}
};
- char* fDtorCursor;
- char* fCursor;
- char* fEnd;
- char* const fFirstBlock;
- const size_t fFirstSize;
- const size_t fExtraSize;
+ char* fDtorCursor;
+ char* fCursor;
+ char* fEnd;
+ size_t fExtraSize;
};
#endif//SkFixedAlloc_DEFINED
diff --git a/tests/ArenaAllocTest.cpp b/tests/ArenaAllocTest.cpp
index 0836b0c..647ea25 100644
--- a/tests/ArenaAllocTest.cpp
+++ b/tests/ArenaAllocTest.cpp
@@ -26,26 +26,6 @@
uint32_t array[128];
};
- struct Node {
- Node(Node* n) : next(n) { created++; }
- ~Node() {
- destroyed++;
- if (next) {
- next->~Node();
- }
- }
- Node *next;
- };
-
- struct Start {
- ~Start() {
- if (start) {
- start->~Node();
- }
- }
- Node* start;
- };
-
}
struct WithDtor {
@@ -83,7 +63,7 @@
{
created = 0;
destroyed = 0;
- char block[64];
+ char block[1024];
SkArenaAlloc arena{block};
REPORTER_ASSERT(r, *arena.make<int>(3) == 3);
@@ -133,30 +113,4 @@
}
REPORTER_ASSERT(r, created == 11);
REPORTER_ASSERT(r, destroyed == 11);
-
- {
- char storage[64];
- SkArenaAlloc arena{storage};
- arena.makeArrayDefault<char>(256);
- arena.reset();
- arena.reset();
- }
-
- {
- created = 0;
- destroyed = 0;
- char storage[64];
- SkArenaAlloc arena{storage};
-
- Start start;
- Node* current = nullptr;
- for (int i = 0; i < 128; i++) {
- uint64_t* temp = arena.makeArrayDefault<uint64_t>(sizeof(Node) / sizeof(Node*));
- current = new (temp)Node(current);
- }
- start.start = current;
- }
-
- REPORTER_ASSERT(r, created == 128);
- REPORTER_ASSERT(r, destroyed == 128);
}