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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h

Issue 1306823004: Split out String, URI and CustomIdent from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@split_out_attr_values
Patch Set: Rebase Created 5 years, 2 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * * Redistributions of source code must retain the above copyright 4 * * Redistributions of source code must retain the above copyright
5 * notice, this list of conditions and the following disclaimer. 5 * notice, this list of conditions and the following disclaimer.
6 * * Redistributions in binary form must reproduce the above 6 * * Redistributions in binary form must reproduce the above
7 * copyright notice, this list of conditions and the following disclaimer 7 * copyright notice, this list of conditions and the following disclaimer
8 * in the documentation and/or other materials provided with the 8 * in the documentation and/or other materials provided with the
9 * distribution. 9 * distribution.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
11 * contributors may be used to endorse or promote products derived from 11 * contributors may be used to endorse or promote products derived from
12 * this software without specific prior written permission. 12 * this software without specific prior written permission.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
15 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 15 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
16 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 16 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
17 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 17 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
18 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 18 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
19 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 19 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
20 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef StyleBuilderConverter_h 27 #ifndef StyleBuilderConverter_h
28 #define StyleBuilderConverter_h 28 #define StyleBuilderConverter_h
29 29
30 #include "core/css/CSSStringValue.h"
30 #include "core/css/CSSValue.h" 31 #include "core/css/CSSValue.h"
31 #include "core/css/CSSValueList.h" 32 #include "core/css/CSSValueList.h"
32 #include "core/css/resolver/StyleResolverState.h" 33 #include "core/css/resolver/StyleResolverState.h"
33 #include "core/layout/LayoutView.h" 34 #include "core/layout/LayoutView.h"
34 #include "core/style/QuotesData.h" 35 #include "core/style/QuotesData.h"
35 #include "core/style/ShadowList.h" 36 #include "core/style/ShadowList.h"
36 #include "core/style/StyleReflection.h" 37 #include "core/style/StyleReflection.h"
37 #include "core/style/StyleScrollSnapData.h" 38 #include "core/style/StyleScrollSnapData.h"
38 #include "core/style/TransformOrigin.h" 39 #include "core/style/TransformOrigin.h"
39 #include "platform/LengthSize.h" 40 #include "platform/LengthSize.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 147 }
147 return result; 148 return result;
148 } 149 }
149 ASSERT_NOT_REACHED(); 150 ASSERT_NOT_REACHED();
150 return 0; 151 return 0;
151 } 152 }
152 153
153 template <CSSValueID IdForNone> 154 template <CSSValueID IdForNone>
154 AtomicString StyleBuilderConverter::convertString(StyleResolverState&, CSSValue* value) 155 AtomicString StyleBuilderConverter::convertString(StyleResolverState&, CSSValue* value)
155 { 156 {
156 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 157 if (value->isStringValue())
157 if (primitiveValue->getValueID() == IdForNone) 158 return AtomicString(toCSSStringValue(value)->value());
158 return nullAtom; 159 ASSERT(toCSSPrimitiveValue(value)->getValueID() == IdForNone);
159 ASSERT(primitiveValue->isString()); 160 return nullAtom;
160 return AtomicString(primitiveValue->getStringValue());
161 } 161 }
162 162
163 } // namespace blink 163 } // namespace blink
164 164
165 #endif 165 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698