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

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

Issue 2552513002: Rework SVGViewSpec<->SVGSVGElement integration (Closed)
Patch Set: Move setup back to SVGSVGElement Created 4 years 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
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGViewSpec.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2010 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007, 2010 Rob Buis <buis@kde.org>
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "core/svg/SVGViewSpec.h" 20 #include "core/svg/SVGViewSpec.h"
21 21
22 #include "core/svg/SVGParserUtilities.h" 22 #include "core/svg/SVGParserUtilities.h"
23 #include "core/svg/SVGPreserveAspectRatio.h" 23 #include "core/svg/SVGPreserveAspectRatio.h"
24 #include "core/svg/SVGRect.h" 24 #include "core/svg/SVGRect.h"
25 #include "core/svg/SVGSVGElement.h"
25 #include "core/svg/SVGTransformList.h" 26 #include "core/svg/SVGTransformList.h"
26 #include "wtf/text/ParsingUtilities.h" 27 #include "wtf/text/ParsingUtilities.h"
27 28
28 namespace blink { 29 namespace blink {
29 30
30 SVGViewSpec::SVGViewSpec() 31 SVGViewSpec::SVGViewSpec()
31 : m_viewBox(SVGRect::createInvalid()), 32 : m_viewBox(SVGRect::createInvalid()),
32 m_preserveAspectRatio(SVGPreserveAspectRatio::create()), 33 m_preserveAspectRatio(SVGPreserveAspectRatio::create()),
33 m_transform(SVGTransformList::create()) {} 34 m_transform(SVGTransformList::create()) {}
34 35
35 DEFINE_TRACE(SVGViewSpec) { 36 DEFINE_TRACE(SVGViewSpec) {
36 visitor->trace(m_viewBox); 37 visitor->trace(m_viewBox);
37 visitor->trace(m_preserveAspectRatio); 38 visitor->trace(m_preserveAspectRatio);
38 visitor->trace(m_transform); 39 visitor->trace(m_transform);
39 } 40 }
40 41
42 SVGViewSpec* SVGViewSpec::createForElement(SVGSVGElement& rootElement) {
43 SVGViewSpec* viewSpec = rootElement.viewSpec();
44 if (!viewSpec)
45 viewSpec = new SVGViewSpec();
46 else
47 viewSpec->reset();
48 viewSpec->inheritViewAttributesFromElement(rootElement);
49 return viewSpec;
50 }
51
41 bool SVGViewSpec::parseViewSpec(const String& spec) { 52 bool SVGViewSpec::parseViewSpec(const String& spec) {
42 if (spec.isEmpty()) 53 if (spec.isEmpty())
43 return false; 54 return false;
44 if (spec.is8Bit()) { 55 if (spec.is8Bit()) {
45 const LChar* ptr = spec.characters8(); 56 const LChar* ptr = spec.characters8();
46 const LChar* end = ptr + spec.length(); 57 const LChar* end = ptr + spec.length();
47 return parseViewSpecInternal(ptr, end); 58 return parseViewSpecInternal(ptr, end);
48 } 59 }
49 const UChar* ptr = spec.characters16(); 60 const UChar* ptr = spec.characters16();
50 const UChar* end = ptr + spec.length(); 61 const UChar* end = ptr + spec.length();
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 171
161 if (!skipExactly<CharType>(ptr, end, ')')) 172 if (!skipExactly<CharType>(ptr, end, ')'))
162 return false; 173 return false;
163 174
164 skipExactly<CharType>(ptr, end, ';'); 175 skipExactly<CharType>(ptr, end, ';');
165 } 176 }
166 return skipExactly<CharType>(ptr, end, ')'); 177 return skipExactly<CharType>(ptr, end, ')');
167 } 178 }
168 179
169 } // namespace blink 180 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGViewSpec.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698