cc/layers/layer_impl.cc - Issue 1158433010: Reland: cc: Fix size_t to int truncations in layers/ output/ playback/ quads/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/layers/layer_impl.cc

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: mojo update 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 side-by-side diff with in-line comments

Download patch

Index: cc/layers/layer_impl.cc

diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc

index e6d9700043053afc091ed205e80e11e5d5eb047d..7c56fbf549d6b119f47c34fbb0171b8c9a2c9eea 100644

--- a/cc/layers/layer_impl.cc

+++ b/cc/layers/layer_impl.cc

@@ -5,6 +5,7 @@

#include "cc/layers/layer_impl.h"

#include "base/json/json_reader.h"

+#include "base/numerics/safe_conversions.h"

#include "base/strings/stringprintf.h"

#include "base/trace_event/trace_event.h"

#include "base/trace_event/trace_event_argument.h"

@@ -1515,7 +1516,8 @@ void LayerImpl::AsValueInto(base::trace_event::TracedValue* state) const {

MathUtil::AddToTracedValue("position", position_, state);

state->SetInteger("draws_content", DrawsContent());

- state->SetInteger("gpu_memory_usage", GPUMemoryUsageInBytes());

+ state->SetInteger("gpu_memory_usage",

+ base::saturated_cast<int>(GPUMemoryUsageInBytes()));

MathUtil::AddToTracedValue(

"scroll_offset", scroll_offset_ ? scroll_offset_->Current(IsActive())

« no previous file with comments | « cc/layers/layer.cc ('k') | cc/layers/layer_iterator.h » ('j') | components/view_manager/public/interfaces/quads.mojom » ('J')