Changeset 29887 in webkit

Timestamp:

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

Author:

Adam Roben

Message:

Let WebCore take care of the highlight drawing entirely

WebCore:

Put more knowledge about the node highlight in WebCore

InspectorController now calculates the overlay rect and node rect when
drawing the node highlight instead of having them be passed in.
InspectorController now holds onto the highlighted node so that it can
determine these rects.

Once all platforms are calling down to drawNodeHighlight instead of
drawing the highlight themselves, we can change
InspectorClient::highlight(Node*) to something like
InspectorClient::updateAndShowHighlight().

This also fixes Bug 14264: Node highlight makes it impossible to
scroll the page
<​http://bugs.webkit.org/show_bug.cgi?id=14264>
<rdar://5712788>

Reviewed by Darin.

• page/InspectorController.cpp: (WebCore::InspectorController::highlight): Store the node for use in drawNodeHighlight. (WebCore::InspectorController::drawNodeHighlight): Changed to be a const instance method. Now calculates the overlay rect and node rect instead of having them passed in.
• page/InspectorController.h:

WebKit/win:

Let WebCore take care of the highlight drawing entirely

Reviewed by Darin.

• WebInspectorClient.cpp: (WebInspectorClient::highlight): We now just show our highlight window and let WebCore figure out what/where to paint. Once all ports follow suit the Node* parameter to this method should be removed entirely, and the name should probably change to updateAndShowHighlight or something similar.
• WebNodeHighlight.cpp: Renamed m_webView to m_inspectedWebViewWindow. (WebNodeHighlight::WebNodeHighlight): Now takes a WebView* parameter. (WebNodeHighlight::show): Renamed from highlight(). Now gets the WebView's HWND. Updated for member rename/removal. (WebNodeHighlight::updateWindow): Updated for member rename and for InspectorController changes.
• WebNodeHighlight.h: Added m_inspectedWebView member, removed m_rect member, renamed highlight(Node*) -> show().

Location:

trunk

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-31  Adam Roben  <aroben@apple.com>
+
+        Put more knowledge about the node highlight in WebCore
+
+        InspectorController now calculates the overlay rect and node rect when
+        drawing the node highlight instead of having them be passed in.
+        InspectorController now holds onto the highlighted node so that it can
+        determine these rects.
+
+        Once all platforms are calling down to drawNodeHighlight instead of
+        drawing the highlight themselves, we can change
+        InspectorClient::highlight(Node*) to something like
+        InspectorClient::updateAndShowHighlight().
+
+        This also fixes Bug 14264: Node highlight makes it impossible to
+        scroll the page
+        <http://bugs.webkit.org/show_bug.cgi?id=14264>
+        <rdar://5712788>
+
+        Reviewed by Darin.
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::highlight): Store the node for use in
+        drawNodeHighlight.
+        (WebCore::InspectorController::drawNodeHighlight): Changed to be a
+        const instance method. Now calculates the overlay rect and node rect
+        instead of having them passed in.
+        * page/InspectorController.h:
+
 2008-01-31  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -41 +41 @@
 #include "FrameLoader.h"
 #include "FrameTree.h"
+#include "FrameView.h"
 #include "GraphicsContext.h"
 #include "HTMLFrameOwnerElement.h"
@@ -669 +670 @@
         return;
     ASSERT_ARG(node, node);
+    m_highlightedNode = node;
     m_client->highlight(node);
 }
@@ -1579 +1581 @@
 }
 
