Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(360)

Side by Side Diff: ui/compositor/layer.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/compositor/layer.h ('k') | ui/compositor/layer_animation_element.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/compositor/layer.h" 5 #include "ui/compositor/layer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 if (force_render_surface_ == force) 738 if (force_render_surface_ == force)
739 return; 739 return;
740 740
741 force_render_surface_ = force; 741 force_render_surface_ = force;
742 cc_layer_->SetForceRenderSurface(force_render_surface_); 742 cc_layer_->SetForceRenderSurface(force_render_surface_);
743 } 743 }
744 744
745 class LayerDebugInfo : public base::debug::ConvertableToTraceFormat { 745 class LayerDebugInfo : public base::debug::ConvertableToTraceFormat {
746 public: 746 public:
747 explicit LayerDebugInfo(std::string name) : name_(name) { } 747 explicit LayerDebugInfo(std::string name) : name_(name) { }
748 virtual void AppendAsTraceFormat(std::string* out) const OVERRIDE { 748 virtual void AppendAsTraceFormat(std::string* out) const override {
749 base::DictionaryValue dictionary; 749 base::DictionaryValue dictionary;
750 dictionary.SetString("layer_name", name_); 750 dictionary.SetString("layer_name", name_);
751 base::JSONWriter::Write(&dictionary, out); 751 base::JSONWriter::Write(&dictionary, out);
752 } 752 }
753 753
754 private: 754 private:
755 virtual ~LayerDebugInfo() { } 755 virtual ~LayerDebugInfo() { }
756 std::string name_; 756 std::string name_;
757 }; 757 };
758 758
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 children_.end(), 1044 children_.end(),
1045 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), 1045 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection),
1046 collection)); 1046 collection));
1047 } 1047 }
1048 1048
1049 bool Layer::IsAnimating() const { 1049 bool Layer::IsAnimating() const {
1050 return animator_.get() && animator_->is_animating(); 1050 return animator_.get() && animator_->is_animating();
1051 } 1051 }
1052 1052
1053 } // namespace ui 1053 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/layer.h ('k') | ui/compositor/layer_animation_element.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698