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

Unified Diff: Source/core/fetch/ImageResource.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/events/MouseRelatedEvent.cpp ('k') | Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ImageResource.h
diff --git a/Source/core/fetch/ImageResource.h b/Source/core/fetch/ImageResource.h
index c31b0731bcea3bf056498357e90ba169cb47ef10..6c9fa536d06e48288d19fed6815e0e3b6ffdc5ed 100644
--- a/Source/core/fetch/ImageResource.h
+++ b/Source/core/fetch/ImageResource.h
@@ -38,7 +38,7 @@ class ResourceFetcher;
class FloatSize;
class Length;
class MemoryCache;
-class RenderObject;
+class LayoutObject;
class SecurityOrigin;
class ImageResource final : public Resource, public ImageObserver {
@@ -56,17 +56,17 @@ public:
virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
blink::Image* image(); // Returns the nullImage() if the image is not available yet.
- blink::Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
+ blink::Image* imageForRenderer(const LayoutObject*); // Returns the nullImage() if the image is not available yet.
bool hasImage() const { return m_image.get(); }
// Side effect: ensures decoded image is in cache, therefore should only be called when about to draw the image.
// FIXME: Decoding image on the main thread is expensive, so rather than forcing decode, consider returning false
// when image is not decoded yet, as we do in case of deferred decoding.
- bool currentFrameKnownToBeOpaque(const RenderObject*);
+ bool currentFrameKnownToBeOpaque(const LayoutObject*);
static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
bool willPaintBrokenImage() const;
- bool canRender(const RenderObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
+ bool canRender(const LayoutObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
void setContainerSizeForRenderer(const ImageResourceClient*, const IntSize&, float);
bool usesImageContainerSize() const;
@@ -81,7 +81,7 @@ public:
IntrinsicSize // Report the intrinsic size, i.e. ignore whatever has been set extrinsically.
};
// This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
- LayoutSize imageSizeForRenderer(const RenderObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
+ LayoutSize imageSizeForRenderer(const LayoutObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
static void updateBitmapImages(HashSet<ImageResource*>&, bool redecodeImages = false);
« no previous file with comments | « Source/core/events/MouseRelatedEvent.cpp ('k') | Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698