diff options
| author | 2018-08-24 22:23:02 +0000 | |
|---|---|---|
| committer | 2018-08-24 22:23:02 +0000 | |
| commit | 9d10637e016f40b4fc58db4fd204174f03312c30 (patch) | |
| tree | e616d3a5b02d14dddffb241308ecb9a705fc4f42 | |
| parent | 7e54042f9c39cb02cdcaee499f72297f56212909 (diff) | |
| parent | 174b50fa506b0d33551670cbc595412bf943113c (diff) | |
Merge changes Ie072511b,I6424f90c
* changes:
TreeInfo: Make ~ErrorHandler() virtual
RenderThread: Make ~IFrameCallback() virtual
| -rw-r--r-- | libs/hwui/TreeInfo.h | 2 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/TreeInfo.h b/libs/hwui/TreeInfo.h index b37f2cfe7fee..f2766d6a5b6e 100644 --- a/libs/hwui/TreeInfo.h +++ b/libs/hwui/TreeInfo.h @@ -39,7 +39,7 @@ public: virtual void onError(const std::string& message) = 0; protected: - ~ErrorHandler() {} + virtual ~ErrorHandler() {} }; class TreeObserver { diff --git a/libs/hwui/renderthread/RenderThread.h b/libs/hwui/renderthread/RenderThread.h index 689f518bad1b..e9c264917905 100644 --- a/libs/hwui/renderthread/RenderThread.h +++ b/libs/hwui/renderthread/RenderThread.h @@ -59,7 +59,7 @@ public: virtual void doFrame() = 0; protected: - ~IFrameCallback() {} + virtual ~IFrameCallback() {} }; struct VsyncSource { |