Changeset 84781 in webkit

Timestamp:

Apr 25, 2011 10:10:51 AM (13 years ago)

Author:

bweinstein@apple.com

Message:

WebKit2: Web Inspector: Support highlighting page elements
​https://bugs.webkit.org/show_bug.cgi?id=59263
<rdar://problem/8767659>

Reviewed by Alice Liu.

Support highlighting of page elements for the inspector in WebKit2 by
having the WebInspectorClient be a PageOverlay Client and be responsible
for calling InspectorController::drawNodeHighlight.

• WebProcess/WebCoreSupport/WebInspectorClient.cpp:

(WebKit::WebInspectorClient::highlight): Create our overlay if it hasn't been created,

or call setNeedsDisplay if it has.

(WebKit::WebInspectorClient::hideHighlight): Uninstall the page overlay if it exists.
(WebKit::WebInspectorClient::pageOverlayDestroyed):
(WebKit::WebInspectorClient::willMoveToWebPage): If it's being destroyed (moving to a null

WebPage), clear the member variable.

(WebKit::WebInspectorClient::didMoveToWebPage):
(WebKit::WebInspectorClient::drawRect): Call InspectorController::drawNodeHighlight.
(WebKit::WebInspectorClient::mouseEvent):

• WebProcess/WebCoreSupport/WebInspectorClient.h:

(WebKit::WebInspectorClient::WebInspectorClient): Add a new member variable.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebInspectorClient.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebInspectorClient.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-25  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Alice Liu.
+
+        WebKit2: Web Inspector: Support highlighting page elements
+        https://bugs.webkit.org/show_bug.cgi?id=59263
+        <rdar://problem/8767659>
+
+        Support highlighting of page elements for the inspector in WebKit2 by
+        having the WebInspectorClient be a PageOverlay Client and be responsible
+        for calling InspectorController::drawNodeHighlight.
+
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        (WebKit::WebInspectorClient::highlight): Create our overlay if it hasn't been created,
+            or call setNeedsDisplay if it has.
+        (WebKit::WebInspectorClient::hideHighlight): Uninstall the page overlay if it exists.
+        (WebKit::WebInspectorClient::pageOverlayDestroyed):
+        (WebKit::WebInspectorClient::willMoveToWebPage): If it's being destroyed (moving to a null
+            WebPage), clear the member variable.
+        (WebKit::WebInspectorClient::didMoveToWebPage):
+        (WebKit::WebInspectorClient::drawRect): Call InspectorController::drawNodeHighlight.
+        (WebKit::WebInspectorClient::mouseEvent):
+        * WebProcess/WebCoreSupport/WebInspectorClient.h:
+        (WebKit::WebInspectorClient::WebInspectorClient): Add a new member variable.
+
 2011-04-25  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp

@@ -57 +57 @@
 void WebInspectorClient::highlight(Node*)
 {
-    notImplemented();
+    if (!m_highlightOverlay) {
+        RefPtr<PageOverlay> highlightOverlay = PageOverlay::create(this);
+        m_highlightOverlay = highlightOverlay.get();
+        m_page->installPageOverlay(highlightOverlay.release());
+    } else
+        m_highlightOverlay->setNeedsDisplay();
 }
 
 void WebInspectorClient::hideHighlight()
 {
-    notImplemented();
+    if (m_highlightOverlay)
+        m_page->uninstallPageOverlay(m_highlightOverlay, false);
 }
 
@@ -86 +92 @@
 }
 
+void WebInspectorClient::pageOverlayDestroyed(PageOverlay*)
+{
+}
+
+void WebInspectorClient::willMoveToWebPage(PageOverlay*, WebPage* webPage)
+{
+    if (webPage)
+        return;
+
+    // The page overlay is moving away from the web page, reset it.
+    ASSERT(m_highlightOverlay);
+    m_highlightOverlay = 0;
+}
+
+void WebInspectorClient::didMoveToWebPage(PageOverlay*, WebPage*)
+{
+}
+
+void WebInspectorClient::drawRect(PageOverlay* overlay, WebCore::GraphicsContext& context, const WebCore::IntRect& dirtyRect)
+{
+    m_page->corePage()->inspectorController()->drawNodeHighlight(context);
+}
+
+bool WebInspectorClient::mouseEvent(PageOverlay*, const WebMouseEvent&)
+{
+    return false;
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.h

@@ -29 +29 @@
 #if ENABLE(INSPECTOR)
 
+#include "PageOverlay.h"
+
 #include <WebCore/InspectorClient.h>
+
+namespace WebCore {
+    class GraphicsContext;
+    class IntRect;
+}
 
 namespace WebKit {
@@ -35 +42 @@
 class WebPage;
 
-class WebInspectorClient : public WebCore::InspectorClient {
+class WebInspectorClient : public WebCore::InspectorClient, private PageOverlay::Client {
 public:
     WebInspectorClient(WebPage* page)
         : m_page(page)
+        , m_highlightOverlay(0)
     {
     }
@@ -55 +63 @@
     virtual bool sendMessageToFrontend(const String&);
 
+    // PageOverlay::Client
+    virtual void pageOverlayDestroyed(PageOverlay*);
+    virtual void willMoveToWebPage(PageOverlay*, WebPage*);
+    virtual void didMoveToWebPage(PageOverlay*, WebPage*);
+    virtual void drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect&);
+    virtual bool mouseEvent(PageOverlay*, const WebMouseEvent&);
+
     WebPage* m_page;
+    PageOverlay* m_highlightOverlay;
 };