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

Side by Side Diff: cc/quads/render_pass_id.h

Issue 1158433010: Reland: cc: Fix size_t to int truncations in layers/ output/ playback/ quads/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CC_QUADS_RENDER_PASS_ID_H_ 5 #ifndef CC_QUADS_RENDER_PASS_ID_H_
6 #define CC_QUADS_RENDER_PASS_ID_H_ 6 #define CC_QUADS_RENDER_PASS_ID_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 class CC_EXPORT RenderPassId { 14 class CC_EXPORT RenderPassId {
15 public: 15 public:
16 int layer_id; 16 int layer_id;
17 int index; 17 size_t index;
18 18
19 RenderPassId(int layer_id, int index) : layer_id(layer_id), index(index) {} 19 RenderPassId() : layer_id(-1), index(0) {}
20 RenderPassId(int layer_id, size_t index) : layer_id(layer_id), index(index) {}
20 void* AsTracingId() const; 21 void* AsTracingId() const;
21 22
22 bool operator==(const RenderPassId& other) const { 23 bool operator==(const RenderPassId& other) const {
23 return layer_id == other.layer_id && index == other.index; 24 return layer_id == other.layer_id && index == other.index;
24 } 25 }
25 bool operator!=(const RenderPassId& other) const { return !(*this == other); } 26 bool operator!=(const RenderPassId& other) const { return !(*this == other); }
26 bool operator<(const RenderPassId& other) const { 27 bool operator<(const RenderPassId& other) const {
27 return layer_id < other.layer_id || 28 return layer_id < other.layer_id ||
28 (layer_id == other.layer_id && index < other.index); 29 (layer_id == other.layer_id && index < other.index);
29 } 30 }
30 }; 31 };
31 32
32 } // namespace cc 33 } // namespace cc
33 34
34 #endif // CC_QUADS_RENDER_PASS_ID_H_ 35 #endif // CC_QUADS_RENDER_PASS_ID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698