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

Unified Diff: sky/engine/core/rendering/RenderObject.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/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index 0dbdb57cb1b49aea300cbb56758058d7be1eb666..4eaad0b6663d7205b868cb4790e9de5beaea7a63 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -45,8 +45,6 @@
#include "sky/engine/core/rendering/HitTestResult.h"
#include "sky/engine/core/rendering/RenderFlexibleBox.h"
#include "sky/engine/core/rendering/RenderGeometryMap.h"
-#include "sky/engine/core/rendering/RenderImage.h"
-#include "sky/engine/core/rendering/RenderImageResourceStyleImage.h"
#include "sky/engine/core/rendering/RenderInline.h"
#include "sky/engine/core/rendering/RenderLayer.h"
#include "sky/engine/core/rendering/RenderObjectInlines.h"
@@ -137,8 +135,7 @@ DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, renderObjectCounter, ("Rend
unsigned RenderObject::s_instanceCount = 0;
RenderObject::RenderObject(Node* node)
- : ImageResourceClient()
- , m_style(nullptr)
+ : m_style(nullptr)
, m_node(node)
, m_parent(nullptr)
, m_previous(nullptr)
@@ -1723,13 +1720,6 @@ void RenderObject::getTextDecorations(unsigned decorations, AppliedTextDecoratio
}
}
-bool RenderObject::willRenderImage(ImageResource*)
-{
- // FIXME(sky): Do we want to keep this?
- // We will not render a new image when Active DOM is suspended
- return !document().activeDOMObjectsAreSuspended();
-}
-
int RenderObject::caretMinOffset() const
{
return 0;
@@ -1768,17 +1758,6 @@ bool RenderObject::supportsTouchAction() const
return true;
}
-void RenderObject::imageChanged(ImageResource* image, const IntRect* rect)
-{
- imageChanged(static_cast<WrappedImagePtr>(image), rect);
-}
-
-void RenderObject::imageChanged(WrappedImagePtr, const IntRect*)
-{
- if (parent())
- document().scheduleVisualUpdate();
-}
-
Element* RenderObject::offsetParent() const
{
Node* node = 0;
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698