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

Unified Diff: Source/core/html/HTMLPlugInImageElement.cpp

Issue 24430002: Rename attach and detach to createRenderTree/destroyRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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
Index: Source/core/html/HTMLPlugInImageElement.cpp
diff --git a/Source/core/html/HTMLPlugInImageElement.cpp b/Source/core/html/HTMLPlugInImageElement.cpp
index 51e23426c7997cad05b339f0e05b8d93854322d9..729a60c11755b16298f834b491f617dd8b62c22d 100644
--- a/Source/core/html/HTMLPlugInImageElement.cpp
+++ b/Source/core/html/HTMLPlugInImageElement.cpp
@@ -147,17 +147,17 @@ void HTMLPlugInImageElement::willRecalcStyle(StyleRecalcChange)
{
// FIXME: Why is this necessary? Manual re-attach is almost always wrong.
if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType())
- reattach();
+ recreateRenderTree();
}
-void HTMLPlugInImageElement::attach(const AttachContext& context)
+void HTMLPlugInImageElement::createRenderTree(const AttachContext& context)
{
bool isImage = isImageType();
if (!isImage)
PostAttachCallbacks::queueCallback(HTMLPlugInImageElement::updateWidgetCallback, this);
- HTMLPlugInElement::attach(context);
+ HTMLPlugInElement::createRenderTree(context);
if (isImage && renderer() && !useFallbackContent()) {
if (!m_imageLoader)
@@ -166,7 +166,7 @@ void HTMLPlugInImageElement::attach(const AttachContext& context)
}
}
-void HTMLPlugInImageElement::detach(const AttachContext& context)
+void HTMLPlugInImageElement::destroyRenderTree(const AttachContext& context)
{
// FIXME: Because of the insanity that is HTMLPlugInImageElement::recalcStyle,
// we can end up detaching during an attach() call, before we even have a
@@ -174,7 +174,7 @@ void HTMLPlugInImageElement::detach(const AttachContext& context)
if (attached() && renderer() && !useFallbackContent())
// Update the widget the next time we attach (detaching destroys the plugin).
setNeedsWidgetUpdate(true);
- HTMLPlugInElement::detach(context);
+ HTMLPlugInElement::destroyRenderTree(context);
}
void HTMLPlugInImageElement::updateWidgetIfNecessary()

Powered by Google App Engine
This is Rietveld 408576698