Invalidate collapsed borders using currentColor when color changes

third_party/WebKit/Source/core/paint/TableCellPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/TableCellPainter.h"
 
 #include "core/layout/LayoutTableCell.h"
 #include "core/paint/BlockPainter.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
@@ skipping 126 matching lines @@
   GraphicsContext& graphics_context = paint_info.context;
   const DisplayItemClient& client = DisplayItemClientForBorders();
   if (DrawingRecorder::UseCachedDrawingIfPossible(
           graphics_context, client,
           static_cast<DisplayItem::Type>(display_item_type)))
     return;
 
   DrawingRecorder recorder(graphics_context, client,
                            static_cast<DisplayItem::Type>(display_item_type),
                            border_rect);
-  Color cell_color = layout_table_cell_.ResolveColor(CSSPropertyColor);
 
   // We never paint diagonals at the joins.  We simply let the border with the
   // highest precedence paint on top of borders with lower precedence.
   if (display_item_type & DisplayItem::kTableCollapsedBorderTop) {
     ObjectPainter::DrawLineForBoxSide(
         graphics_context, border_rect.X(), border_rect.Y(), border_rect.MaxX(),
-        border_rect.Y() + top_width, kBSTop,
-        top_border_value.GetColor().Resolve(cell_color),
+        border_rect.Y() + top_width, kBSTop, top_border_value.GetColor(),
         CollapsedBorderStyle(top_border_value.Style()), 0, 0, true);
   }
   if (display_item_type & DisplayItem::kTableCollapsedBorderBottom) {
     ObjectPainter::DrawLineForBoxSide(
         graphics_context, border_rect.X(), border_rect.MaxY() - bottom_width,
         border_rect.MaxX(), border_rect.MaxY(), kBSBottom,
-        bottom_border_value.GetColor().Resolve(cell_color),
+        bottom_border_value.GetColor(),
         CollapsedBorderStyle(bottom_border_value.Style()), 0, 0, true);
   }
   if (display_item_type & DisplayItem::kTableCollapsedBorderLeft) {
     ObjectPainter::DrawLineForBoxSide(
         graphics_context, border_rect.X(), border_rect.Y(),
         border_rect.X() + left_width, border_rect.MaxY(), kBSLeft,
-        left_border_value.GetColor().Resolve(cell_color),
+        left_border_value.GetColor(),
         CollapsedBorderStyle(left_border_value.Style()), 0, 0, true);
   }
   if (display_item_type & DisplayItem::kTableCollapsedBorderRight) {
     ObjectPainter::DrawLineForBoxSide(
         graphics_context, border_rect.MaxX() - right_width, border_rect.Y(),
         border_rect.MaxX(), border_rect.MaxY(), kBSRight,
-        right_border_value.GetColor().Resolve(cell_color),
+        right_border_value.GetColor(),
         CollapsedBorderStyle(right_border_value.Style()), 0, 0, true);
   }
 }
 
 void TableCellPainter::PaintContainerBackgroundBehindCell(
     const PaintInfo& paint_info,
     const LayoutPoint& paint_offset,
     const LayoutObject& background_object) {
   DCHECK(background_object != layout_table_cell_);
 
@@ skipping 102 matching lines @@
   BoxPainter(layout_table_cell_).PaintMaskImages(paint_info, paint_rect);
 }
 
 LayoutRect TableCellPainter::PaintRectNotIncludingVisualOverflow(
     const LayoutPoint& paint_offset) {
   return LayoutRect(paint_offset,
                     LayoutSize(layout_table_cell_.PixelSnappedSize()));
 }
 
 }  // namespace blink