Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp - Issue 1033943002: Rename LayoutStyle to papayawhip

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/svg/SVGTextLayoutEngineBaseline.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:

Index: Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

diff --git a/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp b/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

index 4cfbe3c4a134b8d9f0f31fb2070f4d97c009c0bd..6a48f9b5c338863d808f2c3522bc652ada996c1c 100644

--- a/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

+++ b/Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

@@ -21,7 +21,7 @@

#include "core/layout/svg/SVGTextLayoutEngineBaseline.h"

#include "core/layout/LayoutObject.h"

-#include "core/layout/style/SVGLayoutStyle.h"

+#include "core/layout/style/SVGComputedStyle.h"

#include "core/layout/svg/SVGTextMetrics.h"

#include "core/svg/SVGLengthContext.h"

#include "platform/fonts/Font.h"

@@ -34,9 +34,9 @@ SVGTextLayoutEngineBaseline::SVGTextLayoutEngineBaseline(const Font& font)

{

}

-float SVGTextLayoutEngineBaseline::calculateBaselineShift(const LayoutStyle& style) const

+float SVGTextLayoutEngineBaseline::calculateBaselineShift(const ComputedStyle& style) const

{

- const SVGLayoutStyle& svgStyle = style.svgStyle();

+ const SVGComputedStyle& svgStyle = style.svgStyle();

switch (svgStyle.baselineShift()) {

case BS_LENGTH:

@@ -58,7 +58,7 @@ EAlignmentBaseline SVGTextLayoutEngineBaseline::dominantBaselineToAlignmentBasel

ASSERT(textRenderer->parent());

ASSERT(textRenderer->parent()->style());

- const SVGLayoutStyle& style = textRenderer->style()->svgStyle();

+ const SVGComputedStyle& style = textRenderer->style()->svgStyle();

EDominantBaseline baseline = style.dominantBaseline();

if (baseline == DB_AUTO) {

@@ -141,7 +141,7 @@ float SVGTextLayoutEngineBaseline::calculateAlignmentBaselineShift(bool isVertic

}

-float SVGTextLayoutEngineBaseline::calculateGlyphOrientationAngle(bool isVerticalText, const SVGLayoutStyle& style, const UChar& character) const

+float SVGTextLayoutEngineBaseline::calculateGlyphOrientationAngle(bool isVerticalText, const SVGComputedStyle& style, const UChar& character) const

{

switch (isVerticalText ? style.glyphOrientationVertical() : style.glyphOrientationHorizontal()) {

case GO_AUTO: {