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

Unified Diff: sky/engine/core/loader/ImageLoader.cpp

Issue 1228463002: Remove RenderImage (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 | « sky/engine/core/loader/ImageLoader.h ('k') | sky/engine/core/rendering/HitTestResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/loader/ImageLoader.cpp
diff --git a/sky/engine/core/loader/ImageLoader.cpp b/sky/engine/core/loader/ImageLoader.cpp
index 94c3e143ee3eb86ae92143f0959eaa769c8544c7..a4ddc9acaffc17388c95251f49acd572457169c2 100644
--- a/sky/engine/core/loader/ImageLoader.cpp
+++ b/sky/engine/core/loader/ImageLoader.cpp
@@ -32,7 +32,6 @@
#include "sky/engine/core/fetch/ResourceFetcher.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/html/parser/HTMLParserIdioms.h"
-#include "sky/engine/core/rendering/RenderImage.h"
#include "sky/engine/platform/Logging.h"
#include "sky/engine/public/platform/WebURLRequest.h"
@@ -155,9 +154,6 @@ void ImageLoader::setImageWithoutConsideringPendingLoadEvent(ImageResource* newI
if (oldImage)
oldImage->removeClient(this);
}
-
- if (RenderImageResource* imageResource = renderImageResource())
- imageResource->resetAnimation();
}
inline void ImageLoader::crossSiteOrCSPViolationOccured(AtomicString imageSourceURL)
@@ -250,13 +246,8 @@ void ImageLoader::doUpdateFromElement(UpdateFromElementBehavior updateBehavior)
if (oldImage)
oldImage->removeClient(this);
- } else if (updateBehavior == UpdateSizeChanged && m_element->renderer() && m_element->renderer()->isImage()) {
- toRenderImage(m_element->renderer())->intrinsicSizeChanged();
}
- if (RenderImageResource* imageResource = renderImageResource())
- imageResource->resetAnimation();
-
// Only consider updating the protection ref-count of the Element immediately before returning
// from this function as doing so might result in the destruction of this ImageLoader.
updatedHasPendingEvent();
@@ -347,32 +338,8 @@ void ImageLoader::notifyFinished(Resource* resource)
loadEventSender().dispatchEventSoon(this);
}
-RenderImageResource* ImageLoader::renderImageResource()
-{
- RenderObject* renderer = m_element->renderer();
-
- if (!renderer)
- return 0;
-
- if (renderer->isImage())
- return toRenderImage(renderer)->imageResource();
-
- return 0;
-}
-
void ImageLoader::updateRenderer()
{
- RenderImageResource* imageResource = renderImageResource();
-
- if (!imageResource)
- return;
-
- // Only update the renderer if it doesn't have an image or if what we have
- // is a complete image. This prevents flickering in the case where a dynamic
- // change is happening between two images.
- ImageResource* cachedImage = imageResource->cachedImage();
- if (m_image != cachedImage && (m_imageComplete || !cachedImage))
- imageResource->setImageResource(m_image.get());
}
void ImageLoader::updatedHasPendingEvent()
« no previous file with comments | « sky/engine/core/loader/ImageLoader.h ('k') | sky/engine/core/rendering/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698