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

Unified Diff: Source/core/layout/line/EllipsisBox.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/EllipsisBox.cpp
diff --git a/Source/core/layout/line/EllipsisBox.cpp b/Source/core/layout/line/EllipsisBox.cpp
index faea25c63a94c4b8f5c359849efeee61302ffb96..2aab9bd8a8a0f6a2cee809c3a9bc193ce85092b3 100644
--- a/Source/core/layout/line/EllipsisBox.cpp
+++ b/Source/core/layout/line/EllipsisBox.cpp
@@ -59,7 +59,7 @@ InlineBox* EllipsisBox::markupBox() const
IntRect EllipsisBox::selectionRect()
{
- const LayoutStyle& style = layoutObject().styleRef(isFirstLineStyle());
+ const ComputedStyle& style = layoutObject().styleRef(isFirstLineStyle());
const Font& font = style.font();
return enclosingIntRect(font.selectionRectForText(constructTextRun(&layoutObject(), font, m_str, style, TextRun::AllowTrailingExpansion), IntPoint(logicalLeft(), logicalTop() + root().selectionTopAdjustedForPrecedingBlock()), root().selectionHeightAdjustedForPrecedingBlock()));
}
@@ -72,7 +72,7 @@ bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& resu
// Hit test the markup box.
if (InlineBox* markupBox = this->markupBox()) {
- const LayoutStyle& style = layoutObject().styleRef(isFirstLineStyle());
+ const ComputedStyle& style = layoutObject().styleRef(isFirstLineStyle());
LayoutUnit mtx = adjustedLocation.x() + m_logicalWidth - markupBox->x();
LayoutUnit mty = adjustedLocation.y() + style.fontMetrics().ascent() - (markupBox->y() + markupBox->layoutObject().style(isFirstLineStyle())->fontMetrics().ascent());
if (markupBox->nodeAtPoint(request, result, locationInContainer, LayoutPoint(mtx, mty), lineTop, lineBottom)) {
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698