LibPDF: Rename GraphicsState::paint_style to paint_color

For consistency with the previous commit.

No behavior change.

Userland/Libraries/LibPDF/Fonts/SimpleFont.cpp

@@ -125,7 +125,7 @@ PDFErrorOr<Gfx::FloatPoint> SimpleFont::draw_transformed_glyphs(Gfx::Painter& pa
         Gfx::AffineTransform {}
             .set_scale(1 / text_rendering_matrix.x_scale() * horizontal_scaling,
                 -1 / text_rendering_matrix.x_scale() * horizontal_scaling)));
-    TRY(renderer.state().paint_style.visit(
+    TRY(renderer.state().paint_color.visit(
         [&](Color const& style) -> PDFErrorOr<void> {
             Renderer::fill_path_with_style(aa_painter, text_path, style);
             return {};

Userland/Libraries/LibPDF/Fonts/TrueTypeFont.cpp

@@ -137,7 +137,7 @@ PDFErrorOr<void> TrueTypePainter::draw_glyph(Gfx::Painter& painter, Gfx::FloatPo
 {
     auto glyph_id = TRY(resolve_glyph_id_for_char_code(char_code));
     if (glyph_id.has_value()) {
-        TRY(renderer.state().paint_style.visit(
+        TRY(renderer.state().paint_color.visit(
             [&](Color const& style) -> PDFErrorOr<void> {
                 do_draw_glyph(painter, *glyph_id, point, m_font, style);
                 return {};

Userland/Libraries/LibPDF/Fonts/Type0Font.cpp

@@ -94,7 +94,7 @@ PDFErrorOr<void> CIDFontType0::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint
     if (!bitmap)
         return Error::rendering_unsupported_error("Type0 font CIDFontType0: failed to rasterize glyph");
 
-    auto style = TRY(renderer.state().paint_style.visit(
+    auto style = TRY(renderer.state().paint_color.visit(
         [&](Color const& style) -> PDFErrorOr<Color> {
             return style;
         },
@@ -210,7 +210,7 @@ PDFErrorOr<void> CIDFontType2::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint
 
     // FIXME: We don't support non-embedded type0 truetype fonts yet.
 
-    auto style = TRY(renderer.state().paint_style.visit(
+    auto style = TRY(renderer.state().paint_color.visit(
         [&](Color const& style) -> PDFErrorOr<Color> {
             return style;
         },

Userland/Libraries/LibPDF/Fonts/Type1Font.cpp

@@ -106,7 +106,7 @@ void Type1Font::set_font_size(float font_size)
 
 PDFErrorOr<void> Type1Font::draw_glyph(Gfx::Painter& painter, Gfx::FloatPoint point, float width, u8 char_code, Renderer const& renderer)
 {
-    auto style = TRY(renderer.state().paint_style.visit(
+    auto style = TRY(renderer.state().paint_color.visit(
         [&](Color const& style) -> PDFErrorOr<Color> {
             return style;
         },

Userland/Libraries/LibPDF/Renderer.cpp

@@ -476,7 +476,7 @@ PDFErrorOr<void> Renderer::fill_current_path(Gfx::WindingRule winding_rule)
 {
     auto path_end = m_current_path.end();
     m_current_path.close_all_subpaths();
-    TRY(state().paint_style.visit(
+    TRY(state().paint_color.visit(
         [&](Color const& style) -> PDFErrorOr<void> {
             fill_path_with_style(anti_aliasing_painter(), m_current_path, style, winding_rule);
             return {};
@@ -851,7 +851,7 @@ RENDERER_HANDLER(set_stroking_color_extended)
 
 RENDERER_HANDLER(set_painting_color)
 {
-    state().paint_style = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
+    state().paint_color = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
     return {};
 }
 
@@ -860,11 +860,11 @@ RENDERER_HANDLER(set_painting_color_extended)
     if (state().paint_color_space->family() == ColorSpaceFamily::Pattern) {
         auto resources = extra_resources.value_or(m_page.resources);
         auto pattern_object = TRY(get_resource(resources, CommonNames::Pattern, args.last()));
-        state().paint_style = TRY(Pattern::create(m_document, pattern_object, *this));
+        state().paint_color = TRY(Pattern::create(m_document, pattern_object, *this));
         return {};
     }
 
-    state().paint_style = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
+    state().paint_color = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
     return {};
 }
 
@@ -878,7 +878,7 @@ RENDERER_HANDLER(set_stroking_color_and_space_to_gray)
 RENDERER_HANDLER(set_painting_color_and_space_to_gray)
 {
     state().paint_color_space = DeviceGrayColorSpace::the();
-    state().paint_style = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
+    state().paint_color = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
     return {};
 }
 
@@ -892,7 +892,7 @@ RENDERER_HANDLER(set_stroking_color_and_space_to_rgb)
 RENDERER_HANDLER(set_painting_color_and_space_to_rgb)
 {
     state().paint_color_space = DeviceRGBColorSpace::the();
-    state().paint_style = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
+    state().paint_color = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
     return {};
 }
 
@@ -906,7 +906,7 @@ RENDERER_HANDLER(set_stroking_color_and_space_to_cmyk)
 RENDERER_HANDLER(set_painting_color_and_space_to_cmyk)
 {
     state().paint_color_space = TRY(DeviceCMYKColorSpace::the());
-    state().paint_style = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
+    state().paint_color = style_with_alpha(TRY(state().paint_color_space->color(args)), state().paint_alpha_constant);
     return {};
 }
 
@@ -1373,7 +1373,7 @@ PDFErrorOr<void> Renderer::set_graphics_state_from_dict(NonnullRefPtr<DictObject
 
     if (dict->contains(CommonNames::ca) && m_rendering_preferences.use_constant_alpha) {
         state().paint_alpha_constant = dict->get_value(CommonNames::ca).to_float();
-        state().paint_style = style_with_alpha(state().paint_style, state().paint_alpha_constant);
+        state().paint_color = style_with_alpha(state().paint_color, state().paint_alpha_constant);
     }
 
     if (dict->contains(CommonNames::AIS)) // "alpha is shape"
@@ -1812,11 +1812,11 @@ PDFErrorOr<void> Renderer::paint_image_xobject(NonnullRefPtr<StreamObject> image
         // PDF 1.7 spec, 4.8.5 Masked Images, Stencil Masking:
         // "An image mask (an image XObject whose ImageMask entry is true) [...] is treated as a stencil mask [...].
         //  Sample values [...] designate places on the page that should either be marked with the current color or masked out (not marked at all)."
-        if (!state().paint_style.has<Color>())
+        if (!state().paint_color.has<Color>())
             return Error(Error::Type::RenderingUnsupported, "Image masks with pattern fill not yet implemented");
 
         // Move mask to alpha channel, and put current color in RGB.
-        auto current_color = state().paint_style.get<Gfx::Color>();
+        auto current_color = state().paint_color.get<Gfx::Color>();
         for (auto& pixel : *image_bitmap.bitmap) {
             // "a sample value of 0 marks the page with the current color, and a 1 leaves the previous contents unchanged."
             // That's opposite of the normal alpha convention, and we're upsampling masks to 8 bit and use that as normal alpha.

Userland/Libraries/LibPDF/Renderer.h

@@ -110,7 +110,7 @@ struct GraphicsState {
     RefPtr<ColorSpace> stroke_color_space { DeviceGrayColorSpace::the() };
     RefPtr<ColorSpace> paint_color_space { DeviceGrayColorSpace::the() };
     Variant<Color, NonnullRefPtr<Pattern>> stroke_color { Color { Color::Black } };
-    Variant<Color, NonnullRefPtr<Pattern>> paint_style { Color { Color::Black } };
+    Variant<Color, NonnullRefPtr<Pattern>> paint_color { Color { Color::Black } };
     ByteString color_rendering_intent { "RelativeColorimetric"sv };
     float flatness_tolerance { 1.0f };
     float line_width { 1.0f };
@@ -426,11 +426,11 @@ struct Formatter<PDF::GraphicsState> : Formatter<StringView> {
                 builder.appendff("  stroke_color={}\n", style);
             },
             [&](NonnullRefPtr<PDF::Pattern> const&) { builder.appendff("  stroke_color=pattern\n"); });
-        state.paint_style.visit(
+        state.paint_color.visit(
             [&](Gfx::Color const& style) {
-                builder.appendff("  paint_style={}\n", style);
+                builder.appendff("  paint_color={}\n", style);
             },
-            [&](NonnullRefPtr<PDF::Pattern> const&) { builder.appendff("  paint_style=pattern\n"); });
+            [&](NonnullRefPtr<PDF::Pattern> const&) { builder.appendff("  paint_color=pattern\n"); });
         builder.appendff("  color_rendering_intent={}\n", state.color_rendering_intent);
         builder.appendff("  flatness_tolerance={}\n", state.flatness_tolerance);
         builder.appendff("  line_width={}\n", state.line_width);