Source/core/layout/LayoutBlock.cpp - Issue 940373003: Rename RenderText to LayoutText

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 940373003: Rename RenderText to LayoutText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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 unified diff | Download patch

« no previous file with comments | « Source/core/layout/LayoutBR.cpp ('k') | Source/core/layout/LayoutBlockFlow.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2007 David Smith (catfish.man@gmail.com)	4 * (C) 2007 David Smith (catfish.man@gmail.com)

5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.	6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 #include "core/layout/HitTestResult.h"	42 #include "core/layout/HitTestResult.h"

43 #include "core/layout/Layer.h"	43 #include "core/layout/Layer.h"

44 #include "core/layout/LayoutDeprecatedFlexibleBox.h"	44 #include "core/layout/LayoutDeprecatedFlexibleBox.h"

45 #include "core/layout/LayoutFlexibleBox.h"	45 #include "core/layout/LayoutFlexibleBox.h"

46 #include "core/layout/LayoutFlowThread.h"	46 #include "core/layout/LayoutFlowThread.h"

47 #include "core/layout/LayoutGrid.h"	47 #include "core/layout/LayoutGrid.h"

48 #include "core/layout/LayoutInline.h"	48 #include "core/layout/LayoutInline.h"

49 #include "core/layout/LayoutObject.h"	49 #include "core/layout/LayoutObject.h"

50 #include "core/layout/LayoutRegion.h"	50 #include "core/layout/LayoutRegion.h"

51 #include "core/layout/LayoutTableCell.h"	51 #include "core/layout/LayoutTableCell.h"

	52 #include "core/layout/LayoutTextCombine.h"

52 #include "core/layout/LayoutTextControl.h"	53 #include "core/layout/LayoutTextControl.h"

	54 #include "core/layout/LayoutTextFragment.h"

53 #include "core/layout/LayoutTheme.h"	55 #include "core/layout/LayoutTheme.h"

54 #include "core/layout/LayoutView.h"	56 #include "core/layout/LayoutView.h"

55 #include "core/layout/PaintInfo.h"	57 #include "core/layout/PaintInfo.h"

56 #include "core/layout/TextAutosizer.h"	58 #include "core/layout/TextAutosizer.h"

57 #include "core/layout/line/InlineIterator.h"	59 #include "core/layout/line/InlineIterator.h"

58 #include "core/layout/line/InlineTextBox.h"	60 #include "core/layout/line/InlineTextBox.h"

59 #include "core/layout/shapes/ShapeOutsideInfo.h"	61 #include "core/layout/shapes/ShapeOutsideInfo.h"

60 #include "core/layout/style/ContentData.h"	62 #include "core/layout/style/ContentData.h"

61 #include "core/layout/style/LayoutStyle.h"	63 #include "core/layout/style/LayoutStyle.h"

62 #include "core/page/Page.h"	64 #include "core/page/Page.h"

63 #include "core/paint/BlockPainter.h"	65 #include "core/paint/BlockPainter.h"

64 #include "core/paint/BoxPainter.h"	66 #include "core/paint/BoxPainter.h"

65 #include "core/paint/RenderDrawingRecorder.h"	67 #include "core/paint/RenderDrawingRecorder.h"

66 #include "core/rendering/RenderCombineText.h"

67 #include "core/rendering/RenderTextFragment.h"

68 #include "platform/geometry/FloatQuad.h"	68 #include "platform/geometry/FloatQuad.h"

69 #include "platform/geometry/TransformState.h"	69 #include "platform/geometry/TransformState.h"

70 #include "wtf/StdLibExtras.h"	70 #include "wtf/StdLibExtras.h"

71 #include "wtf/TemporaryChange.h"	71 #include "wtf/TemporaryChange.h"

72	72

73 using namespace WTF;	73 using namespace WTF;

74 using namespace Unicode;	74 using namespace Unicode;

75	75

76 namespace blink {	76 namespace blink {

77	77

(...skipping 3851 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
3929 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const	3929 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const

3930 {	3930 {

3931 showLayoutObject();	3931 showLayoutObject();

3932 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())	3932 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())

3933 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);	3933 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);

3934 }	3934 }

3935	3935

3936 #endif	3936 #endif

3937	3937

3938 } // namespace blink	3938 } // namespace blink

OLD	NEW