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

Side by Side Diff: Source/core/html/HTMLEmbedElement.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLEmbedElement.h ('k') | Source/core/html/HTMLFieldSetElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@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, 2011 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 142
143 RefPtrWillBeRawPtr<HTMLEmbedElement> protect(this); // Loading the plugin mi ght remove us from the document. 143 RefPtrWillBeRawPtr<HTMLEmbedElement> protect(this); // Loading the plugin mi ght remove us from the document.
144 144
145 // FIXME: Can we not have renderer here now that beforeload events are gone? 145 // FIXME: Can we not have renderer here now that beforeload events are gone?
146 if (!layoutObject()) 146 if (!layoutObject())
147 return; 147 return;
148 148
149 requestObject(m_url, m_serviceType, paramNames, paramValues); 149 requestObject(m_url, m_serviceType, paramNames, paramValues);
150 } 150 }
151 151
152 bool HTMLEmbedElement::layoutObjectIsNeeded(const LayoutStyle& style) 152 bool HTMLEmbedElement::layoutObjectIsNeeded(const ComputedStyle& style)
153 { 153 {
154 if (isImageType()) 154 if (isImageType())
155 return HTMLPlugInElement::layoutObjectIsNeeded(style); 155 return HTMLPlugInElement::layoutObjectIsNeeded(style);
156 156
157 // If my parent is an <object> and is not set to use fallback content, I 157 // If my parent is an <object> and is not set to use fallback content, I
158 // should be ignored and not get a renderer. 158 // should be ignored and not get a renderer.
159 ContainerNode* p = parentNode(); 159 ContainerNode* p = parentNode();
160 if (isHTMLObjectElement(p)) { 160 if (isHTMLObjectElement(p)) {
161 ASSERT(p->layoutObject()); 161 ASSERT(p->layoutObject());
162 if (!toHTMLObjectElement(p)->useFallbackContent()) { 162 if (!toHTMLObjectElement(p)->useFallbackContent()) {
(...skipping 23 matching lines...) Expand all
186 { 186 {
187 // http://www.whatwg.org/specs/web-apps/current-work/#exposed 187 // http://www.whatwg.org/specs/web-apps/current-work/#exposed
188 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor (*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) { 188 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor (*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) {
189 if (object->isExposed()) 189 if (object->isExposed())
190 return false; 190 return false;
191 } 191 }
192 return true; 192 return true;
193 } 193 }
194 194
195 } 195 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLEmbedElement.h ('k') | Source/core/html/HTMLFieldSetElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698