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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGLengthContext.cpp

Issue 2097383002: Added support of calc() for SVGLength (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 5 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) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2007 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "core/svg/SVGLengthContext.h" 23 #include "core/svg/SVGLengthContext.h"
24 24
25 #include "core/css/CSSHelper.h" 25 #include "core/css/CSSHelper.h"
26 #include "core/css/CSSPrimitiveValue.h" 26 #include "core/css/CSSPrimitiveValue.h"
27 #include "core/css/CSSToLengthConversionData.h"
27 #include "core/dom/NodeComputedStyle.h" 28 #include "core/dom/NodeComputedStyle.h"
28 #include "core/frame/FrameView.h" 29 #include "core/frame/FrameView.h"
29 #include "core/layout/LayoutObject.h" 30 #include "core/layout/LayoutObject.h"
30 #include "core/style/ComputedStyle.h" 31 #include "core/style/ComputedStyle.h"
31 #include "core/svg/SVGSVGElement.h" 32 #include "core/svg/SVGSVGElement.h"
32 #include "platform/LengthFunctions.h" 33 #include "platform/LengthFunctions.h"
33 #include "platform/fonts/FontMetrics.h" 34 #include "platform/fonts/FontMetrics.h"
34 35
35 namespace blink { 36 namespace blink {
36 37
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 return false; 411 return false;
411 412
412 const SVGSVGElement& svg = toSVGSVGElement(*viewportElement); 413 const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
413 viewportSize = svg.currentViewBoxRect().size(); 414 viewportSize = svg.currentViewBoxRect().size();
414 if (viewportSize.isEmpty()) 415 if (viewportSize.isEmpty())
415 viewportSize = svg.currentViewportSize(); 416 viewportSize = svg.currentViewportSize();
416 417
417 return true; 418 return true;
418 } 419 }
419 420
421 float SVGLengthContext::resolveValue(const CSSPrimitiveValue& primitiveValue, SV GLengthMode mode) const
422 {
423 const ComputedStyle* style = computedStyleForLengthResolving(m_context);
424 if (!style)
425 return 0;
426
427 const ComputedStyle* rootStyle = rootElementStyle(m_context);
428 if (!rootStyle)
429 return 0;
430
431 CSSToLengthConversionData conversionData = CSSToLengthConversionData(style, rootStyle, m_context->document().layoutViewItem(), 1.0f);
432 Length length = primitiveValue.convertToLength(conversionData);
433 return valueForLength(length, 1.0f, mode);
434 }
420 } // namespace blink 435 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGLengthContext.h ('k') | third_party/WebKit/Source/core/svg/SVGLengthList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698