forked from firka/flutter
Switch minikin to std::unique_ptr.
am: fba88d3b3c
Change-Id: I91198bdae7aac9638e6ef3553b0eacac021d4f93
This commit is contained in:
@@ -19,7 +19,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
#include <UniquePtr.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -79,8 +80,8 @@ private:
|
||||
static int CountLeadingZeros(element x);
|
||||
|
||||
uint32_t mMaxVal;
|
||||
UniquePtr<uint32_t[]> mIndices;
|
||||
UniquePtr<element[]> mBitmaps;
|
||||
std::unique_ptr<uint32_t[]> mIndices;
|
||||
std::unique_ptr<element[]> mBitmaps;
|
||||
uint32_t mZeroPageIndex;
|
||||
};
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <minikin/AnalyzeStyle.h>
|
||||
#include <minikin/CmapCoverage.h>
|
||||
#include <minikin/FontFamily.h>
|
||||
#include <UniquePtr.h>
|
||||
|
||||
using std::vector;
|
||||
|
||||
|
||||
@@ -496,7 +496,8 @@ private:
|
||||
size_t mRunCount;
|
||||
bool mIsRtl;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(BidiText);
|
||||
BidiText(const BidiText&) = delete;
|
||||
void operator=(const BidiText&) = delete;
|
||||
};
|
||||
|
||||
BidiText::Iter::Iter(UBiDi* bidi, size_t start, size_t end, size_t runIndex, size_t runCount,
|
||||
|
||||
Reference in New Issue
Block a user