webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 12 deletions

diff --git a/Source/WebCore/rendering/TextPaintStyle.h b/Source/WebCore/rendering/TextPaintStyle.h
index f0d2528b8..62c79eb76 100644
--- a/Source/WebCore/rendering/TextPaintStyle.h
+++ b/Source/WebCore/rendering/TextPaintStyle.h
@@ -23,14 +23,13 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef TextPaintStyle_h
-#define TextPaintStyle_h
+#pragma once
 
 #include "Color.h"
-#include "ColorSpace.h"
 
 namespace WebCore {
 
+class Frame;
 class GraphicsContext;
 class RenderText;
 class RenderStyle;
@@ -38,25 +37,22 @@ class ShadowData;
 struct PaintInfo;
 
 struct TextPaintStyle {
-    TextPaintStyle(ColorSpace);
-    TextPaintStyle(Color, ColorSpace);
+    TextPaintStyle() { }
+    TextPaintStyle(const Color&);
 
-    ColorSpace colorSpace;
     Color fillColor;
     Color strokeColor;
     Color emphasisMarkColor;
-    float strokeWidth;
+    float strokeWidth { 0 };
 #if ENABLE(LETTERPRESS)
-    bool useLetterpressEffect;
+    bool useLetterpressEffect { false };
 #endif
 };
 
-TextPaintStyle computeTextPaintStyle(const RenderText&, const RenderStyle&, const PaintInfo&);
+TextPaintStyle computeTextPaintStyle(const Frame&, const RenderStyle&, const PaintInfo&);
 TextPaintStyle computeTextSelectionPaintStyle(const TextPaintStyle&, const RenderText&, const RenderStyle&, const PaintInfo&, bool& paintSelectedTextOnly, bool& paintSelectedTextSeparately, const ShadowData*& selectionShadow);
 
 enum FillColorType { UseNormalFillColor, UseEmphasisMarkColor };
 void updateGraphicsContext(GraphicsContext&, const TextPaintStyle&, FillColorType = UseNormalFillColor);
 
-}
-
-#endif
+} // namespace WebCore