Changeset 19706 in webkit

Timestamp:

Feb 19, 2007 1:20:35 AM (17 years ago)

Author:

antti

Message:

Reviewed by Hyatt.

• really fix ​http://bugs.webkit.org/show_bug.cgi?id=11974 REGRESSION: Caret drawn over input when smaller than font size on initial focus <rdar://problem/4960258>

Avoid double painting caret when it is on a block element.

Layout test for this already went in previous try (it only fails in pixel mode) in r19626.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintCaret):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-18  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Hyatt.
+
+        - really fix http://bugs.webkit.org/show_bug.cgi?id=11974
+        REGRESSION: Caret drawn over input when smaller than font size on initial focus
+        <rdar://problem/4960258>
+        
+        Avoid double painting caret when it is on a block element.
+        
+        Layout test for this already went in previous try (it only fails in pixel mode) in r19626.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintCaret):
+
 2007-02-19  Lars Knoll <lars@trolltech.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1414 +1414 @@
     Node* caretNode = selectionController->start().node();
     RenderObject* renderer = caretNode ? caretNode->renderer() : 0;
-    if (renderer && (renderer == this || renderer->containingBlock() == this) && caretNode && caretNode->isContentEditable()) {
+    if (renderer && (renderer == this || (renderer->containingBlock() == this && !renderer->isBlockFlow())) && caretNode->isContentEditable()) {
         if (type == CursorCaret)
             document()->frame()->paintCaret(paintInfo.context, paintInfo.rect);