Simplify caret color calculation in CaretBase::paintCaret()

third_party/WebKit/Source/core/editing/CaretBase.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 186 matching lines @@
         return;
 
     if (DrawingRecorder::useCachedDrawingIfPossible(context, *this, displayItemType))
         return;
 
     LayoutRect drawingRect = localCaretRectWithoutUpdate();
     if (LayoutBlock* layoutObject = caretLayoutObject(node))
         layoutObject->flipForWritingMode(drawingRect);
     drawingRect.moveBy(roundedIntPoint(paintOffset));
 
-    Color caretColor = Color::black;
-
-    Element* element;
-    if (node->isElementNode())
-        element = toElement(node);
-    else
-        element = node->parentElement();
-
-    if (element && element->layoutObject())
-        caretColor = element->layoutObject()->resolveColor(CSSPropertyColor);
-
+    const Color caretColor = node->layoutObject()->resolveColor(CSSPropertyColor);

[Xiaocheng, 2016/09/09 07:40:43]

Do you mean |node| is always a |Text|? If so, could you add a DCHECK?

[yoichio, 2016/09/09 07:53:54]

node->layoutObject() exists always?

[yosin_UTC9, 2016/09/09 08:27:21]

|node| comes from anchor node of VisiblePosition.

     IntRect paintRect = pixelSnappedIntRect(drawingRect);
     DrawingRecorder drawingRecorder(context, *this, DisplayItem::kCaret, paintRect);
     context.fillRect(paintRect, caretColor);
 }
 
 void CaretBase::setCaretVisibility(CaretVisibility visibility)
 {
     m_caretVisibility = visibility;
 }
 
 String CaretBase::debugName() const
 {
     return "Caret";
 }
 
 LayoutRect CaretBase::visualRect() const
 {
     return m_visualRect;
 }
 
 } // namespace blink