AI 144458: Remove our hack to prevent drawing the selection, and set our selection color to transparent. This gets us the same result while simplifying the merge.

Automated import of CL 144458

1 files changed, 0 insertions, 11 deletions

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 0d73961..725bdb6 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1949,17 +1949,6 @@ GapRects RenderBlock::fillSelectionGaps(RenderBlock* rootBlock, int blockX, int
     // FIXME: overflow: auto/scroll regions need more math here, since painting in the border box is different from painting in the padding box (one is scrolled, the other is
     // fixed).
     GapRects result;
-#ifdef ANDROID_DO_NOT_DRAW_TEXTFIELD_SELECTION
-    Node* node = element();
-    if (node) {
-        Node* ancestor = node->shadowAncestorNode();
-        if (ancestor && ancestor->renderer()) {
-            RenderObject* renderer = ancestor->renderer();
-            if (renderer->isTextField() || renderer->isTextArea())
-                return result;
-        }
-    }
-#endif
     if (!isBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.
         return result;