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

Unified Diff: sky/engine/core/html/HTMLImageElement.cpp

Issue 732163004: Teach HTMLImageElement that it doesn't need ::attach. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Swap logic. Created 6 years, 1 month 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: sky/engine/core/html/HTMLImageElement.cpp
diff --git a/sky/engine/core/html/HTMLImageElement.cpp b/sky/engine/core/html/HTMLImageElement.cpp
index 113fee9a404e58f95727dfabd358d6059ed5fc81..0cb3654b06671c06c0c2c07efea33176ccbc7768 100644
--- a/sky/engine/core/html/HTMLImageElement.cpp
+++ b/sky/engine/core/html/HTMLImageElement.cpp
@@ -149,6 +149,11 @@ RenderObject* HTMLImageElement::createRenderer(RenderStyle* style)
RenderImage* image = new RenderImage(this);
image->setImageResource(RenderImageResource::create());
image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
+
+ RenderImageResource* imageResource = image->imageResource();
+ if (cachedImage() || imageResource->cachedImage())
+ imageResource->setImageResource(cachedImage());
+
return image;
}
@@ -160,21 +165,6 @@ bool HTMLImageElement::canStartSelection() const
return false;
}
-void HTMLImageElement::attach(const AttachContext& context)
-{
- HTMLElement::attach(context);
-
- if (renderer() && renderer()->isImage()) {
- RenderImage* renderImage = toRenderImage(renderer());
- RenderImageResource* renderImageResource = renderImage->imageResource();
- if (renderImageResource->hasImage())
- return;
-
- if (imageLoader().image() || renderImageResource->cachedImage())
- renderImageResource->setImageResource(imageLoader().image());
- }
-}
-
Node::InsertionNotificationRequest HTMLImageElement::insertedInto(ContainerNode* insertionPoint)
{
if (m_listener)

Powered by Google App Engine
This is Rietveld 408576698