am 643ca787: Merge webkit.org at r51976 : Initial merge by git.

Merge commit '643ca7872b450ea4efacab6188849e5aac2ba161' into eclair-mr2-plus-aosp

* commit '643ca7872b450ea4efacab6188849e5aac2ba161':
  Merge webkit.org at r51976 : Initial merge by git.

1 files changed, 5 insertions, 2 deletions

diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index 00672f2..af89ccb 100644
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -994,11 +994,14 @@ void SelectionController::paintCaret(GraphicsContext* p, int tx, int ty, const I
     IntRect caret = intersection(drawingRect, clipRect);
     if (!caret.isEmpty()) {
         Color caretColor = Color::black;
+        ColorSpace colorSpace = DeviceColorSpace;
         Element* element = rootEditableElement();
-        if (element && element->renderer())
+        if (element && element->renderer()) {
             caretColor = element->renderer()->style()->color();
+            colorSpace = element->renderer()->style()->colorSpace();
+        }
 
-        p->fillRect(caret, caretColor);
+        p->fillRect(caret, caretColor, colorSpace);
     }
 }