Change caret to show language direction

Source/core/editing/Caret.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 161 matching lines @@
     RenderObject* caretPainter = caretRenderer(node);
     if (!caretPainter)
         return IntRect();
 
     LayoutRect localRect(rect);
     if (caretPainter->isBox())
         toRenderBox(caretPainter)->flipForWritingMode(localRect);
     return caretPainter->localToAbsoluteQuad(FloatRect(localRect)).enclosingBoundingBox();
 }
 
+void CaretBase::updateDirectionPointer(const RenderBoxModelObject* renderBoxModelObject, LayoutRect& rect)
+{
+    // Extra rect are drawn, need to refresh more area.
+    TextDirection containerDirection = renderBoxModelObject->style()->direction();

[Inactive, 2014/05/27 13:10:45]

Ok, so I looked this up a bit more. Why do you need a RenderBoxModelObject here?
style() is on RenderObject so taking a RenderObject* in argument should be
sufficient.

[h.joshi, 2014/05/28 03:02:53]

Yes, RenderObject will be enough here to get style(), checking the same and will
update patch.

+    rect.setWidth(rect.width() + LayoutUnit(2));
+    if (containerDirection  == RTL)
+        rect.setX(rect.x() - LayoutUnit(2));
+}
+
 void CaretBase::repaintCaretForLocalRect(Node* node, const LayoutRect& rect)
 {
     RenderObject* caretPainter = caretRenderer(node);
     if (!caretPainter)
         return;
 
     // FIXME: Need to over-paint 1 pixel to workaround some rounding problems.
     // https://bugs.webkit.org/show_bug.cgi?id=108283
     LayoutRect inflatedRect = rect;
     inflatedRect.inflate(1);
 
+    updateDirectionPointer(toRenderBoxModelObject(caretPainter), inflatedRect);

[Inactive, 2014/05/27 13:10:45]

This cast should not be needed. Also, I am still not convinced this was safe as
other places call isBox() before casting to RenderBox*.

[h.joshi, 2014/05/28 03:02:53]

Yes, will remove after changing method usage.

     caretPainter->repaintRectangle(inflatedRect);
 }
 
 bool CaretBase::shouldRepaintCaret(const RenderView* view, bool isContentEditable) const
 {
     ASSERT(view);
     bool caretBrowsing = false;
     if (FrameView* frameView = view->frameView()) {
         LocalFrame& frame = frameView->frame(); // The frame where the selection started
         caretBrowsing = frame.settings() && frame.settings()->caretBrowsingEnabled();
@@ skipping 13 matching lines @@
     // it happens after the document has accounted for any editing
     // changes which may have been done.
     // And, we need to leave this layout here so the caret moves right
     // away after clicking.
     m_caretRectNeedsUpdate = true;
 
     if (caretRectChanged)
         return;
 
     if (RenderView* view = node->document().renderView()) {
-        if (shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))
-            repaintCaretForLocalRect(node, localCaretRectWithoutUpdate());
+        if (shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable))) {
+            LayoutRect drawingRect = localCaretRectWithoutUpdate();
+            updateDirectionPointer(toRenderBoxModelObject(caretRenderer(node)), drawingRect);

[Inactive, 2014/05/27 13:10:45]

Ditto. Cast should not be needed.
Also, what if caredRenderer() returns null? other places have null checks but
you don't have one.

[h.joshi, 2014/05/28 03:02:53]

Ditto

+            repaintCaretForLocalRect(node, drawingRect);
+        }
     }
 }
 
 void CaretBase::paintCaret(Node* node, GraphicsContext* context, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {
     if (m_caretVisibility == Hidden)
         return;
 
     LayoutRect drawingRect = localCaretRectWithoutUpdate();
     RenderObject* renderer = caretRenderer(node);
     if (renderer && renderer->isBox())
         toRenderBox(renderer)->flipForWritingMode(drawingRect);
     drawingRect.moveBy(roundedIntPoint(paintOffset));
     LayoutRect caret = intersection(drawingRect, clipRect);
     if (caret.isEmpty())
         return;
 
+    TextDirection containerDirection = toRenderBoxModelObject(renderer)->style()->direction();

[Inactive, 2014/05/27 13:10:45]

Cast should not be needed.

[h.joshi, 2014/05/28 03:02:53]

Yes, will make changes

+    LayoutRect directionPointerCaret = caret;
+
+    // Drawing different Caret which shows editing style similar to IE

[Inactive, 2014/05/27 13:10:45]

nit: needs to end with a '.'

[h.joshi, 2014/05/28 03:02:53]

Will make changes.

+    if (containerDirection == LTR)
+        directionPointerCaret.setX(directionPointerCaret.x() + 1);
+    else
+        directionPointerCaret.setX(directionPointerCaret.x() - 2);
+
+    directionPointerCaret.setWidth(LayoutUnit(2));
+    directionPointerCaret.setHeight(LayoutUnit(1));
+
     Color caretColor = Color::black;
 
     Element* element;
     if (node->isElementNode())
         element = toElement(node);
     else
         element = node->parentElement();
 
     if (element && element->renderer())
         caretColor = element->renderer()->resolveColor(CSSPropertyColor);
 
     context->fillRect(caret, caretColor);
+    context->fillRect(directionPointerCaret, caretColor);
+
+    // Update directionPointerCaret points and lets draw one more small rect to match IE.
+    directionPointerCaret.setY(caret.y() + LayoutUnit(1));
+    directionPointerCaret.setWidth(LayoutUnit(1));
+    if (containerDirection == RTL)
+        directionPointerCaret.setX(directionPointerCaret.x() + 1);
+    context->fillRect(directionPointerCaret, caretColor);
 }
 
 void DragCaretController::paintDragCaret(LocalFrame* frame, GraphicsContext* p, const LayoutPoint& paintOffset, const LayoutRect& clipRect) const
 {
     if (m_position.deepEquivalent().deprecatedNode()->document().frame() == frame)
         paintCaret(m_position.deepEquivalent().deprecatedNode(), p, paintOffset, clipRect);
 }
 
 }