mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
Switch minikin to std::unique_ptr. am: 6261d82459 am: e716bdbd48 am: 2583c5c86b
am: bb3df55710 Change-Id: I56cce90607bce82d337d4da3b4ac5f167c7cc1b4
This commit is contained in:
commit
57e469e6f8
@ -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;
|
||||
|
||||
|
||||
@ -490,7 +490,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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user