Changeset 29888 in webkit

Timestamp:

Jan 31, 2008, 10:50:43 AM (18 years ago)

Author:

Adam Roben

Message:

Add line box drawing code to InspectorController::drawNodeHighlight

This makes drawNodeHighlight a complete replacement for the painting
code in WebKit/mac/WebNodeHighlightView.mm, and also brings line box
rects to Windows for the first time.

Reviewed by Darin.

• dom/Node.h: Changed isSVGElement to always exist, but to only be virtual when ENABLE(SVG) is true. This way you can always call node->isSVGElement() without checking ENABLE(SVG).
• page/InspectorController.cpp: (WebCore::InspectorController::drawNodeHighlight): Ported line box rect code from the Mac implementation in WebNodeHighlightView.mm.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.h (modified) (1 diff)
• page/InspectorController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-31  Adam Roben  <aroben@apple.com>
+
+        Add line box drawing code to InspectorController::drawNodeHighlight
+
+        This makes drawNodeHighlight a complete replacement for the painting
+        code in WebKit/mac/WebNodeHighlightView.mm, and also brings line box
+        rects to Windows for the first time.
+
+        Reviewed by Darin.
+
+        * dom/Node.h: Changed isSVGElement to always exist, but to only be
+        virtual when ENABLE(SVG) is true. This way you can always call
+        node->isSVGElement() without checking ENABLE(SVG).
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::drawNodeHighlight): Ported line box
+        rect code from the Mac implementation in WebNodeHighlightView.mm.
+
 2008-01-31  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/dom/Node.h

@@ -143 +143 @@
     virtual bool isElementNode() const { return false; }
     virtual bool isHTMLElement() const { return false; }
+
 #if ENABLE(SVG)
-    virtual bool isSVGElement() const { return false; }
+    virtual
 #endif
+        bool isSVGElement() const { return false; }
+
     virtual bool isStyledElement() const { return false; }
     virtual bool isFrameOwnerElement() const { return false; }

trunk/WebCore/page/InspectorController.cpp

@@ -1598 +1598 @@
     IntRect nodeRect(renderer->absoluteBoundingBoxRect());
 
+    Vector<IntRect> rects;
+    if (renderer->isInline() || (renderer->isText() && !m_highlightedNode->isSVGElement()))
+        renderer->addLineBoxRects(rects);
+    if (rects.isEmpty())
+        rects.append(nodeRect);
+
     if (!overlayRect.contains(nodeRect) && !nodeRect.contains(enclosingIntRect(overlayRect))) {
         Element* element;
@@ -1607 +1613 @@
     }
 
-    context.clipOut(nodeRect);
-
+    // Draw translucent gray fill, out of which we will cut holes.
     context.fillRect(overlayRect, overlayFillColor);
 
-    IntRect outlineRect(nodeRect);
-    outlineRect.inflate(outlineThickness);
-    context.fillRect(outlineRect, Color::white);
+    // Draw white frames around holes in first pass, so they will be erased in
+    // places where holes overlap or abut.
+    for (size_t i = 0; i < rects.size(); ++i) {
+        IntRect rect = rects[i];
+        rect.inflate(outlineThickness);
+        context.fillRect(rect, Color::white);
+    }
+
+    // Erase holes in second pass.
+    for (size_t i = 0; i < rects.size(); ++i)
+        context.clearRect(rects[i]);
 }