Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 5152fd9 to stage-aosp-master

Browse Source 
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
This commit is contained in:
Chih-Hung Hsieh
2016-07-21 18:13:31 -07:00
parent 95e42d97f4 5152fd909c
commit 05160d70d1
29 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/AnimationContext.h
View File

@@ -57,7 +57,7 @@ public:
private:
friend class AnimationContext;
AnimationHandle(AnimationContext& context);
explicit AnimationHandle(AnimationContext& context);
AnimationHandle(RenderNode& animatingNode, AnimationContext& context);
~AnimationHandle();
@@ -75,7 +75,7 @@ private:
class AnimationContext {
PREVENT_COPY_AND_ASSIGN(AnimationContext);
public:
ANDROID_API AnimationContext(renderthread::TimeLord& clock);
ANDROID_API explicit AnimationContext(renderthread::TimeLord& clock);
ANDROID_API virtual ~AnimationContext();
nsecs_t frameTimeMs() { return mFrameTimeMs; }

2
libs/hwui/AnimatorManager.h
View File

@@ -35,7 +35,7 @@ class TreeInfo;
class AnimatorManager {
PREVENT_COPY_AND_ASSIGN(AnimatorManager);
public:
AnimatorManager(RenderNode& parent);
explicit AnimatorManager(RenderNode& parent);
~AnimatorManager();
void addAnimator(const sp<BaseRenderNodeAnimator>& animator);

2
libs/hwui/Caches.h
View File

@@ -77,7 +77,7 @@ public:
return sInstance != nullptr;
}
private:
Caches(RenderState& renderState);
explicit Caches(RenderState& renderState);
static Caches* sInstance;
public:

4
libs/hwui/CanvasProperty.h
View File

@@ -28,7 +28,7 @@ namespace uirenderer {
class CanvasPropertyPrimitive : public VirtualLightRefBase {
PREVENT_COPY_AND_ASSIGN(CanvasPropertyPrimitive);
public:
CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}
explicit CanvasPropertyPrimitive(float initialValue) : value(initialValue) {}
float value;
};
@@ -36,7 +36,7 @@ public:
class CanvasPropertyPaint : public VirtualLightRefBase {
PREVENT_COPY_AND_ASSIGN(CanvasPropertyPaint);
public:
CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}
explicit CanvasPropertyPaint(const SkPaint& initialValue) : value(initialValue) {}
SkPaint value;
};

2
libs/hwui/CanvasState.h
View File

@@ -73,7 +73,7 @@ public:
class CanvasState {
public:
CanvasState(CanvasStateClient& renderer);
explicit CanvasState(CanvasStateClient& renderer);
~CanvasState();
/**

2
libs/hwui/DeferredDisplayList.h
View File

@@ -77,7 +77,7 @@ public:
class DeferredDisplayList {
friend struct DeferStateStruct; // used to give access to allocator
public:
DeferredDisplayList(const Rect& bounds)
explicit DeferredDisplayList(const Rect& bounds)
: mBounds(bounds) {
clear();
}

2
libs/hwui/Dither.h
View File

@@ -37,7 +37,7 @@ class Program;
*/
class Dither {
public:
Dither(Caches& caches);
explicit Dither(Caches& caches);
void clear();
void setupProgram(Program& program, GLuint* textureUnit);

2
libs/hwui/FrameInfo.h
View File

@@ -65,7 +65,7 @@ namespace FrameInfoFlags {
class ANDROID_API UiFrameInfoBuilder {
public:
UiFrameInfoBuilder(int64_t* buffer) : mBuffer(buffer) {
explicit UiFrameInfoBuilder(int64_t* buffer) : mBuffer(buffer) {
memset(mBuffer, 0, UI_THREAD_FRAME_INFO_SIZE * sizeof(int64_t));
}

2
libs/hwui/FrameInfoVisualizer.h
View File

@@ -45,7 +45,7 @@ typedef RingBuffer<FrameInfo, 120> FrameInfoSource;
class FrameInfoVisualizer {
public:
FrameInfoVisualizer(FrameInfoSource& source);
explicit FrameInfoVisualizer(FrameInfoSource& source);
~FrameInfoVisualizer();
bool consumeProperties();

2
libs/hwui/GradientCache.h
View File

@@ -103,7 +103,7 @@ inline hash_t hash_type(const GradientCacheEntry& entry) {
*/
class GradientCache: public OnEntryRemoved<GradientCacheEntry, Texture*> {
public:
GradientCache(Extensions& extensions);
explicit GradientCache(Extensions& extensions);
~GradientCache();
/**

2
libs/hwui/JankTracker.h
View File

@@ -56,7 +56,7 @@ struct ProfileData {
// TODO: Replace DrawProfiler with this
class JankTracker {
public:
JankTracker(nsecs_t frameIntervalNanos);
explicit JankTracker(nsecs_t frameIntervalNanos);
~JankTracker();
void addFrame(const FrameInfo& frame);

2
libs/hwui/LayerCache.h
View File

@@ -105,7 +105,7 @@ private:
mHeight = Layer::computeIdealHeight(layerHeight);
}
LayerEntry(Layer* layer):
explicit LayerEntry(Layer* layer):
mLayer(layer), mWidth(layer->getWidth()), mHeight(layer->getHeight()) {
}

4
libs/hwui/Matrix.h
View File

@@ -81,11 +81,11 @@ public:
loadIdentity();
}
Matrix4(const float* v) {
explicit Matrix4(const float* v) {
load(v);
}
Matrix4(const SkMatrix& v) {
Matrix4(const SkMatrix& v) { // NOLINT, implicit
load(v);
}

2
libs/hwui/OpenGLRenderer.h Executable file → Normal file
View File

@@ -116,7 +116,7 @@ enum ModelViewMode {
*/
class OpenGLRenderer : public CanvasStateClient {
public:
OpenGLRenderer(RenderState& renderState);
explicit OpenGLRenderer(RenderState& renderState);
virtual ~OpenGLRenderer();
void initProperties();

2
libs/hwui/PatchCache.h
View File

@@ -51,7 +51,7 @@ class Caches;
class PatchCache {
public:
PatchCache(RenderState& renderState);
explicit PatchCache(RenderState& renderState);
~PatchCache();
void init();

2
libs/hwui/PathCache.h
View File

@@ -288,7 +288,7 @@ private:
class PathProcessor: public TaskProcessor<SkBitmap*> {
public:
PathProcessor(Caches& caches);
explicit PathProcessor(Caches& caches);
~PathProcessor() { }
virtual void onProcess(const sp<Task<SkBitmap*> >& task) override;

2
libs/hwui/ProgramCache.h
View File

@@ -40,7 +40,7 @@ namespace uirenderer {
*/
class ProgramCache {
public:
ProgramCache(Extensions& extensions);
explicit ProgramCache(Extensions& extensions);
~ProgramCache();
Program* get(const ProgramDescription& description);

2
libs/hwui/Rect.h
View File

@@ -73,7 +73,7 @@ public:
bottom(height) {
}
inline Rect(const SkRect& rect):
inline Rect(const SkRect& rect): // NOLINT, implicit
left(rect.fLeft),
top(rect.fTop),
right(rect.fRight),

2
libs/hwui/RenderBufferCache.h
View File

@@ -82,7 +82,7 @@ private:
mBuffer(nullptr), mFormat(format), mWidth(width), mHeight(height) {
}
RenderBufferEntry(RenderBuffer* buffer):
explicit RenderBufferEntry(RenderBuffer* buffer):
mBuffer(buffer), mFormat(buffer->getFormat()),
mWidth(buffer->getWidth()), mHeight(buffer->getHeight()) {
}

2
libs/hwui/ResourceCache.h
View File

@@ -42,7 +42,7 @@ enum ResourceType {
class ResourceReference {
public:
ResourceReference(ResourceType type) {
explicit ResourceReference(ResourceType type) {
refCount = 0; destroyed = false; resourceType = type;
}

2
libs/hwui/SkiaCanvasProxy.h
View File

@@ -39,7 +39,7 @@ namespace uirenderer {
*/
class ANDROID_API SkiaCanvasProxy : public SkCanvas {
public:
SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
explicit SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
virtual ~SkiaCanvasProxy() {}
protected:

4
libs/hwui/TextDropShadowCache.h
View File

@@ -111,7 +111,7 @@ inline hash_t hash_type(const ShadowText& entry) {
* Alpha texture used to represent a shadow.
*/
struct ShadowTexture: public Texture {
ShadowTexture(Caches& caches): Texture(caches) {
explicit ShadowTexture(Caches& caches): Texture(caches) {
}
float left;
@@ -121,7 +121,7 @@ struct ShadowTexture: public Texture {
class TextDropShadowCache: public OnEntryRemoved<ShadowText, ShadowTexture*> {
public:
TextDropShadowCache();
TextDropShadowCache(uint32_t maxByteSize);
explicit TextDropShadowCache(uint32_t maxByteSize);
~TextDropShadowCache();
/**

4
libs/hwui/Texture.h
View File

@@ -34,7 +34,7 @@ class Layer;
*/
class Texture : public GpuMemoryTracker {
public:
Texture(Caches& caches)
explicit Texture(Caches& caches)
: GpuMemoryTracker(GpuObjectType::Texture)
, mCaches(caches)
{ }
@@ -171,7 +171,7 @@ private:
class AutoTexture {
public:
AutoTexture(Texture* texture)
explicit AutoTexture(Texture* texture)
: texture(texture) {}
~AutoTexture() {
if (texture && texture->cleanup) {

2
libs/hwui/renderthread/RenderTask.h
View File

@@ -73,7 +73,7 @@ typedef void* (*RunnableMethod)(void* data);
class MethodInvokeRenderTask : public RenderTask {
public:
MethodInvokeRenderTask(RunnableMethod method)
explicit MethodInvokeRenderTask(RunnableMethod method)
: mMethod(method), mReturnPtr(nullptr) {}
void* payload() { return mData; }

2
libs/hwui/thread/Barrier.h
View File

@@ -24,7 +24,7 @@ namespace uirenderer {
class Barrier {
public:
Barrier(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mOpened(false) { }
explicit Barrier(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mOpened(false) { }
~Barrier() { }
void open() {

2
libs/hwui/thread/Future.h
View File

@@ -27,7 +27,7 @@ namespace uirenderer {
template<typename T>
class Future: public LightRefBase<Future<T> > {
public:
Future(Condition::WakeUpType type = Condition::WAKE_UP_ONE): mBarrier(type), mResult() { }
explicit Future(Condition::WakeUpType type = Condition::WAKE_UP_ONE): mBarrier(type), mResult() { }
~Future() { }
/**

2
libs/hwui/thread/Signal.h
View File

@@ -26,7 +26,7 @@ namespace uirenderer {
class Signal {
public:
Signal(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mSignaled(false) { }
explicit Signal(Condition::WakeUpType type = Condition::WAKE_UP_ALL) : mType(type), mSignaled(false) { }
~Signal() { }
void signal() {

2
libs/hwui/thread/TaskManager.h
View File

@@ -78,7 +78,7 @@ private:
class WorkerThread: public Thread {
public:
WorkerThread(const String8 name): mSignal(Condition::WAKE_UP_ONE), mName(name) { }
explicit WorkerThread(const String8 name): mSignal(Condition::WAKE_UP_ONE), mName(name) { }
bool addTask(const TaskWrapper& task);
size_t getTaskCount() const;

2
libs/hwui/thread/TaskProcessor.h
View File

@@ -36,7 +36,7 @@ public:
template<typename T>
class TaskProcessor: public TaskProcessorBase {
public:
TaskProcessor(TaskManager* manager): mManager(manager) { }
explicit TaskProcessor(TaskManager* manager): mManager(manager) { }
virtual ~TaskProcessor() { }
void add(const sp<Task<T> >& task) {