When closing a namespace a } is sufficient. It doesn't need to be }; like closing a class or enum. Within frameworks/base/libs/hwui there is a mix between } and }; when closing a namespace. There are even mixes between a .h and the corresponding .cpp files. In a separate CL I was asked to not close with };. That was a good comment. I adopted the style from nearby code. This CL cleans up the nearby code. Test: I made sure the code still built as expected. Change-Id: Ieb314a4f48d6e33752463f3be4361fdc9be97482
52 lines
1.7 KiB
C++
52 lines
1.7 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_PATHPARSER_H
|
|
#define ANDROID_HWUI_PATHPARSER_H
|
|
|
|
#include "VectorDrawable.h"
|
|
#include "utils/VectorDrawableUtils.h"
|
|
|
|
#include <android/log.h>
|
|
#include <cutils/compiler.h>
|
|
#include <jni.h>
|
|
|
|
#include <string>
|
|
|
|
namespace android {
|
|
namespace uirenderer {
|
|
|
|
class PathParser {
|
|
public:
|
|
struct ANDROID_API ParseResult {
|
|
bool failureOccurred = false;
|
|
std::string failureMessage;
|
|
};
|
|
/**
|
|
* Parse the string literal and create a Skia Path. Return true on success.
|
|
*/
|
|
ANDROID_API static void parseAsciiStringForSkPath(SkPath* outPath, ParseResult* result,
|
|
const char* pathStr, size_t strLength);
|
|
ANDROID_API static void getPathDataFromAsciiString(PathData* outData, ParseResult* result,
|
|
const char* pathStr, size_t strLength);
|
|
static void dump(const PathData& data);
|
|
static void validateVerbAndPoints(char verb, size_t points, ParseResult* result);
|
|
};
|
|
|
|
} // namespace uirenderer
|
|
} // namespace android
|
|
#endif // ANDROID_HWUI_PATHPARSER_H
|