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

Unified Diff: cc/layers/delegated_renderer_layer_impl.cc

Issue 12965007: Fix cpplint errors in cc/(animation|input|layers|trees|test)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl.cc
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index e83f9c3fbf7bc7cf6dcd6adec7e6440cfdb04a88..9ae9e333103e65f49f17e9a6888e61f3565ad7b4 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -4,6 +4,9 @@
#include "cc/layers/delegated_renderer_layer_impl.h"
+#include <algorithm>
+#include <utility>
+
#include "base/bind.h"
#include "cc/base/math_util.h"
#include "cc/layers/append_quads_data.h"
@@ -51,7 +54,7 @@ static ResourceProvider::ResourceId ResourceRemapHelper(
return 0;
}
- DCHECK(it->first == id);
+ DCHECK_EQ(it->first, id);
ResourceProvider::ResourceId remapped_id = it->second;
remapped_resources->insert(remapped_id);
return remapped_id;
@@ -160,7 +163,8 @@ void DelegatedRendererLayerImpl::ClearRenderPasses() {
scoped_ptr<LayerImpl> DelegatedRendererLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return DelegatedRendererLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
+ return DelegatedRendererLayerImpl::Create(
+ tree_impl, id()).PassAs<LayerImpl>();
}
void DelegatedRendererLayerImpl::DidLoseOutputSurface() {
@@ -210,7 +214,7 @@ void DelegatedRendererLayerImpl::AppendContributingRenderPasses(
ConvertDelegatedRenderPassId(render_passes_in_draw_order_[i]->id);
// Don't clash with the RenderPass we generate if we own a RenderSurface.
- DCHECK(output_render_pass_id.index > 0);
+ DCHECK_GT(output_render_pass_id.index, 0);
render_pass_sink->AppendRenderPass(
render_passes_in_draw_order_[i]->Copy(output_render_pass_id));
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698