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

Unified Diff: Source/core/html/HTMLAppletElement.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/html/HTMLEmbedElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLAppletElement.cpp
diff --git a/Source/core/html/HTMLAppletElement.cpp b/Source/core/html/HTMLAppletElement.cpp
index 0398e813e9824099b455fe889275413e9a7c16e6..20642d94e0dc7ad073a36a4a0059b9767c384492 100644
--- a/Source/core/html/HTMLAppletElement.cpp
+++ b/Source/core/html/HTMLAppletElement.cpp
@@ -120,7 +120,7 @@ void HTMLAppletElement::updateWidgetInternal()
if (!isFinishedParsingChildren())
return;
- RenderEmbeddedObject* renderer = renderEmbeddedObject();
+ LayoutEmbeddedObject* renderer = layoutEmbeddedObject();
LocalFrame* frame = document().frame();
ASSERT(frame);
@@ -193,7 +193,7 @@ void HTMLAppletElement::updateWidgetInternal()
if (!placeholder && !widget) {
if (!renderer->showsUnavailablePluginIndicator())
- renderer->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginMissing);
+ renderer->setPluginUnavailabilityReason(LayoutEmbeddedObject::PluginMissing);
setPlaceholder(nullptr);
} else if (placeholder) {
setPlaceholder(placeholder.release());
@@ -228,7 +228,7 @@ bool HTMLAppletElement::canEmbedURL(const KURL& url) const
if (!document().contentSecurityPolicy()->allowObjectFromSource(url)
|| !document().contentSecurityPolicy()->allowPluginType(m_serviceType, m_serviceType, url)) {
- renderEmbeddedObject()->setPluginUnavailabilityReason(RenderEmbeddedObject::PluginBlockedByContentSecurityPolicy);
+ layoutEmbeddedObject()->setPluginUnavailabilityReason(LayoutEmbeddedObject::PluginBlockedByContentSecurityPolicy);
return false;
}
return true;
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/html/HTMLEmbedElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698