Rename RenderText to LayoutText

Rename RenderText to LayoutText

Rename and move RenderText, RenderCombineText, and RenderTextFragment to
LayoutText, LayoutCombineText, and LayoutTextFragment respectively. Move
from core/rendering to core/layout and updated all includes/build rules.

TBR=dsinclair@chromium.org
NOTRY=true

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=190960

[eae, 2015-02-25 18:30:34]

eae@chromium.org changed reviewers:
+ dsinclair@chromium.org

[eae, 2015-02-25 20:50:12]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-25 20:50:31]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/60001

[eae, 2015-02-25 23:21:21]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-25 23:22:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/80001

[eae, 2015-02-25 23:45:33]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-25 23:45:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/100001

[commit-bot: I haz the power, 2015-02-26 09:22:18]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-26 09:22:20]

Failed to apply patch for Source/core/dom/ContainerNode.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/dom/ContainerNode.cpp
  Hunk #1 FAILED at 45.
  1 out of 3 hunks FAILED -- saving rejects to file
Source/core/dom/ContainerNode.cpp.rej

Patch:       Source/core/dom/ContainerNode.cpp
Index: Source/core/dom/ContainerNode.cpp
diff --git a/Source/core/dom/ContainerNode.cpp
b/Source/core/dom/ContainerNode.cpp
index
153993f9cd830ede19eb0a3a72e6d0bbd9a1a176..fcf0cd9492f67a929820f99fa5a3cf617b88fbac
100644
--- a/Source/core/dom/ContainerNode.cpp
+++ b/Source/core/dom/ContainerNode.cpp
@@ -45,11 +45,11 @@
 #include "core/html/HTMLTagCollection.h"
 #include "core/html/RadioNodeList.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/layout/LayoutText.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/rendering/RenderInline.h"
-#include "core/rendering/RenderText.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/ScriptForbiddenScope.h"
 
@@ -901,12 +901,12 @@ bool ContainerNode::getUpperLeftCorner(FloatPoint& point)
const
             return true;
         }
 
-        if (p->node() && p->node() == this && o->isText() && !o->isBR() &&
!toRenderText(o)->firstTextBox()) {
+        if (p->node() && p->node() == this && o->isText() && !o->isBR() &&
!toLayoutText(o)->firstTextBox()) {
             // Do nothing - skip unrendered whitespace that is a child or next
sibling of the anchor.
         } else if ((o->isText() && !o->isBR()) || o->isReplaced()) {
             point = FloatPoint();
-            if (o->isText() && toRenderText(o)->firstTextBox()) {
-                point.move(toRenderText(o)->linesBoundingBox().x(),
toRenderText(o)->firstTextBox()->root().lineTop().toFloat());
+            if (o->isText() && toLayoutText(o)->firstTextBox()) {
+                point.move(toLayoutText(o)->linesBoundingBox().x(),
toLayoutText(o)->firstTextBox()->root().lineTop().toFloat());
             } else if (o->isBox()) {
                 LayoutBox* box = toLayoutBox(o);
                 point.moveBy(box->location());
@@ -993,7 +993,7 @@ bool ContainerNode::getLowerRightCorner(FloatPoint& point)
const
         if (o->isText() || o->isReplaced()) {
             point = FloatPoint();
             if (o->isText()) {
-                RenderText* text = toRenderText(o);
+                LayoutText* text = toLayoutText(o);
                 IntRect linesBox = text->linesBoundingBox();
                 if (!linesBox.maxX() && !linesBox.maxY())
                     continue;

[commit-bot: I haz the power, 2015-02-26 09:22:25]

The CQ bit was unchecked by commit-bot@chromium.org

[dsinclair, 2015-02-26 14:25:26]

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
File Source/core/layout/LayoutCombineText.h (right):

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
Source/core/layout/LayoutCombineText.h:32: class LayoutCombineText final :
public LayoutText {
Can we make this LayoutTextCombine to be consistent with LayoutText and
LayoutTextFragment? This was discussed on blink-dev and there were no
objections.

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
Source/core/layout/LayoutCombineText.h:47: virtual const char* renderName()
const override { return "RenderCombineText"; }
This RenderCombineText should be updated to reflect the new class name. There
are 45 layout test expectation files that can be updated in this CL as well.

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
File Source/core/layout/LayoutTextFragment.h (right):

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
Source/core/layout/LayoutTextFragment.h:68: virtual const char* renderName()
const override final { return "RenderTextFragment"; }
Can we make this LayoutTextFragment in this cl and just update all of the
expectations? There are 727 files which will need to be updated.

From the LayoutTest directory I've been doing the following for *.txt and *.html

 find . -type f -name "*.html" -exec sed -i"" -e
"s/RenderCombineText/LayoutTextCombine/g" {} \;

[eae, 2015-02-26 17:47:42]

The CQ bit was checked by eae@chromium.org

[eae, 2015-02-26 17:47:45]

The CQ bit was unchecked by eae@chromium.org

[eae, 2015-02-26 17:48:54]

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
File Source/core/layout/LayoutCombineText.h (right):

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
Source/core/layout/LayoutCombineText.h:32: class LayoutCombineText final :
public LayoutText {
On 2015/02/26 14:25:26, dsinclair wrote:
> Can we make this LayoutTextCombine to be consistent with LayoutText and
> LayoutTextFragment? This was discussed on blink-dev and there were no
> objections.

Sure, will do.

https://codereview.chromium.org/940373003/diff/100001/Source/core/layout/Layo...
Source/core/layout/LayoutCombineText.h:47: virtual const char* renderName()
const override { return "RenderCombineText"; }
On 2015/02/26 14:25:26, dsinclair wrote:
> This RenderCombineText should be updated to reflect the new class name. There
> are 45 layout test expectation files that can be updated in this CL as well.

Was going to do the layout test changes in a separate CL but I suppose I mnight
as well do it in one go.

[eae, 2015-02-26 18:26:26]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-26 18:27:33]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/120001

[eae, 2015-02-26 19:52:58]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-26 19:53:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/140001

[commit-bot: I haz the power, 2015-02-26 21:02:52]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-02-26 21:02:54]

Try jobs failed on following builders:
  linux_blink_rel on tryserver.blink (JOB_FAILED,
http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/4...)

[eae, 2015-02-26 22:26:34]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2015-02-26 22:27:19]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940373003/160001

[commit-bot: I haz the power, 2015-02-26 22:28:51]

Committed patchset #9 (id:160001) as
https://src.chromium.org/viewvc/blink?view=rev&revision=190960