diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/RenderNode.cpp | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
| download | frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.zip frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.tar.gz frameworks_base-2ab8298dc37851aab4623ba3f98d71055d653a73.tar.bz2 | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 4814ed3..0a6c2fd 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -279,7 +279,7 @@ void RenderNode::pushStagingPropertiesChanges(TreeInfo& info) { } } -void RenderNode::applyLayerPropertiesToLayer(TreeInfo& info) { +void RenderNode::applyLayerPropertiesToLayer(TreeInfo& /* info */) { if (CC_LIKELY(!mLayer)) return; const LayerProperties& props = properties().layerProperties(); @@ -586,7 +586,7 @@ public: operation->defer(mDeferStruct, saveCount, mLevel, clipToBounds); } inline LinearAllocator& allocator() { return *(mDeferStruct.mAllocator); } - inline void startMark(const char* name) {} // do nothing + inline void startMark(const char* /* name */) {} // do nothing inline void endMark() {} inline int level() { return mLevel; } inline int replayFlags() { return mDeferStruct.mReplayFlags; } |