-void InspectorController::drawNodeHighlight(GraphicsContext& context, const IntRect& overlayRect, const IntRect& highlightedNodeRect)
+void InspectorController::drawNodeHighlight(GraphicsContext& context) const
 {
     static const Color overlayFillColor(0, 0, 0, 128);
     static const int outlineThickness = 1;
 
-    context.clipOut(highlightedNodeRect);
+    if (!m_highlightedNode)
+        return;
+
+    FrameView* view = m_inspectedPage->mainFrame()->view();
+    FloatRect overlayRect = static_cast<ScrollView*>(view)->visibleContentRect();
+    context.translate(-overlayRect.x(), -overlayRect.y());
+
+    RenderObject* renderer = m_highlightedNode->renderer();
+    if (!renderer)
+        return;
+    IntRect nodeRect(renderer->absoluteBoundingBoxRect());
+
+    if (!overlayRect.contains(nodeRect) && !nodeRect.contains(enclosingIntRect(overlayRect))) {
+        Element* element;
+        if (m_highlightedNode->isElementNode())
+            element = static_cast<Element*>(m_highlightedNode.get());
+        else
+            element = static_cast<Element*>(m_highlightedNode->parent());
+        element->scrollIntoViewIfNeeded();
+    }
+
+    context.clipOut(nodeRect);
 
     context.fillRect(overlayRect, overlayFillColor);
 
-    IntRect outlineRect(highlightedNodeRect);
+    IntRect outlineRect(nodeRect);
     outlineRect.inflate(outlineThickness);
     context.fillRect(outlineRect, Color::white);

trunk/WebCore/page/InspectorController.h

@@ -121 +121 @@
     void moveWindowBy(float x, float y) const;
 
-    static void drawNodeHighlight(GraphicsContext&, const IntRect& overlayRect, const IntRect& highlightedNodeRect);
+    void drawNodeHighlight(GraphicsContext&) const;
 
 private:
@@ -170 +170 @@
     SpecialPanels m_showAfterVisible;
     long long m_nextIdentifier;
+    RefPtr<Node> m_highlightedNode;
 };
 

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-01-31  Adam Roben  <aroben@apple.com>
+
+        Let WebCore take care of the highlight drawing entirely
+
+        Reviewed by Darin.
+
+        * WebInspectorClient.cpp:
+        (WebInspectorClient::highlight): We now just show our highlight
+        window and let WebCore figure out what/where to paint. Once all ports
+        follow suit the Node* parameter to this method should be removed
+        entirely, and the name should probably change to
+        updateAndShowHighlight or something similar.
+        * WebNodeHighlight.cpp: Renamed m_webView to m_inspectedWebViewWindow.
+        (WebNodeHighlight::WebNodeHighlight): Now takes a WebView* parameter.
+        (WebNodeHighlight::show): Renamed from highlight(). Now gets the
+        WebView's HWND. Updated for member rename/removal.
+        (WebNodeHighlight::updateWindow): Updated for member rename and for
+        InspectorController changes.
+        * WebNodeHighlight.h: Added m_inspectedWebView member, removed m_rect
+        member, renamed highlight(Node*) -> show().
+
 2008-01-31  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebInspectorClient.cpp

@@ -271 +271 @@
 }
 
-void WebInspectorClient::highlight(Node* node)
-{
-    ASSERT_ARG(node, node);
-
-    HWND hwnd;
-    if (FAILED(m_inspectedWebView->viewWindow((OLE_HANDLE*)&hwnd)))
-        return;
-    RECT rect;
-    ::GetClientRect(hwnd, &rect);
-    IntRect webViewRect(rect);
-
-    RenderObject* renderer = node->renderer();
-    if (!renderer)
-        return;
-    IntRect nodeRect(renderer->absoluteBoundingBoxRect());
-
-    if (!webViewRect.contains(nodeRect) && !nodeRect.contains(webViewRect)) {
-        Element* element;
-        if (node->isElementNode())
-            element = static_cast<Element*>(node);
-        else
-            element = static_cast<Element*>(node->parent());
-        element->scrollIntoViewIfNeeded();
-    }
-
-    IntSize offset = m_inspectedWebView->page()->mainFrame()->view()->scrollOffset();
-    nodeRect.move(-offset);
-
+void WebInspectorClient::highlight(Node*)
+{
     if (!m_highlight)
-        m_highlight.set(new WebNodeHighlight(hwnd));
-
-    m_highlight->highlight(nodeRect);
+        m_highlight.set(new WebNodeHighlight(m_inspectedWebView));
+
+    m_highlight->show();
 }
 

trunk/WebKit/win/WebNodeHighlight.cpp

@@ -30 +30 @@
 #include "WebNodeHighlight.h"
 
+#include "WebView.h"
 #pragma warning(push, 0)
 #include <WebCore/Color.h>
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/InspectorController.h>
+#include <WebCore/Page.h>
 #include <WebCore/WindowMessageBroadcaster.h>
 #pragma warning(pop)
@@ -45 +47 @@
 static LPCTSTR kWebNodeHighlightPointerProp = TEXT("WebNodeHighlightPointer");
 
-WebNodeHighlight::WebNodeHighlight(HWND webView)
-    : m_webView(webView)
+WebNodeHighlight::WebNodeHighlight(WebView* webView)
+    : m_inspectedWebView(webView)
+    , m_inspectedWebViewWindow(0)
     , m_overlay(0)
     , m_observedWindow(0)
@@ -61 +64 @@
 }
 
