ui/gfx/compositor/layer_unittest.cc - Issue 9845017: Fix a few warnings that -Wnull-conversion of a future clang will complain about.

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: ui/gfx/compositor/layer_unittest.cc

Issue 9845017: Fix a few warnings that -Wnull-conversion of a future clang will complain about. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments Created 8 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

Index: ui/gfx/compositor/layer_unittest.cc

diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/gfx/compositor/layer_unittest.cc

index 9c360e98a20f0a358176dfd3b25da66801289781..82a868ba2dff95190392e5aa806ed22acde776c0 100644

--- a/ui/gfx/compositor/layer_unittest.cc

+++ b/ui/gfx/compositor/layer_unittest.cc

@@ -365,7 +365,8 @@ class LayerWithDelegateTest : public testing::Test, public CompositorDelegate {

// Overridden from testing::Test:

virtual void SetUp() OVERRIDE {

ui::SetupTestCompositor();

- compositor_.reset(new Compositor(this, NULL, gfx::Size(1000, 1000)));

+ compositor_.reset(

+ new Compositor(this, kNullAcceleratedWidget, gfx::Size(1000, 1000)));

Mark Mentovai 2012/03/27 21:43:42 The linux_chromeos try bot hated this. ui/gfx/nati

Nico 2012/03/27 21:55:21 Hm, maybe cros needs an explicit gfx:: for some re

}

virtual void TearDown() OVERRIDE {

« no previous file with comments | « net/base/x509_util_mac.cc ('k') | webkit/plugins/npapi/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »