Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

This commit is contained in:
Jesse Hall 2014-10-31 16:59:11 +00:00 committed by Android (Google) Code Review
commit 6e74e3ccd9

View File

@ -28,7 +28,7 @@ namespace android {
class LayerDim : public Layer class LayerDim : public Layer
{ {
public: public:
LayerDim(SurfaceFlinger* flinger, const sp<Client>& client, LayerDim(SurfaceFlinger* flinger, const sp<Client>& client,
const String8& name, uint32_t w, uint32_t h, uint32_t flags); const String8& name, uint32_t w, uint32_t h, uint32_t flags);
virtual ~LayerDim(); virtual ~LayerDim();
@ -36,7 +36,7 @@ public:
virtual const char* getTypeId() const { return "LayerDim"; } virtual const char* getTypeId() const { return "LayerDim"; }
virtual void onDraw(const sp<const DisplayDevice>& hw, const Region& clip, virtual void onDraw(const sp<const DisplayDevice>& hw, const Region& clip,
bool useIdentityTransform) const; bool useIdentityTransform) const;
virtual bool isOpaque() const { return false; } virtual bool isOpaque(const Layer::State&) const { return false; }
virtual bool isSecure() const { return false; } virtual bool isSecure() const { return false; }
virtual bool isFixedSize() const { return true; } virtual bool isFixedSize() const { return true; }
virtual bool isVisible() const; virtual bool isVisible() const;