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

Unified Diff: Source/core/css/CSSCanvasValue.cpp

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
Index: Source/core/css/CSSCanvasValue.cpp
diff --git a/Source/core/css/CSSCanvasValue.cpp b/Source/core/css/CSSCanvasValue.cpp
index 5d776799a78e3039108152211fbca6d6d03d75bf..7bf13902e4de48f2c97db7087cdeee85e350134f 100644
--- a/Source/core/css/CSSCanvasValue.cpp
+++ b/Source/core/css/CSSCanvasValue.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "core/css/CSSCanvasValue.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
#include "wtf/text/StringBuilder.h"
namespace blink {
@@ -52,13 +52,13 @@ void CSSCanvasValue::canvasChanged(HTMLCanvasElement*, const FloatRect& changedR
{
IntRect imageChangeRect = enclosingIntRect(changedRect);
for (const auto& curr : clients())
- const_cast<RenderObject*>(curr.key)->imageChanged(static_cast<WrappedImagePtr>(this), &imageChangeRect);
+ const_cast<LayoutObject*>(curr.key)->imageChanged(static_cast<WrappedImagePtr>(this), &imageChangeRect);
}
void CSSCanvasValue::canvasResized(HTMLCanvasElement*)
{
for (const auto& curr : clients())
- const_cast<RenderObject*>(curr.key)->imageChanged(static_cast<WrappedImagePtr>(this));
+ const_cast<LayoutObject*>(curr.key)->imageChanged(static_cast<WrappedImagePtr>(this));
}
#if !ENABLE(OILPAN)
@@ -69,7 +69,7 @@ void CSSCanvasValue::canvasDestroyed(HTMLCanvasElement* element)
}
#endif
-IntSize CSSCanvasValue::fixedSize(const RenderObject* renderer)
+IntSize CSSCanvasValue::fixedSize(const LayoutObject* renderer)
{
if (HTMLCanvasElement* elt = element(&renderer->document()))
return IntSize(elt->width(), elt->height());
@@ -85,7 +85,7 @@ HTMLCanvasElement* CSSCanvasValue::element(Document* document)
return m_element;
}
-PassRefPtr<Image> CSSCanvasValue::image(RenderObject* renderer, const IntSize& /*size*/)
+PassRefPtr<Image> CSSCanvasValue::image(LayoutObject* renderer, const IntSize& /*size*/)
{
ASSERT(clients().contains(renderer));
HTMLCanvasElement* elt = element(&renderer->document());

Powered by Google App Engine
This is Rietveld 408576698