cc/layers/picture_layer.cc - Issue 637913003: Revert of "Converted LayerImpl::bounds() to return SizeF."

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/picture_layer.cc

Issue 637913003: Revert of "Converted LayerImpl::bounds() to return SizeF." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Download patch

Index: cc/layers/picture_layer.cc

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

index d86aef7f4910c3cc9c6b80178352e0991196dd92..68d24bac812427a2c71412012c934ba6127a146f 100644

--- a/cc/layers/picture_layer.cc

+++ b/cc/layers/picture_layer.cc

@@ -9,7 +9,6 @@

#include "cc/layers/picture_layer_impl.h"

#include "cc/trees/layer_tree_impl.h"

#include "third_party/skia/include/core/SkPictureRecorder.h"

-#include "ui/gfx/geometry/size_conversions.h"

#include "ui/gfx/rect_conversions.h"

namespace cc {

@@ -47,8 +46,7 @@ void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {

// TODO(ernstm): This DCHECK is only valid as long as the pile's tiling_rect

// is identical to the layer_rect.

// If update called, then pile size must match bounds pushed to impl layer.

- DCHECK_EQ(gfx::ToCeiledSize(layer_impl->bounds()).ToString(),

- pile_->tiling_size().ToString());

+ DCHECK_EQ(layer_impl->bounds().ToString(), pile_->tiling_size().ToString());

}

// Unlike other properties, invalidation must always be set on layer_impl.

« no previous file with comments | « cc/layers/picture_image_layer_impl_unittest.cc ('k') | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »