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

Side by Side Diff: Source/core/css/DeprecatedStyleBuilder.cpp

Issue 18551004: Miscellaneous cleanup to reduce number of includes in platform/graphics/ Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | Source/core/html/HTMLCanvasElement.h » ('j') | 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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "core/css/DeprecatedStyleBuilder.h" 26 #include "core/css/DeprecatedStyleBuilder.h"
27 27
28 #include "FontFamilyNames.h"
28 #include "core/css/BasicShapeFunctions.h" 29 #include "core/css/BasicShapeFunctions.h"
29 #include "core/css/CSSAspectRatioValue.h" 30 #include "core/css/CSSAspectRatioValue.h"
30 #include "core/css/CSSCalculationValue.h" 31 #include "core/css/CSSCalculationValue.h"
31 #include "core/css/CSSCursorImageValue.h" 32 #include "core/css/CSSCursorImageValue.h"
32 #include "core/css/CSSPrimitiveValueMappings.h" 33 #include "core/css/CSSPrimitiveValueMappings.h"
33 #include "core/css/CSSToStyleMap.h" 34 #include "core/css/CSSToStyleMap.h"
34 #include "core/css/CSSValueList.h" 35 #include "core/css/CSSValueList.h"
35 #include "core/css/FontSize.h" 36 #include "core/css/FontSize.h"
36 #include "core/css/Pair.h" 37 #include "core/css/Pair.h"
37 #include "core/css/Rect.h" 38 #include "core/css/Rect.h"
38 #include "core/css/resolver/StyleResolver.h" 39 #include "core/css/resolver/StyleResolver.h"
39 #include "core/dom/Document.h" 40 #include "core/dom/Document.h"
40 #include "core/dom/Element.h" 41 #include "core/dom/Element.h"
41 #include "core/page/Settings.h" 42 #include "core/page/Settings.h"
42 #include "core/rendering/ClipPathOperation.h" 43 #include "core/rendering/ClipPathOperation.h"
43 #include "core/rendering/RenderView.h" 44 #include "core/rendering/RenderView.h"
44 #include "core/rendering/style/BasicShapes.h" 45 #include "core/rendering/style/BasicShapes.h"
45 #include "core/rendering/style/CursorList.h" 46 #include "core/rendering/style/CursorList.h"
46 #include "core/rendering/style/RenderStyle.h" 47 #include "core/rendering/style/RenderStyle.h"
47 #include "core/rendering/style/ShapeValue.h" 48 #include "core/rendering/style/ShapeValue.h"
48 #include "wtf/StdLibExtras.h" 49 #include "wtf/StdLibExtras.h"
49 #include "wtf/UnusedParam.h" 50 #include "wtf/UnusedParam.h"
50 51
51 using namespace std; 52 using namespace std;
53 using namespace WebCore::FontFamilyNames;
52 54
53 namespace WebCore { 55 namespace WebCore {
54 56
55 enum ExpandValueBehavior {SuppressValue = 0, ExpandValue}; 57 enum ExpandValueBehavior {SuppressValue = 0, ExpandValue};
56 template <ExpandValueBehavior expandValue, CSSPropertyID one = CSSPropertyInvali d, CSSPropertyID two = CSSPropertyInvalid, CSSPropertyID three = CSSPropertyInva lid, CSSPropertyID four = CSSPropertyInvalid, CSSPropertyID five = CSSPropertyIn valid> 58 template <ExpandValueBehavior expandValue, CSSPropertyID one = CSSPropertyInvali d, CSSPropertyID two = CSSPropertyInvalid, CSSPropertyID three = CSSPropertyInva lid, CSSPropertyID four = CSSPropertyInvalid, CSSPropertyID five = CSSPropertyIn valid>
57 class ApplyPropertyExpanding { 59 class ApplyPropertyExpanding {
58 public: 60 public:
59 61
60 template <CSSPropertyID id> 62 template <CSSPropertyID id>
61 static inline void applyInheritValue(CSSPropertyID propertyID, StyleResolver * styleResolver) 63 static inline void applyInheritValue(CSSPropertyID propertyID, StyleResolver * styleResolver)
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1612 setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmph asisStyle::createHandler()); 1614 setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmph asisStyle::createHandler());
1613 setPropertyHandler(CSSPropertyWebkitTransformOriginZ, ApplyPropertyComputeLe ngth<float, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ, & RenderStyle::initialTransformOriginZ>::createHandler()); 1615 setPropertyHandler(CSSPropertyWebkitTransformOriginZ, ApplyPropertyComputeLe ngth<float, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ, & RenderStyle::initialTransformOriginZ>::createHandler());
1614 setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderS tyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::creat eHandler()); 1616 setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderS tyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::creat eHandler());
1615 setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyShape<&RenderS tyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInsid e>::createHandler()); 1617 setPropertyHandler(CSSPropertyWebkitShapeInside, ApplyPropertyShape<&RenderS tyle::shapeInside, &RenderStyle::setShapeInside, &RenderStyle::initialShapeInsid e>::createHandler());
1616 setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&Render Style::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOu tside>::createHandler()); 1618 setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&Render Style::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOu tside>::createHandler());
1617 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, & RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLet terWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler ()); 1619 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyComputeLength<int, & RenderStyle::wordSpacing, &RenderStyle::setWordSpacing, &RenderStyle::initialLet terWordSpacing, NormalEnabled, ThicknessDisabled, SVGZoomEnabled>::createHandler ());
1618 } 1620 }
1619 1621
1620 1622
1621 } 1623 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | Source/core/html/HTMLCanvasElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698