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

Unified Diff: sky/engine/core/rendering/style/ShapeValue.h

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/rendering/RenderReplaced.cpp ('k') | sky/engine/core/rendering/style/StyleImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/style/ShapeValue.h
diff --git a/sky/engine/core/rendering/style/ShapeValue.h b/sky/engine/core/rendering/style/ShapeValue.h
index dcbc74b585d833de285dec634dc23c5bdd47f29a..ea5c7b29b3105c5270fcb0dcad26c227222d625a 100644
--- a/sky/engine/core/rendering/style/ShapeValue.h
+++ b/sky/engine/core/rendering/style/ShapeValue.h
@@ -30,7 +30,6 @@
#ifndef SKY_ENGINE_CORE_RENDERING_STYLE_SHAPEVALUE_H_
#define SKY_ENGINE_CORE_RENDERING_STYLE_SHAPEVALUE_H_
-#include "sky/engine/core/fetch/ImageResource.h"
#include "sky/engine/core/rendering/style/BasicShapes.h"
#include "sky/engine/core/rendering/style/RenderStyleConstants.h"
#include "sky/engine/core/rendering/style/StyleImage.h"
@@ -70,8 +69,6 @@ public:
{
if (!image())
return false;
- if (image()->isImageResource() || image()->isImageResourceSet())
- return image()->cachedImage() && image()->cachedImage()->hasImage();
return image()->isGeneratedImage();
}
void setImage(PassRefPtr<StyleImage> image)
« no previous file with comments | « sky/engine/core/rendering/RenderReplaced.cpp ('k') | sky/engine/core/rendering/style/StyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698