Changeset 29886 in webkit

Timestamp:

Jan 31, 2008, 10:44:38 AM (17 years ago)

Author:

Adam Roben

Message:

Move node highlight drawing code to WebCore

WebCore:

Add node highlight drawing code to InspectorController

The code came from WebKit/win/WebNodeHighlight.cpp. It's not quite as
complete as the Mac implementation (in particular, it doesn't handle
line-box rects), but it's a start.

Reviewed by Darin.

• page/InspectorController.cpp: (WebCore::InspectorController::drawNodeHighlight): Added.
• page/InspectorController.h:

WebKit/win:

Move node highlight drawing code to WebCore

Reviewed by Darin.

• WebNodeHighlight.cpp: (WebNodeHighlight::updateWindow): Call into WebCore to do the node highlight drawing.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/InspectorController.cpp (modified) (2 diffs)
• WebCore/page/InspectorController.h (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebNodeHighlight.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-31  Adam Roben  <aroben@apple.com>
+
+        Add node highlight drawing code to InspectorController
+
+        The code came from WebKit/win/WebNodeHighlight.cpp. It's not quite as
+        complete as the Mac implementation (in particular, it doesn't handle
+        line-box rects), but it's a start.
+
+        Reviewed by Darin.
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::drawNodeHighlight): Added.
+        * page/InspectorController.h:
+
 2008-01-31  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -41 +41 @@
 #include "FrameLoader.h"
 #include "FrameTree.h"
+#include "GraphicsContext.h"
 #include "HTMLFrameOwnerElement.h"
 #include "InspectorClient.h"
@@ -1578 +1579 @@
 }
 
+void InspectorController::drawNodeHighlight(GraphicsContext& context, const IntRect& overlayRect, const IntRect& highlightedNodeRect)
+{
+    static const Color overlayFillColor(0, 0, 0, 128);
+    static const int outlineThickness = 1;
+
+    context.clipOut(highlightedNodeRect);
+
+    context.fillRect(overlayRect, overlayFillColor);
+
+    IntRect outlineRect(highlightedNodeRect);
+    outlineRect.inflate(outlineThickness);
+    context.fillRect(outlineRect, Color::white);
+}
+
 } // namespace WebCore

trunk/WebCore/page/InspectorController.h

@@ -40 +40 @@
 class Database;
 class DocumentLoader;
+class GraphicsContext;
 class InspectorClient;
 class Node;
@@ -120 +121 @@
     void moveWindowBy(float x, float y) const;
 
+    static void drawNodeHighlight(GraphicsContext&, const IntRect& overlayRect, const IntRect& highlightedNodeRect);
+
 private:
     void focusNode();

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-01-31  Adam Roben  <aroben@apple.com>
+
+        Move node highlight drawing code to WebCore
+
+        Reviewed by Darin.
+
+        * WebNodeHighlight.cpp:
+        (WebNodeHighlight::updateWindow): Call into WebCore to do the node
+        highlight drawing.
+
 2008-01-29  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebNodeHighlight.cpp

@@ -33 +33 @@
 #include <WebCore/Color.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/InspectorController.h>
 #include <WebCore/WindowMessageBroadcaster.h>
 #pragma warning(pop)
@@ -124 +125 @@
     void* pixels = 0;
     OwnPtr<HBITMAP> hbmp(::CreateDIBSection(hdc, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
-    if (!hbmp) {
-        DWORD error = ::GetLastError();
-        error++;
-        return;
-    }
 
     ::SelectObject(hdc, hbmp.get());
@@ -134 +130 @@
     GraphicsContext context(hdc);
 
-    context.clipOut(m_rect);
-
-    FloatRect overlayRect(webViewRect);
-    overlayRect.setLocation(FloatPoint(0, 0));
-    context.fillRect(overlayRect, Color(0, 0, 0, 128));
-
-    IntRect outlineRect(m_rect);
-    outlineRect.inflate(1);
-    context.fillRect(outlineRect, Color::white);
+    IntRect overlayRect(webViewRect);
+    overlayRect.setLocation(IntPoint(0, 0));
+
+    InspectorController::drawNodeHighlight(context, overlayRect, m_rect);
 
     BLENDFUNCTION bf;