AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use SkAutoDescriptor in remote glyph cache

Browse Source 
Thoroughly exercise the new descriptor de-serializer.

Change-Id: If8208ec5b0f0a8e0db250d2cd723b6970c5f4ff2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/506464
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2022-02-09 15:03:23 -05:00 committed by SkCQ
parent cd189e8a1d
commit 81d4b5d5b4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/SkChromeRemoteGlyphCache.cpp
View File

@ -23,6 +23,7 @@
#include "src/core/SkDraw.h"
#include "src/core/SkEnumerate.h"
#include "src/core/SkGlyphRun.h"
#include "src/core/SkReadBuffer.h"
#include "src/core/SkScalerCache.h"
#include "src/core/SkStrikeCache.h"
#include "src/core/SkStrikeForGPU.h"
@ -127,17 +128,15 @@ public:
bool readDescriptor(SkAutoDescriptor* ad) {
uint32_t descLength = 0u;
if (!read<uint32_t>(&descLength)) return false;
if (descLength < sizeof(SkDescriptor)) return false;
if (descLength != SkAlign4(descLength)) return false;
auto* result = this->ensureAtLeast(descLength, alignof(SkDescriptor));
if (!result) return false;
auto* underlyingBuffer = this->ensureAtLeast(descLength, alignof(SkDescriptor));
if (!underlyingBuffer) return false;
SkReadBuffer buffer((void*)underlyingBuffer, descLength);
auto autoDescriptor = SkAutoDescriptor::MakeFromBuffer(buffer);
if (!autoDescriptor.has_value()) { return false; }
ad->reset(descLength);
memcpy(ad->getDesc(), const_cast<const char*>(result), descLength);
if (ad->getDesc()->getLength() > descLength) return false;
return ad->getDesc()->isValid();
*ad = std::move(*autoDescriptor);
return true;
}
const volatile void* read(size_t size, size_t alignment) {