Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

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

Issue 2764313002: Move plugins to be stored in HTMLPlugInElement. (Closed)
Patch Set: Created 3 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
OLDNEW
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. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 LayoutAnalyzer::Scope analyzer(*this); 128 LayoutAnalyzer::Scope analyzer(*this);
129 129
130 updateLogicalWidth(); 130 updateLogicalWidth();
131 updateLogicalHeight(); 131 updateLogicalHeight();
132 132
133 m_overflow.reset(); 133 m_overflow.reset();
134 addVisualEffectOverflow(); 134 addVisualEffectOverflow();
135 135
136 updateLayerTransformAfterLayout(); 136 updateLayerTransformAfterLayout();
137 137
138 // TODO(joelhockey): Can this FrameViewBase be a plugin?
139 // If so, need to access plugin differently to this.
haraken 2017/03/22 15:32:33 It shouldn't, since this is using frameView()->add
joelhockey 2017/03/27 06:42:21 Thanks. Yes, that makes sense.
138 FrameViewBase* frameViewBase = this->frameViewBase(); 140 FrameViewBase* frameViewBase = this->frameViewBase();
139 if (!frameViewBase && frameView()) 141 if (!frameViewBase && frameView())
140 frameView()->addPartToUpdate(*this); 142 frameView()->addPartToUpdate(*this);
141 143
142 clearNeedsLayout(); 144 clearNeedsLayout();
143 } 145 }
144 146
145 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity, 147 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity,
146 const FloatSize&) { 148 const FloatSize&) {
147 return ScrollResult(); 149 return ScrollResult();
148 } 150 }
149 151
150 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const { 152 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const {
151 if (requiresAcceleratedCompositing()) 153 if (requiresAcceleratedCompositing())
152 return CompositingReasonPlugin; 154 return CompositingReasonPlugin;
153 return CompositingReasonNone; 155 return CompositingReasonNone;
154 } 156 }
155 157
156 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const { 158 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const {
157 if (!node() || !frameViewBase() || !frameViewBase()->isFrameView()) 159 if (!node() || !frameViewBase() || !frameViewBase()->isFrameView())
158 return nullptr; 160 return nullptr;
159 return toFrameView(frameViewBase())->embeddedReplacedContent(); 161 return toFrameView(frameViewBase())->embeddedReplacedContent();
160 } 162 }
161 163
162 } // namespace blink 164 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698