Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1149)

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * Copyright (C) 2003 Apple Computer, Inc. 6 * Copyright (C) 2003 Apple Computer, Inc.
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 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 continue; 896 continue;
897 897
898 const UChar ellipsisAndSpace[2] = { horizontalEllipsis, ' ' }; 898 const UChar ellipsisAndSpace[2] = { horizontalEllipsis, ' ' };
899 DEFINE_STATIC_LOCAL(AtomicString, ellipsisAndSpaceStr, (ellipsisAndSpace , 2)); 899 DEFINE_STATIC_LOCAL(AtomicString, ellipsisAndSpaceStr, (ellipsisAndSpace , 2));
900 DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1)) ; 900 DEFINE_STATIC_LOCAL(AtomicString, ellipsisStr, (&horizontalEllipsis, 1)) ;
901 const Font& font = style(numVisibleLines == 1)->font(); 901 const Font& font = style(numVisibleLines == 1)->font();
902 902
903 // Get ellipsis width, and if the last child is an anchor, it will go af ter the ellipsis, so add in a space and the anchor width too 903 // Get ellipsis width, and if the last child is an anchor, it will go af ter the ellipsis, so add in a space and the anchor width too
904 float totalWidth; 904 float totalWidth;
905 InlineBox* anchorBox = lastLine->lastChild(); 905 InlineBox* anchorBox = lastLine->lastChild();
906 if (anchorBox && anchorBox->renderer().style()->isLink()) { 906 if (anchorBox && anchorBox->layoutObject().style()->isLink()) {
907 totalWidth = anchorBox->logicalWidth() + font.width(constructTextRun (this, font, ellipsisAndSpace, 2, styleRef(), style()->direction())); 907 totalWidth = anchorBox->logicalWidth() + font.width(constructTextRun (this, font, ellipsisAndSpace, 2, styleRef(), style()->direction()));
908 } else { 908 } else {
909 anchorBox = 0; 909 anchorBox = 0;
910 totalWidth = font.width(constructTextRun(this, font, &horizontalElli psis, 1, styleRef(), style()->direction())); 910 totalWidth = font.width(constructTextRun(this, font, &horizontalElli psis, 1, styleRef(), style()->direction()));
911 } 911 }
912 912
913 // See if this width can be accommodated on the last visible line 913 // See if this width can be accommodated on the last visible line
914 LayoutBlockFlow& destBlock = lastVisibleLine->block(); 914 LayoutBlockFlow& destBlock = lastVisibleLine->block();
915 LayoutBlockFlow& srcBlock = lastLine->block(); 915 LayoutBlockFlow& srcBlock = lastLine->block();
916 916
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 if (isOutOfFlowPositioned()) 1026 if (isOutOfFlowPositioned())
1027 return "LayoutDeprecatedFlexibleBox (positioned)"; 1027 return "LayoutDeprecatedFlexibleBox (positioned)";
1028 if (isAnonymous()) 1028 if (isAnonymous())
1029 return "LayoutDeprecatedFlexibleBox (generated)"; 1029 return "LayoutDeprecatedFlexibleBox (generated)";
1030 if (isRelPositioned()) 1030 if (isRelPositioned())
1031 return "LayoutDeprecatedFlexibleBox (relative positioned)"; 1031 return "LayoutDeprecatedFlexibleBox (relative positioned)";
1032 return "LayoutDeprecatedFlexibleBox"; 1032 return "LayoutDeprecatedFlexibleBox";
1033 } 1033 }
1034 1034
1035 } // namespace blink 1035 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698