Move rendering/RenderBox to layout/LayoutBox.

Source/core/html/HTMLCanvasElement.cpp

Index: Source/core/html/HTMLCanvasElement.cpp
diff --git a/Source/core/html/HTMLCanvasElement.cpp b/Source/core/html/HTMLCanvasElement.cpp
index 5b854b922621bf458586eab94b3abffe9379e3c5..992a653e969e6047158bb51a6ce62696118ab86c 100644
--- a/Source/core/html/HTMLCanvasElement.cpp
+++ b/Source/core/html/HTMLCanvasElement.cpp
@@ -294,7 +294,7 @@ void HTMLCanvasElement::didFinalizeFrame()
     // before restarting with a blank dirty rect.
     FloatRect srcRect(0, 0, size().width(), size().height());
     m_dirtyRect.intersect(srcRect);
-    if (RenderBox* ro = renderBox()) {
+    if (LayoutBox* ro = layoutBox()) {
         FloatRect mappedDirtyRect = mapRect(m_dirtyRect, srcRect, ro->contentBoxRect());
         // For querying Layer::compositingState()
         // FIXME: is this invalidation using the correct compositing state?
@@ -379,8 +379,8 @@ void HTMLCanvasElement::reset()
         if (renderer->isCanvas()) {
             if (oldSize != size()) {
                 toLayoutHTMLCanvas(renderer)->canvasSizeChanged();
-                if (renderBox() && renderBox()->hasAcceleratedCompositing())
-                    renderBox()->contentChanged(CanvasChanged);
+                if (layoutBox() && layoutBox()->hasAcceleratedCompositing())
+                    layoutBox()->contentChanged(CanvasChanged);
             }
             if (hadImageBuffer)
                 renderer->setShouldDoFullPaintInvalidation();
@@ -398,7 +398,7 @@ bool HTMLCanvasElement::paintsIntoCanvasBuffer() const
     if (!m_context->isAccelerated())
         return true;
 
-    if (renderBox() && renderBox()->hasAcceleratedCompositing())
+    if (layoutBox() && layoutBox()->hasAcceleratedCompositing())
         return false;
 
     return true;