resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

// on the caller already having a local JNI ref

class LocalScopedBitmap {

public:

    LocalScopedBitmap(jlong bitmapHandle)

    explicit LocalScopedBitmap(jlong bitmapHandle)

            : mBitmap(reinterpret_cast<Bitmap*>(bitmapHandle)) {}

    Bitmap* operator->() {

// calls. See the Harfbuzz source for references about what these callbacks do.

struct HarfBuzzFontData {

    HarfBuzzFontData(SkPaint* paint) : m_paint(paint) { }

    explicit HarfBuzzFontData(SkPaint* paint) : m_paint(paint) { }

    SkPaint* m_paint;

};

    SkRegion            fRgn;   // a copy of the caller's region

    SkRegion::Iterator  fIter;  // an iterator acting upon the copy (fRgn)

    RgnIterPair(const SkRegion& rgn) : fRgn(rgn) {

    explicit RgnIterPair(const SkRegion& rgn) : fRgn(rgn) {

        // have our iterator reference our copy (fRgn), so we know it will be

        // unchanged for the lifetime of the iterator

        fIter.reset(fRgn);

     * will be active at once, which is a function of the GPU's level of

     * pipelining and the frequency of queries.

     */

    PerfMeasurementContext(size_t maxQueryCount):

    explicit PerfMeasurementContext(size_t maxQueryCount):

            mTimingStartIndex(0),

            mTimingEndIndex(0),

            mTimingQueryIndex(0) {

class XmlAttributeFinder : public BackTrackingAttributeFinder<XmlAttributeFinder, jsize> {

public:

    XmlAttributeFinder(const ResXMLParser* parser)

    explicit XmlAttributeFinder(const ResXMLParser* parser)

        : BackTrackingAttributeFinder(0, parser != NULL ? parser->getAttributeCount() : 0)

        , mParser(parser) {}