third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp - Issue 1785123003: Rework embeddedContentBox into embeddedReplacedContent

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: third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

Issue 1785123003: Rework embeddedContentBox into embeddedReplacedContent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 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 unified diff | Download patch

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 151 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 return ScrollResult();	162 return ScrollResult();

163 }	163 }

164	164

165 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const	165 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const

166 {	166 {

167 if (requiresAcceleratedCompositing())	167 if (requiresAcceleratedCompositing())

168 return CompositingReasonPlugin;	168 return CompositingReasonPlugin;

169 return CompositingReasonNone;	169 return CompositingReasonNone;

170 }	170 }

171	171

172 LayoutBox* LayoutEmbeddedObject::embeddedContentBox() const	172 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const

173 {	173 {

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

175 return nullptr;	175 return nullptr;

176 return toFrameView(widget())->embeddedContentBox();	176 return toFrameView(widget())->embeddedReplacedContent();

177 }	177 }

178	178

179 } // namespace blink	179 } // namespace blink

OLD	NEW