Move rendering/RenderImage* to layout/LayoutImage*

LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt

Index: LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt
diff --git a/LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt
index 7be919efb0daefa494c96f4cd5541eb5a722c47c..b928ec98f75db1be390cfab8e8b30427606f8289 100644
--- a/LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt
+++ b/LayoutTests/platform/android/css1/formatting_model/height_of_lines-expected.txt
@@ -49,10 +49,10 @@ layer at (0,0) size 785x2345
           text run at (0,22) width 371: "by six pixels, three of which are part of the line-box of each line. "
           text run at (371,22) width 373: "Any images within the paragraph should increase the height of the"
           text run at (0,224) width 294: "line-box so that they fit within the line box, such as "
-        RenderImage {IMG} at (294,40) size 200x200
+        LayoutImage {IMG} at (294,40) size 200x200
         RenderText {#text} at (494,224) size 28x16
           text run at (494,224) width 28: " and "
-        RenderImage {IMG} at (522,224) size 200x200
+        LayoutImage {IMG} at (522,224) size 200x200
         RenderText {#text} at (722,224) size 768x238
           text run at (722,224) width 8: ". "
           text run at (730,224) width 38: "This is"
@@ -65,10 +65,10 @@ layer at (0,0) size 785x2345
           text run at (0,22) width 78: "by six pixels. "
           text run at (78,22) width 683: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px),"
           text run at (0,184) width 357: "border (10px) and margins (15px) within the line box, such as "
-        RenderImage {IMG} at (372,55) size 130x130 [border: (10px solid #000000)]
+        LayoutImage {IMG} at (372,55) size 130x130 [border: (10px solid #000000)]
         RenderText {#text} at (517,184) size 28x16
           text run at (517,184) width 28: " and "
-        RenderImage {IMG} at (560,199) size 130x130 [border: (10px solid #000000)]
+        LayoutImage {IMG} at (560,199) size 130x130 [border: (10px solid #000000)]
         RenderText {#text} at (705,184) size 768x256
           text run at (705,184) width 8: ". "
           text run at (713,184) width 38: "This is"
@@ -77,7 +77,7 @@ layer at (0,0) size 785x2345
           text run at (47,366) width 700: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the"
           text run at (0,386) width 768: "bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px"
           text run at (0,424) width 143: "below the top of the text "
-        RenderImage {IMG} at (133,394) size 80x80 [border: (10px solid #000000)]
+        LayoutImage {IMG} at (133,394) size 80x80 [border: (10px solid #000000)]
         RenderText {#text} at (203,424) size 764x58
           text run at (203,424) width 8: ". "
           text run at (211,424) width 553: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward"
@@ -101,10 +101,10 @@ layer at (0,0) size 785x2345
                   text run at (0,22) width 428: "separated by six pixels, three of which are part of the line-box of each line. "
                   text run at (428,22) width 298: "Any images within the paragraph should increase the"
                   text run at (0,224) width 369: "height of the line-box so that they fit within the line box, such as "
-                RenderImage {IMG} at (369,40) size 200x200
+                LayoutImage {IMG} at (369,40) size 200x200
                 RenderText {#text} at (569,224) size 28x16
                   text run at (569,224) width 28: " and "
-                RenderImage {IMG} at (0,244) size 200x200
+                LayoutImage {IMG} at (0,244) size 200x200
                 RenderText {#text} at (200,244) size 738x218
                   text run at (200,244) width 8: ". "
                   text run at (208,244) width 530: "This is additional text to make sure that there is enough room left below the image so that this"
@@ -116,10 +116,10 @@ layer at (0,0) size 785x2345
                   text run at (0,22) width 135: "separated by six pixels. "
                   text run at (135,22) width 596: "Any images within the paragraph should increase the height of the line-box so that they fit, including their"
                   text run at (0,184) width 444: "padding (5px), border (10px) and margins (15px) within the line box, such as "
-                RenderImage {IMG} at (459,55) size 130x130 [border: (10px solid #000000)]
+                LayoutImage {IMG} at (459,55) size 130x130 [border: (10px solid #000000)]
                 RenderText {#text} at (604,184) size 28x16
                   text run at (604,184) width 28: " and "
-                RenderImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)]
+                LayoutImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)]
                 RenderText {#text} at (160,204) size 729x236
                   text run at (160,204) width 8: ". "
                   text run at (168,204) width 553: "This is additional text to make sure that there is enough room left below the image so that this line"
@@ -127,7 +127,7 @@ layer at (0,0) size 785x2345
                   text run at (261,366) width 468: "It is the outer edge of the margin that should be text-bottom and text-top aligned in"
                   text run at (0,386) width 728: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the"
                   text run at (0,424) width 415: "second image the top border should begin 15px below the top of the text "
-                RenderImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)]
+                LayoutImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)]
                 RenderText {#text} at (475,424) size 723x58
                   text run at (475,424) width 8: ". "
                   text run at (483,424) width 240: "The last image in this paragraph has -10px"