[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 48322b9668c9f0bbf99d5b9fef6b2e34a8e6a382
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 18:08:25 2010 +0000

    2010-08-03  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            [GTK] Does not paint the node highlight used by the inspector
            https://bugs.webkit.org/show_bug.cgi?id=43429
    
            Implement highlighting the nodes when using the inspector.
    
            * WebCoreSupport/InspectorClientGtk.cpp:
            (WebKit::InspectorClient::highlight):
            (WebKit::InspectorClient::hideHighlight):
            * webkit/webkitwebview.cpp:
            (webkit_web_view_expose_event):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64567 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d7582ee..e88ab91 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-03  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Does not paint the node highlight used by the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=43429
+
+        Implement highlighting the nodes when using the inspector.
+
+        * WebCoreSupport/InspectorClientGtk.cpp:
+        (WebKit::InspectorClient::highlight):
+        (WebKit::InspectorClient::hideHighlight):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_expose_event):
+
 2010-08-03  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
@@ -148,7 +163,6 @@
         * WebCoreSupport/ChromeClientGtk.cpp:
         (WebKit::ChromeClient::reachedApplicationCacheOriginQuota):
         * WebCoreSupport/ChromeClientGtk.h:
-
 2010-07-26  Steve Block  <steveblock at google.com>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
index 616834b..7039dd6 100644
--- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
@@ -101,14 +101,18 @@ void InspectorClient::releaseFrontendPage()
     m_frontendPage = 0;
 }
 
-void InspectorClient::highlight(Node* node)
+void InspectorClient::highlight(Node*)
 {
-    notImplemented();
+    hideHighlight();
 }
 
 void InspectorClient::hideHighlight()
 {
-    notImplemented();
+    // FIXME: we should be able to only invalidate the actual rects of
+    // the new and old nodes. We need to track the nodes, and take the
+    // actual highlight size into account when calculating the damage
+    // rect.
+    gtk_widget_queue_draw(GTK_WIDGET(m_inspectedWebView));
 }
 
 void InspectorClient::populateSetting(const String& key, String* value)
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 6640630..1d2af0e 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -549,6 +549,11 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose*
                 ctx.restore();
             }
         }
+
+        ctx.save();
+        ctx.clip(static_cast<IntRect>(event->area));
+        frame->page()->inspectorController()->drawNodeHighlight(ctx);
+        ctx.restore();
     }
 
     return FALSE;

-- 
WebKit Debian packaging