Source/core/layout/LayoutEmbeddedObject.cpp - Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: Source/core/layout/LayoutEmbeddedObject.cpp

Issue 1162383003: C++11: Replace 0 with nullptr where applicable in layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add one more file. 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

« no previous file with comments | « Source/core/layout/LayoutDeprecatedFlexibleBox.cpp ('k') | Source/core/layout/LayoutFieldset.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 2000 Simon Hausmann <hausmann@kde.org>	3 * (C) 2000 Simon Hausmann <hausmann@kde.org>

4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)	4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)

5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.	5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
160 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const	160 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const

161 {	161 {

162 if (requiresAcceleratedCompositing())	162 if (requiresAcceleratedCompositing())

163 return CompositingReasonPlugin;	163 return CompositingReasonPlugin;

164 return CompositingReasonNone;	164 return CompositingReasonNone;

165 }	165 }

166	166

167 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const	167 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const

168 {	168 {

169 if (!node() \|\| !widget() \|\| !widget()->isFrameView())	169 if (!node() \|\| !widget() \|\| !widget()->isFrameView())

170 return 0;	170 return nullptr;

171 return toFrameView(widget())->embeddedContentBox();	171 return toFrameView(widget())->embeddedContentBox();

172 }	172 }

173	173

174 } // namespace blink	174 } // namespace blink

OLD	NEW