Changeset 156054 in webkit


Ignore:
Timestamp:
Sep 18, 2013, 11:04:32 AM (12 years ago)
Author:
Antti Koivisto
Message:

Rename RenderBR to RenderLineBreak
​https://bugs.webkit.org/show_bug.cgi?id=121560

Reviewed by Sam Weinig.

It now represents both hard (br) and soft (wbr) line breaks.

Location:
trunk/Source/WebCore
Files:
18 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r156049 r156054  
    21222122    rendering/PointerEventsHitRules.cpp
    21232123    rendering/RenderArena.cpp
    2124     rendering/RenderBR.cpp
    21252124    rendering/RenderBlock.cpp
    21262125    rendering/RenderBlockFlow.cpp
    … …  
    21572156    rendering/RenderLayerModelObject.cpp
    21582157    rendering/RenderLineBoxList.cpp
     2158    rendering/RenderLineBreak.cpp
    21592159    rendering/RenderListBox.cpp
    21602160    rendering/RenderListItem.cpp

  • trunk/Source/WebCore/ChangeLog

    r156053 r156054  
     12013-09-18  Antti Koivisto  <antti@apple.com>
     2
     3        Rename RenderBR to RenderLineBreak
     4        https://bugs.webkit.org/show_bug.cgi?id=121560
     5
     6        Reviewed by Sam Weinig.
     7
     8        It now represents both hard (br) and soft (wbr) line breaks.
     9
    1102013-09-18  Robert Hogan  <robert@webkit.org>
    211

  • trunk/Source/WebCore/GNUmakefile.list.am

    r156049 r156054  
    44174417        Source/WebCore/rendering/RenderBoxModelObject.cpp \
    44184418        Source/WebCore/rendering/RenderBoxModelObject.h \
    4419         Source/WebCore/rendering/RenderBR.cpp \
    4420         Source/WebCore/rendering/RenderBR.h \
    44214419        Source/WebCore/rendering/RenderButton.cpp \
    44224420        Source/WebCore/rendering/RenderButton.h \
    … …  
    44784476        Source/WebCore/rendering/RenderLineBoxList.cpp \
    44794477        Source/WebCore/rendering/RenderLineBoxList.h \
     4478        Source/WebCore/rendering/RenderLineBreak.cpp \
     4479        Source/WebCore/rendering/RenderLineBreak.h \
    44804480        Source/WebCore/rendering/RenderListBox.cpp \
    44814481        Source/WebCore/rendering/RenderListBox.h \

  • trunk/Source/WebCore/Target.pri

    r156049 r156054  
    11561156    rendering/RenderBox.cpp \
    11571157    rendering/RenderBoxModelObject.cpp \
    1158     rendering/RenderBR.cpp \
    11591158    rendering/RenderButton.cpp \
    11601159    rendering/RenderCombineText.cpp \
    … …  
    11841183    rendering/RenderLayerModelObject.cpp \
    11851184    rendering/RenderLineBoxList.cpp \
     1185    rendering/RenderLineBreak.cpp \
    11861186    rendering/RenderListBox.cpp \
    11871187    rendering/RenderListItem.cpp \
    … …  
    24252425    rendering/RenderBox.h \
    24262426    rendering/RenderBoxModelObject.h \
    2427     rendering/RenderBR.h \
    24282427    rendering/RenderButton.h \
    24292428    rendering/RenderCombineText.h \
    … …  
    24522451    rendering/RenderLayerModelObject.h \
    24532452    rendering/RenderLineBoxList.h \
     2453    rendering/RenderLineBreak.h \
    24542454    rendering/RenderListBox.h \
    24552455    rendering/RenderListItem.h \

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r156038 r156054  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    … …  
    97399739      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    97409740    </ClCompile>
    9741     <ClCompile Include="..\rendering\RenderBR.cpp">
     9741    <ClCompile Include="..\rendering\RenderLineBreak.cpp">
    97429742      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    97439743      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    … …  
    1995819958    <ClInclude Include="..\rendering\RenderBox.h" />
    1995919959    <ClInclude Include="..\rendering\RenderBoxModelObject.h" />
    19960     <ClInclude Include="..\rendering\RenderBR.h" />
    1996119960    <ClInclude Include="..\rendering\RenderButton.h" />
    1996219961    <ClInclude Include="..\rendering\RenderCombineText.h" />
    … …  
    1998819987    <ClInclude Include="..\rendering\RenderLineBoxList.h" />
    1998919988    <ClInclude Include="..\rendering\RenderListBox.h" />
     19989    <ClInclude Include="..\rendering\RenderLineBreak.h" />
    1999019990    <ClInclude Include="..\rendering\RenderListItem.h" />
    1999119991    <ClInclude Include="..\rendering\RenderListMarker.h" />

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r156049 r156054  
    51215121                BCEA4861097D93020094C9E4 /* RenderBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4822097D93020094C9E4 /* RenderBox.cpp */; };
    51225122                BCEA4862097D93020094C9E4 /* RenderBox.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4823097D93020094C9E4 /* RenderBox.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5123                 BCEA4863097D93020094C9E4 /* RenderBR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4824097D93020094C9E4 /* RenderBR.cpp */; };
    5124                 BCEA4864097D93020094C9E4 /* RenderBR.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4825097D93020094C9E4 /* RenderBR.h */; settings = {ATTRIBUTES = (Private, ); }; };
     5123                BCEA4863097D93020094C9E4 /* RenderLineBreak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4824097D93020094C9E4 /* RenderLineBreak.cpp */; };
     5124                BCEA4864097D93020094C9E4 /* RenderLineBreak.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4825097D93020094C9E4 /* RenderLineBreak.h */; settings = {ATTRIBUTES = (Private, ); }; };
    51255125                BCEA4865097D93020094C9E4 /* RenderButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4826097D93020094C9E4 /* RenderButton.cpp */; };
    51265126                BCEA4866097D93020094C9E4 /* RenderButton.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4827097D93020094C9E4 /* RenderButton.h */; };
    … …  
    1200012000                BCEA4822097D93020094C9E4 /* RenderBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBox.cpp; sourceTree = "<group>"; };
    1200112001                BCEA4823097D93020094C9E4 /* RenderBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderBox.h; sourceTree = "<group>"; };
    12002                 BCEA4824097D93020094C9E4 /* RenderBR.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderBR.cpp; sourceTree = "<group>"; };
    12003                 BCEA4825097D93020094C9E4 /* RenderBR.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderBR.h; sourceTree = "<group>"; };
     12002                BCEA4824097D93020094C9E4 /* RenderLineBreak.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderLineBreak.cpp; sourceTree = "<group>"; };
     12003                BCEA4825097D93020094C9E4 /* RenderLineBreak.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderLineBreak.h; sourceTree = "<group>"; };
    1200412004                BCEA4826097D93020094C9E4 /* RenderButton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RenderButton.cpp; sourceTree = "<group>"; };
    1200512005                BCEA4827097D93020094C9E4 /* RenderButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderButton.h; sourceTree = "<group>"; };
    … …  
    2051720517                                BC96DB420F3A880E00573CB3 /* RenderBoxModelObject.h */,
    2051820518                                BCEB179B143379F50052EAE9 /* RenderBoxRegionInfo.h */,
    20519                                 BCEA4824097D93020094C9E4 /* RenderBR.cpp */,
    20520                                 BCEA4825097D93020094C9E4 /* RenderBR.h */,
    2052120519                                BCEA4826097D93020094C9E4 /* RenderButton.cpp */,
    2052220520                                BCEA4827097D93020094C9E4 /* RenderButton.h */,
    … …  
    2057620574                                BC33FB1A0F30EE85002CDD7C /* RenderLineBoxList.cpp */,
    2057720575                                0BE030A10F3112FB003C1A46 /* RenderLineBoxList.h */,
     20576                                BCEA4824097D93020094C9E4 /* RenderLineBreak.cpp */,
     20577                                BCEA4825097D93020094C9E4 /* RenderLineBreak.h */,
    2057820578                                ABB5419C0ACDDFE4002820EB /* RenderListBox.cpp */,
    2057920579                                ABB5419D0ACDDFE4002820EB /* RenderListBox.h */,
    … …  
    2369323693                                BC96DB430F3A880E00573CB3 /* RenderBoxModelObject.h in Headers */,
    2369423694                                BCEB179C143379F50052EAE9 /* RenderBoxRegionInfo.h in Headers */,
    23695                                 BCEA4864097D93020094C9E4 /* RenderBR.h in Headers */,
     23695                                BCEA4864097D93020094C9E4 /* RenderLineBreak.h in Headers */,
    2369623696                                BCEA4866097D93020094C9E4 /* RenderButton.h in Headers */,
    2369723697                                BCE4413412F748E2009B84B8 /* RenderCombineText.h in Headers */,
    … …  
    2690826908                                BCEA4861097D93020094C9E4 /* RenderBox.cpp in Sources */,
    2690926909                                BC96DB460F3A882200573CB3 /* RenderBoxModelObject.cpp in Sources */,
    26910                                 BCEA4863097D93020094C9E4 /* RenderBR.cpp in Sources */,
     26910                                BCEA4863097D93020094C9E4 /* RenderLineBreak.cpp in Sources */,
    2691126911                                BCEA4865097D93020094C9E4 /* RenderButton.cpp in Sources */,
    2691226912                                07277E5417D018CC0015534D /* JSMediaStreamTrackEvent.cpp in Sources */,

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r155957 r156054  
    6666#include "Page.h"
    6767#include "ProgressTracker.h"
    68 #include "RenderBR.h"
    6968#include "RenderButton.h"
    7069#include "RenderFieldset.h"
    … …  
    7473#include "RenderInline.h"
    7574#include "RenderLayer.h"
     75#include "RenderLineBreak.h"
    7676#include "RenderListBox.h"
    7777#include "RenderListMarker.h"

  • trunk/Source/WebCore/dom/Position.cpp

    r156038 r156054  
    3434#include "Logging.h"
    3535#include "PositionIterator.h"
    36 #include "RenderBR.h"
    3736#include "RenderBlock.h"
    3837#include "RenderInline.h"
     38#include "RenderLineBreak.h"
    3939#include "RenderText.h"
    4040#include "RuntimeEnabledFeatures.h"
    … …  
    5858    if (renderer.isText() && toRenderText(renderer).firstTextBox())
    5959        return true;
    60     if (renderer.isLineBreak() && toRenderBR(renderer).inlineBoxWrapper())
     60    if (renderer.isLineBreak() && toRenderLineBreak(renderer).inlineBoxWrapper())
    6161        return true;
    6262    return false;
    … …  
    858858        if (o->nonPseudoNode()) {
    859859            if ((o->isText() && boundingBoxLogicalHeight(o, toRenderText(o)->linesBoundingBox()))
    860                 || (o->isLineBreak() && boundingBoxLogicalHeight(o, toRenderBR(o)->linesBoundingBox()))
     860                || (o->isLineBreak() && boundingBoxLogicalHeight(o, toRenderLineBreak(o)->linesBoundingBox()))
    861861                || (o->isBox() && toRenderBox(o)->pixelSnappedLogicalHeight())
    862862                || (o->isRenderInline() && isEmptyInline(o) && boundingBoxLogicalHeight(o, toRenderInline(o)->linesBoundingBox())))
    … …  
    11961196
    11971197    if (renderer->isBR())
    1198         inlineBox = !caretOffset ? toRenderBR(renderer)->inlineBoxWrapper() : nullptr;
     1198        inlineBox = !caretOffset ? toRenderLineBreak(renderer)->inlineBoxWrapper() : nullptr;
    11991199    else if (renderer->isText()) {
    12001200        RenderText* textRenderer = toRenderText(renderer);

  • trunk/Source/WebCore/html/HTMLBRElement.cpp

    r156041 r156054  
    2828#include "CSSValueKeywords.h"
    2929#include "HTMLNames.h"
    30 #include "RenderBR.h"
     30#include "RenderLineBreak.h"
    3131
    3232namespace WebCore {
    … …  
    7777        return RenderObject::createObject(*this, style);
    7878
    79     return new (arena) RenderBR(*this);
     79    return new (arena) RenderLineBreak(*this);
    8080}
    8181

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r156041 r156054  
    5050#include "HTMLTextFormControlElement.h"
    5151#include "NodeTraversal.h"
    52 #include "RenderBR.h"
     52#include "RenderLineBreak.h"
    5353#include "ScriptController.h"
    5454#include "ScriptEventListener.h"
    … …  
    792792{
    793793    if (hasLocalName(wbrTag))
    794         return new (arena) RenderBR(*this);
     794        return new (arena) RenderLineBreak(*this);
    795795    return RenderObject::createObject(*this, style);
    796796}

  • trunk/Source/WebCore/rendering/InlineBox.cpp

    r156038 r156054  
    2828#include "PaintInfo.h"
    2929#include "RenderArena.h"
    30 #include "RenderBR.h"
    3130#include "RenderBlock.h"
     31#include "RenderLineBreak.h"
    3232#include "RootInlineBox.h"
    3333
    … …  
    193193            toRenderBox(renderer()).setInlineBoxWrapper(0);
    194194        else if (renderer().isLineBreak())
    195             toRenderBR(renderer()).setInlineBoxWrapper(0);
     195            toRenderLineBreak(renderer()).setInlineBoxWrapper(0);
    196196    }
    197197    destroy(arena);
    … …  
    204204        toRenderBox(renderer()).setInlineBoxWrapper(0);
    205205    else if (renderer().isLineBreak())
    206         toRenderBR(renderer()).setInlineBoxWrapper(0);
     206        toRenderLineBreak(renderer()).setInlineBoxWrapper(0);
    207207}
    208208
    … …  
    213213        toRenderBox(renderer()).setInlineBoxWrapper(this);
    214214    else if (renderer().isLineBreak())
    215         toRenderBR(renderer()).setInlineBoxWrapper(this);
     215        toRenderLineBreak(renderer()).setInlineBoxWrapper(this);
    216216}
    217217

  • trunk/Source/WebCore/rendering/InlineTextBox.cpp

    r156025 r156054  
    3838#include "RenderedDocumentMarker.h"
    3939#include "RenderArena.h"
    40 #include "RenderBR.h"
    4140#include "RenderBlock.h"
    4241#include "RenderCombineText.h"
     42#include "RenderLineBreak.h"
    4343#include "RenderRubyRun.h"
    4444#include "RenderRubyText.h"

  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r156053 r156054  
    3333#include "Logging.h"
    3434#include "RenderArena.h"
    35 #include "RenderBR.h"
    3635#include "RenderCombineText.h"
    3736#include "RenderCounter.h"
    … …  
    3938#include "RenderInline.h"
    4039#include "RenderLayer.h"
     40#include "RenderLineBreak.h"
    4141#include "RenderListMarker.h"
    4242#include "RenderRegion.h"
    … …  
    272272
    273273    if (obj->isLineBreak()) {
    274         InlineBox* inlineBox = toRenderBR(obj)->createInlineBox();
     274        InlineBox* inlineBox = toRenderLineBreak(obj)->createInlineBox();
    275275        // We only treat a box as text for a <br> if we are on a line by ourself or in strict mode
    276276        // (Note the use of strict mode. In "almost strict" mode, we don't treat the box for <br> as text.)
    … …  
    298298        renderText->dirtyLineBoxes(fullLayout);
    299299    } else if (o->isLineBreak())
    300         toRenderBR(o)->dirtyLineBoxes(fullLayout);
     300        toRenderLineBreak(o)->dirtyLineBoxes(fullLayout);
    301301    else
    302302        toRenderInline(o)->dirtyLineBoxes(fullLayout);
    … …  
    930930            toRenderBox(r->m_object)->positionLineBox(r->m_box);
    931931        else if (r->m_object->isLineBreak())
    932             toRenderBR(r->m_object)->replaceInlineBoxWrapper(r->m_box);
     932            toRenderLineBreak(r->m_object)->replaceInlineBoxWrapper(r->m_box);
    933933    }
    934934    // Positioned objects and zero-length text nodes destroy their boxes in

  • trunk/Source/WebCore/rendering/RenderInline.cpp

    r156038 r156054  
    3131#include "Page.h"
    3232#include "RenderArena.h"
    33 #include "RenderBR.h"
    3433#include "RenderBlock.h"
    3534#include "RenderFlowThread.h"
    … …  
    3736#include "RenderGeometryMap.h"
    3837#include "RenderLayer.h"
     38#include "RenderLineBreak.h"
    3939#include "RenderTheme.h"
    4040#include "RenderView.h"
    … …  
    608608            }
    609609        } else if (curr->isLineBreak()) {
    610             if (InlineBox* inlineBox = toRenderBR(curr)->inlineBoxWrapper()) {
     610            if (InlineBox* inlineBox = toRenderLineBreak(curr)->inlineBoxWrapper()) {
    611611                // FIXME: This could use a helper to share these with text path.
    612612                const RootInlineBox& rootBox = inlineBox->root();
    … …  
    909909            return toRenderBox(curr)->inlineBoxWrapper();
    910910        if (curr->isLineBreak()) {
    911             RenderBR* renderBR = toRenderBR(curr);
     911            RenderLineBreak* renderBR = toRenderLineBreak(curr);
    912912            if (renderBR->inlineBoxWrapper())
    913913                return renderBR->inlineBoxWrapper();
    … …  
    937937            return toRenderBox(curr)->inlineBoxWrapper();
    938938        if (curr->isLineBreak()) {
    939             RenderBR* renderBR = toRenderBR(curr);
     939            RenderLineBreak* renderBR = toRenderLineBreak(curr);
    940940            if (renderBR->inlineBoxWrapper())
    941941                return renderBR->inlineBoxWrapper();
    … …  
    13161316                        childText->root().markDirty();
    13171317                } else if (curr->isLineBreak()) {
    1318                     RenderBR* currBR = toRenderBR(curr);
     1318                    RenderLineBreak* currBR = toRenderLineBreak(curr);
    13191319                    if (currBR->inlineBoxWrapper())
    13201320                        currBR->inlineBoxWrapper()->root().markDirty();

  • trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

    r156038 r156054  
    3434#include "PaintInfo.h"
    3535#include "RenderArena.h"
    36 #include "RenderBR.h"
    3736#include "RenderInline.h"
     37#include "RenderLineBreak.h"
    3838#include "RenderView.h"
    3939#include "RootInlineBox.h"
    … …  
    344344                box = &wrapper->root();
    345345        } if (curr->isLineBreak()) {
    346             InlineBox* wrapper = toRenderBR(curr)->inlineBoxWrapper();
     346            InlineBox* wrapper = toRenderLineBreak(curr)->inlineBoxWrapper();
    347347            if (wrapper)
    348348                box = &wrapper->root();

  • trunk/Source/WebCore/rendering/RenderLineBreak.cpp

    r156045 r156054  
    2121
    2222#include "config.h"
    23 #include "RenderBR.h"
     23#include "RenderLineBreak.h"
    2424
    2525#include "Document.h"
    … …  
    3333static const int invalidLineHeight = -1;
    3434
    35 RenderBR::RenderBR(HTMLElement& element)
     35RenderLineBreak::RenderLineBreak(HTMLElement& element)
    3636    : RenderBoxModelObject(&element)
    3737    , m_inlineBoxWrapper(nullptr)
    … …  
    4242}
    4343
    44 RenderBR::~RenderBR()
     44RenderLineBreak::~RenderLineBreak()
    4545{
    4646    if (m_inlineBoxWrapper)
    … …  
    4848}
    4949
    50 LayoutUnit RenderBR::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
     50LayoutUnit RenderLineBreak::lineHeight(bool firstLine, LineDirectionMode /*direction*/, LinePositionMode /*linePositionMode*/) const
    5151{
    5252    if (firstLine && document().styleSheetCollection()->usesFirstLineRules()) {
    … …  
    6262}
    6363
    64 int RenderBR::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
     64int RenderLineBreak::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
    6565{
    6666    const FontMetrics& fontMetrics = style(firstLine)->fontMetrics();
    … …  
    6868}
    6969
    70 InlineBox* RenderBR::createInlineBox()
     70InlineBox* RenderLineBreak::createInlineBox()
    7171{
    7272    return new (renderArena()) InlineBox(*this);
    7373}
    7474
    75 void RenderBR::setInlineBoxWrapper(InlineBox* inlineBox)
     75void RenderLineBreak::setInlineBoxWrapper(InlineBox* inlineBox)
    7676{
    7777    ASSERT(!inlineBox || !m_inlineBoxWrapper);
    … …  
    7979}
    8080
    81 void RenderBR::replaceInlineBoxWrapper(InlineBox* inlineBox)
     81void RenderLineBreak::replaceInlineBoxWrapper(InlineBox* inlineBox)
    8282{
    8383    deleteInlineBoxWrapper();
    … …  
    8585}
    8686
    87 void RenderBR::deleteInlineBoxWrapper()
     87void RenderLineBreak::deleteInlineBoxWrapper()
    8888{
    8989    if (!m_inlineBoxWrapper)
    … …  
    9595}
    9696
    97 void RenderBR::dirtyLineBoxes(bool fullLayout)
     97void RenderLineBreak::dirtyLineBoxes(bool fullLayout)
    9898{
    9999    if (!m_inlineBoxWrapper)
    … …  
    107107}
    108108
    109 int RenderBR::caretMinOffset() const
     109int RenderLineBreak::caretMinOffset() const
    110110{
    111111    return 0;
    112112}
    113113
    114 int RenderBR::caretMaxOffset() const
     114int RenderLineBreak::caretMaxOffset() const
    115115{
    116116    return 1;
    117117}
    118118
    119 bool RenderBR::canBeSelectionLeaf() const
     119bool RenderLineBreak::canBeSelectionLeaf() const
    120120{
    121121    return true;
    122122}
    123123
    124 VisiblePosition RenderBR::positionForPoint(const LayoutPoint&)
     124VisiblePosition RenderLineBreak::positionForPoint(const LayoutPoint&)
    125125{
    126126    return createVisiblePosition(0, DOWNSTREAM);
    127127}
    128128
    129 void RenderBR::setSelectionState(SelectionState state)
     129void RenderLineBreak::setSelectionState(SelectionState state)
    130130{
    131131    RenderBoxModelObject::setSelectionState(state);
    … …  
    135135}
    136136
    137 LayoutRect RenderBR::localCaretRect(InlineBox* inlineBox, int caretOffset, LayoutUnit* extraWidthToEndOfLine)
     137LayoutRect RenderLineBreak::localCaretRect(InlineBox* inlineBox, int caretOffset, LayoutUnit* extraWidthToEndOfLine)
    138138{
    139139    ASSERT_UNUSED(caretOffset, !caretOffset);
    … …  
    147147}
    148148
    149 IntRect RenderBR::linesBoundingBox() const
     149IntRect RenderLineBreak::linesBoundingBox() const
    150150{
    151151    if (!m_inlineBoxWrapper)
    … …  
    164164}
    165165
    166 void RenderBR::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
     166void RenderLineBreak::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
    167167{
    168168    if (!m_inlineBoxWrapper)
    … …  
    171171}
    172172
    173 void RenderBR::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
     173void RenderLineBreak::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
    174174{
    175175    if (!m_inlineBoxWrapper)
    … …  
    178178}
    179179
    180 void RenderBR::updateFromStyle()
     180void RenderLineBreak::updateFromStyle()
    181181{
    182182    m_cachedLineHeight = invalidLineHeight;
    183183}
    184184
    185 IntRect RenderBR::borderBoundingBox() const
     185IntRect RenderLineBreak::borderBoundingBox() const
    186186{
    187187    return IntRect(IntPoint(), linesBoundingBox().size());

  • trunk/Source/WebCore/rendering/RenderLineBreak.h

    r156045 r156054  
    2020 */
    2121
    22 #ifndef RenderBR_h
    23 #define RenderBR_h
     22#ifndef RenderLineBreak_h
     23#define RenderLineBreak_h
    2424
    2525#include "RenderBoxModelObject.h"
    … …  
    3030class Position;
    3131
    32 // FIXME: Rename this to RenderLineBreak.
    33 class RenderBR FINAL : public RenderBoxModelObject {
     32class RenderLineBreak FINAL : public RenderBoxModelObject {
    3433public:
    35     explicit RenderBR(HTMLElement&);
    36     virtual ~RenderBR();
     34    explicit RenderLineBreak(HTMLElement&);
     35    virtual ~RenderLineBreak();
    3736
     37    // FIXME: The lies here keep render tree dump based test results unchanged.
    3838    virtual const char* renderName() const { return m_isWBR ? "RenderWordBreak" : "RenderBR"; }
     39
     40    virtual bool isWBR() const OVERRIDE { return m_isWBR; }
    3941
    4042    InlineBox* createInlineBox();
    … …  
    5254private:
    5355    void node() const WTF_DELETED_FUNCTION;
    54 
    55     virtual bool isWBR() const OVERRIDE { return m_isWBR; }
    5656
    5757    virtual VisiblePosition positionForPoint(const LayoutPoint&) OVERRIDE;
    … …  
    8787};
    8888
    89 inline RenderBR& toRenderBR(RenderObject& object)
     89inline RenderLineBreak& toRenderLineBreak(RenderObject& object)
    9090{
    9191    ASSERT_WITH_SECURITY_IMPLICATION(object.isLineBreak());
    92     return static_cast<RenderBR&>(object);
     92    return static_cast<RenderLineBreak&>(object);
    9393}
    9494
    95 inline const RenderBR& toRenderBR(const RenderObject& object)
     95inline const RenderLineBreak& toRenderLineBreak(const RenderObject& object)
    9696{
    9797    ASSERT_WITH_SECURITY_IMPLICATION(object.isLineBreak());
    98     return static_cast<const RenderBR&>(object);
     98    return static_cast<const RenderLineBreak&>(object);
    9999}
    100100
    101 inline RenderBR* toRenderBR(RenderObject* object)
     101inline RenderLineBreak* toRenderLineBreak(RenderObject* object)
    102102{
    103103    ASSERT_WITH_SECURITY_IMPLICATION(object->isLineBreak());
    104     return static_cast<RenderBR*>(object);
     104    return static_cast<RenderLineBreak*>(object);
    105105}
    106106
    107 inline const RenderBR* toRenderBR(const RenderObject* object)
     107inline const RenderLineBreak* toRenderLineBreak(const RenderObject* object)
    108108{
    109109    ASSERT_WITH_SECURITY_IMPLICATION(object->isLineBreak());
    110     return static_cast<const RenderBR*>(object);
     110    return static_cast<const RenderLineBreak*>(object);
    111111}
    112112
    113113// This will catch anyone doing an unnecessary cast.
    114 void toRenderBR(const RenderBR&);
     114void toRenderLineBreak(const RenderLineBreak&);
    115115
    116116} // namespace WebCore
    117117
    118 #endif // RenderBR_h
     118#endif // RenderLineBreak_h

  • trunk/Source/WebCore/rendering/RenderObjectChildList.cpp

    r156038 r156054  
    2929
    3030#include "AXObjectCache.h"
    31 #include "RenderBR.h"
    3231#include "RenderCounter.h"
     32#include "RenderLineBreak.h"
    3333#include "RenderObject.h"
    3434#include "RenderStyle.h"
    … …  
    7878        toRenderBox(oldChild)->deleteLineBoxWrapper();
    7979    else if (oldChild->isLineBreak())
    80         toRenderBR(oldChild)->deleteInlineBoxWrapper();
     80        toRenderLineBreak(oldChild)->deleteInlineBoxWrapper();
    8181
    8282    // If oldChild is the start or end of the selection, then clear the selection to

  • trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

    r156038 r156054  
    3737#include "PrintContext.h"
    3838#include "PseudoElement.h"
    39 #include "RenderBR.h"
    4039#include "RenderDetailsMarker.h"
    4140#include "RenderFileUploadControl.h"
    4241#include "RenderInline.h"
    4342#include "RenderLayer.h"
     43#include "RenderLineBreak.h"
    4444#include "RenderListItem.h"
    4545#include "RenderListMarker.h"
    … …  
    253253            adjustForTableCells = false;
    254254    } else if (o.isBR()) {
    255         const RenderBR& br = toRenderBR(o);
     255        const RenderLineBreak& br = toRenderLineBreak(o);
    256256        IntRect linesBox = br.linesBoundingBox();
    257257        r = IntRect(linesBox.x(), linesBox.y(), linesBox.width(), linesBox.height());

  • trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

    r156038 r156054  
    4444#include "PointerEventsHitRules.cpp"
    4545#include "RenderArena.cpp"
    46 #include "RenderBR.cpp"
    4746#include "RenderBlock.cpp"
    4847#include "RenderBlockFlow.cpp"
    … …  
    7170#include "RenderLayerModelObject.cpp"
    7271#include "RenderLineBoxList.cpp"
     72#include "RenderLineBreak.cpp"
    7373#include "RenderListBox.cpp"
    7474#include "RenderListItem.cpp"
Note: See TracChangeset for help on using the changeset viewer.