-void WebNodeHighlight::highlight(const IntRect& rect)
+void WebNodeHighlight::show()
 {
     if (!m_overlay) {
+        if (FAILED(m_inspectedWebView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&m_inspectedWebViewWindow))) || !IsWindow(m_inspectedWebViewWindow))
+            return;
+
         registerOverlayClass();
 
         m_overlay = ::CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, kOverlayWindowClassName, 0, WS_POPUP | WS_VISIBLE,
                                      0, 0, 0, 0,
-                                     m_webView, 0, 0, 0);
+                                     m_inspectedWebViewWindow, 0, 0, 0);
         if (!m_overlay)
             return;
 
         ::SetProp(m_overlay, kWebNodeHighlightPointerProp, reinterpret_cast<HANDLE>(this));
-        ::SetWindowPos(m_overlay, m_webView, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
-
-        m_observedWindow = GetAncestor(m_webView, GA_ROOT);
+        ::SetWindowPos(m_overlay, m_inspectedWebViewWindow, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+
+        m_observedWindow = GetAncestor(m_inspectedWebViewWindow, GA_ROOT);
         WindowMessageBroadcaster::addListener(m_observedWindow, this);
     }
 
-    m_rect = rect;
     updateWindow();
     ::ShowWindow(m_overlay, SW_SHOW);
@@ -104 +109 @@
 
     RECT webViewRect;
-    ::GetWindowRect(m_webView, &webViewRect);
+    ::GetWindowRect(m_inspectedWebViewWindow, &webViewRect);
 
     SIZE size;
@@ -130 +135 @@
     GraphicsContext context(hdc);
 
-    IntRect overlayRect(webViewRect);
-    overlayRect.setLocation(IntPoint(0, 0));
-
-    InspectorController::drawNodeHighlight(context, overlayRect, m_rect);
+    m_inspectedWebView->page()->inspectorController()->drawNodeHighlight(context);
 
     BLENDFUNCTION bf;

trunk/WebKit/win/WebNodeHighlight.h

@@ -31 +31 @@
 
 #pragma warning(push, 0)
-#include <WebCore/IntRect.h>
 #include <WebCore/WindowMessageListener.h>
 #pragma warning(pop)
@@ -37 +36 @@
 #include <windows.h>
 
+class WebView;
+
 class WebNodeHighlight : WebCore::WindowMessageListener {
 public:
-    WebNodeHighlight(HWND webView);
+    WebNodeHighlight(WebView*);
     ~WebNodeHighlight();
 
-    void highlight(const WebCore::IntRect&);
+    void show();
     void hide();
 
@@ -51 +52 @@
     virtual void windowReceivedMessage(HWND, UINT message, WPARAM, LPARAM);
 
-    HWND m_webView;
+    WebView* m_inspectedWebView;
+    HWND m_inspectedWebViewWindow;
     HWND m_overlay;
     HWND m_observedWindow;
-
-    WebCore::IntRect m_rect;
 
     friend static LRESULT CALLBACK OverlayWndProc(HWND, UINT, WPARAM, LPARAM);