Changeset 53603 in webkit

Timestamp:

Jan 20, 2010 9:36:41 PM (14 years ago)

Author:

oliver@apple.com

Message:

2010-01-20 Oliver Hunt <​oliver@apple.com>

Reviewed by Dan Bernstein.

Insufficient repaint issues with html embedded in foreignObject
​https://bugs.webkit.org/show_bug.cgi?id=16318

Final part of fix -- now we render the selection rect of list
markers in a transformed context.

• rendering/RenderListMarker.cpp: (WebCore::RenderListMarker::localSelectionRect): (WebCore::RenderListMarker::paint):
• rendering/RenderListMarker.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderListMarker.cpp (modified) (3 diffs)
• rendering/RenderListMarker.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-20  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Insufficient repaint issues with html embedded in foreignObject
+        https://bugs.webkit.org/show_bug.cgi?id=16318
+
+        Final part of fix -- now we render the selection rect of list
+        markers in a transformed context.
+
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::localSelectionRect):
+        (WebCore::RenderListMarker::paint):
+        * rendering/RenderListMarker.h:
+
 2010-01-20  Daniel Bates  <dbates@webkit.org>
 

trunk/WebCore/rendering/RenderListMarker.cpp

@@ -773 +773 @@
 }
 
+IntRect RenderListMarker::localSelectionRect()
+{
+    InlineBox* box = inlineBoxWrapper();
+    if (!box)
+        return IntRect();
+    RootInlineBox* root = box->root();
+    return IntRect(x(), root->selectionTop() - y(), width(), root->selectionHeight());
+}
+
 void RenderListMarker::paint(PaintInfo& paintInfo, int tx, int ty)
 {
@@ -801 +810 @@
         context->drawImage(m_image->image(this, marker.size()), style()->colorSpace(), marker.location());
         if (selectionState() != SelectionNone) {
-            // FIXME: selectionRect() is in absolute, not painting coordinates.
-            context->fillRect(selectionRect(), selectionBackgroundColor(), style()->colorSpace());
+            IntRect selRect = localSelectionRect();
+            selRect.move(tx, ty);
+            context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
         }
         return;
@@ -814 +824 @@
 
     if (selectionState() != SelectionNone) {
-        // FIXME: selectionRect() is in absolute, not painting coordinates.
-        context->fillRect(selectionRect(), selectionBackgroundColor(), style()->colorSpace());
+        IntRect selRect = localSelectionRect();
+        selRect.move(tx, ty);
+        context->fillRect(selRect, selectionBackgroundColor(), style()->colorSpace());
     }
 

trunk/WebCore/rendering/RenderListMarker.h

@@ -74 +74 @@
 
     IntRect getRelativeMarkerRect();
+    IntRect localSelectionRect();
 
     String m_text;