diff options
| author | vmpstr <vmpstr@chromium.org> | 2015-06-05 16:09:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 23:09:44 +0000 |
| commit | 02b4fa89a8356d429d19526f072bd0fab8df96a9 (patch) | |
| tree | 1cf1796dab192bd47e3440ad106660548d17e4fe /cc/quads/render_pass_draw_quad.cc | |
| parent | 5a86ada324212abe358ac7da01a66ce08b3f62b7 (diff) | |
| download | chromium_src-02b4fa89a8356d429d19526f072bd0fab8df96a9.zip chromium_src-02b4fa89a8356d429d19526f072bd0fab8df96a9.tar.gz chromium_src-02b4fa89a8356d429d19526f072bd0fab8df96a9.tar.bz2 | |
Revert of cc: Fix size_t to int truncations in layers/ output/ playback/ quads/ (patchset #12 id:260001 of https://codereview.chromium.org/1158433010/)
Reason for revert:
Broke windows build. http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/2919
Original issue's description:
> cc: Fix size_t to int truncations in layers/ output/ playback/ quads/
>
> This patch fixes size_t to int truncations in layers/, output/,
> playback/, and quads/ directories in cc/.
>
> R=danakj
> BUG=167187
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/0d5963315aa03e6ebb20351f13d3d517ca14d816
> Cr-Commit-Position: refs/heads/master@{#333153}
TBR=danakj@chromium.org,mkwst@chromium.org,jschuh@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=167187
Review URL: https://codereview.chromium.org/1155553006
Cr-Commit-Position: refs/heads/master@{#333167}
Diffstat (limited to 'cc/quads/render_pass_draw_quad.cc')
| -rw-r--r-- | cc/quads/render_pass_draw_quad.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc index 1b03ec8..fc2c333 100644 --- a/cc/quads/render_pass_draw_quad.cc +++ b/cc/quads/render_pass_draw_quad.cc @@ -12,7 +12,8 @@ namespace cc { -RenderPassDrawQuad::RenderPassDrawQuad() { +RenderPassDrawQuad::RenderPassDrawQuad() + : render_pass_id(RenderPassId(-1, -1)) { } RenderPassDrawQuad::~RenderPassDrawQuad() { @@ -29,6 +30,7 @@ void RenderPassDrawQuad::SetNew(const SharedQuadState* shared_quad_state, const gfx::Vector2dF& filters_scale, const FilterOperations& background_filters) { DCHECK_GT(render_pass_id.layer_id, 0); + DCHECK_GE(render_pass_id.index, 0); gfx::Rect opaque_rect; bool needs_blending = false; @@ -59,6 +61,7 @@ void RenderPassDrawQuad::SetAll(const SharedQuadState* shared_quad_state, const gfx::Vector2dF& filters_scale, const FilterOperations& background_filters) { DCHECK_GT(render_pass_id.layer_id, 0); + DCHECK_GE(render_pass_id.index, 0); DrawQuad::SetAll(shared_quad_state, DrawQuad::RENDER_PASS, rect, opaque_rect, visible_rect, needs_blending); |