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

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

Issue 930183002: Move and rename RenderEmbeddedObject and RenderIFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rename properly to LayoutIFrame in test expectations. Created 5 years, 10 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/html/HTMLAppletElement.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.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 15 matching lines...) Expand all
26 26
27 #include "core/CSSPropertyNames.h" 27 #include "core/CSSPropertyNames.h"
28 #include "core/HTMLNames.h" 28 #include "core/HTMLNames.h"
29 #include "core/dom/Attribute.h" 29 #include "core/dom/Attribute.h"
30 #include "core/dom/ElementTraversal.h" 30 #include "core/dom/ElementTraversal.h"
31 #include "core/dom/shadow/ShadowRoot.h" 31 #include "core/dom/shadow/ShadowRoot.h"
32 #include "core/html/HTMLImageLoader.h" 32 #include "core/html/HTMLImageLoader.h"
33 #include "core/html/HTMLObjectElement.h" 33 #include "core/html/HTMLObjectElement.h"
34 #include "core/html/PluginDocument.h" 34 #include "core/html/PluginDocument.h"
35 #include "core/html/parser/HTMLParserIdioms.h" 35 #include "core/html/parser/HTMLParserIdioms.h"
36 #include "core/layout/LayoutEmbeddedObject.h"
36 #include "core/layout/LayoutPart.h" 37 #include "core/layout/LayoutPart.h"
37 #include "core/rendering/RenderEmbeddedObject.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 using namespace HTMLNames; 41 using namespace HTMLNames;
42 42
43 inline HTMLEmbedElement::HTMLEmbedElement(Document& document, bool createdByPars er) 43 inline HTMLEmbedElement::HTMLEmbedElement(Document& document, bool createdByPars er)
44 : HTMLPlugInElement(embedTag, document, createdByParser, ShouldPreferPlugIns ForImages) 44 : HTMLPlugInElement(embedTag, document, createdByParser, ShouldPreferPlugIns ForImages)
45 { 45 {
46 } 46 }
47 47
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 for (const Attribute& attribute : attributes) { 116 for (const Attribute& attribute : attributes) {
117 paramNames.append(attribute.localName().string()); 117 paramNames.append(attribute.localName().string());
118 paramValues.append(attribute.value().string()); 118 paramValues.append(attribute.value().string());
119 } 119 }
120 } 120 }
121 121
122 // FIXME: This should be unified with HTMLObjectElement::updateWidget and 122 // FIXME: This should be unified with HTMLObjectElement::updateWidget and
123 // moved down into HTMLPluginElement.cpp 123 // moved down into HTMLPluginElement.cpp
124 void HTMLEmbedElement::updateWidgetInternal() 124 void HTMLEmbedElement::updateWidgetInternal()
125 { 125 {
126 ASSERT(!renderEmbeddedObject()->showsUnavailablePluginIndicator()); 126 ASSERT(!layoutEmbeddedObject()->showsUnavailablePluginIndicator());
127 ASSERT(needsWidgetUpdate()); 127 ASSERT(needsWidgetUpdate());
128 setNeedsWidgetUpdate(false); 128 setNeedsWidgetUpdate(false);
129 129
130 if (m_url.isEmpty() && m_serviceType.isEmpty()) 130 if (m_url.isEmpty() && m_serviceType.isEmpty())
131 return; 131 return;
132 132
133 // Note these pass m_url and m_serviceType to allow better code sharing with 133 // Note these pass m_url and m_serviceType to allow better code sharing with
134 // <object> which modifies url and serviceType before calling these. 134 // <object> which modifies url and serviceType before calling these.
135 if (!allowedToLoadFrameURL(m_url)) 135 if (!allowedToLoadFrameURL(m_url))
136 return; 136 return;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 { 190 {
191 // http://www.whatwg.org/specs/web-apps/current-work/#exposed 191 // http://www.whatwg.org/specs/web-apps/current-work/#exposed
192 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor (*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) { 192 for (HTMLObjectElement* object = Traversal<HTMLObjectElement>::firstAncestor (*this); object; object = Traversal<HTMLObjectElement>::firstAncestor(*object)) {
193 if (object->isExposed()) 193 if (object->isExposed())
194 return false; 194 return false;
195 } 195 }
196 return true; 196 return true;
197 } 197 }
198 198
199 } 199 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/core/html/HTMLFrameOwnerElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698