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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.h

Issue 2805043002: Revert "Neuter the "screen scale factor" computation for SVG <text>" (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. All rights reserved. 5 * Copyright (C) 2009 Google, 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 // true) can/will be laid out as part of a <text>. 138 // true) can/will be laid out as part of a <text>.
139 static bool isLayoutableTextNode(const LayoutObject*); 139 static bool isLayoutableTextNode(const LayoutObject*);
140 140
141 // Determines whether a svg node should isolate or not based on ComputedStyle. 141 // Determines whether a svg node should isolate or not based on ComputedStyle.
142 static bool willIsolateBlendingDescendantsForStyle(const ComputedStyle&); 142 static bool willIsolateBlendingDescendantsForStyle(const ComputedStyle&);
143 static bool willIsolateBlendingDescendantsForObject(const LayoutObject*); 143 static bool willIsolateBlendingDescendantsForObject(const LayoutObject*);
144 template <typename LayoutObjectType> 144 template <typename LayoutObjectType>
145 static bool computeHasNonIsolatedBlendingDescendants(const LayoutObjectType*); 145 static bool computeHasNonIsolatedBlendingDescendants(const LayoutObjectType*);
146 static bool isIsolationRequired(const LayoutObject*); 146 static bool isIsolationRequired(const LayoutObject*);
147 147
148 static AffineTransform deprecatedCalculateTransformToLayer(
149 const LayoutObject*);
148 static float calculateScreenFontSizeScalingFactor(const LayoutObject*); 150 static float calculateScreenFontSizeScalingFactor(const LayoutObject*);
149 151
150 static LayoutObject* findClosestLayoutSVGText(LayoutObject*, 152 static LayoutObject* findClosestLayoutSVGText(LayoutObject*,
151 const FloatPoint&); 153 const FloatPoint&);
152 154
153 private: 155 private:
154 static void updateObjectBoundingBox(FloatRect& objectBoundingBox, 156 static void updateObjectBoundingBox(FloatRect& objectBoundingBox,
155 bool& objectBoundingBoxValid, 157 bool& objectBoundingBoxValid,
156 LayoutObject* other, 158 LayoutObject* other,
157 FloatRect otherBoundingBox); 159 FloatRect otherBoundingBox);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 if (child->hasNonIsolatedBlendingDescendants() && 220 if (child->hasNonIsolatedBlendingDescendants() &&
219 !willIsolateBlendingDescendantsForObject(child)) 221 !willIsolateBlendingDescendantsForObject(child))
220 return true; 222 return true;
221 } 223 }
222 return false; 224 return false;
223 } 225 }
224 226
225 } // namespace blink 227 } // namespace blink
226 228
227 #endif // SVGLayoutSupport_h 229 #endif // SVGLayoutSupport_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698