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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5ddce9813cfd978ad3e2434a0f471253bf1d7f0c
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 30 14:30:23 2010 +0000

    2010-11-30  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Test fast/events/mouseover-mouseout2.html crashes
            https://bugs.webkit.org/show_bug.cgi?id=50214
    
            * WebCoreSupport/ChromeClientGtk.cpp:
            (WebKit::ChromeClient::mouseDidMoveOverElement):
            * webkit/webkitwebview.cpp:
            (webkit_web_view_query_tooltip):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a73e1ab..067f511 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Test fast/events/mouseover-mouseout2.html crashes
+        https://bugs.webkit.org/show_bug.cgi?id=50214
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::mouseDidMoveOverElement):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_query_tooltip):
+
 2010-11-30  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r72764.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 4450e87..190ae9b 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -523,9 +523,12 @@ void ChromeClient::mouseDidMoveOverElement(const HitTestResult& hit, unsigned mo
         m_hoveredLinkURL = KURL();
     }
 
-    Node* node = hit.innerNonSharedNode();
-
-    m_webView->priv->tooltipArea = node ? node->document()->frame()->view()->contentsToWindow(node->getRect()) : IntRect();
+    if (Node* node = hit.innerNonSharedNode()) {
+        Frame* frame = node->document()->frame();
+        FrameView* view = frame ? frame->view() : 0;
+        m_webView->priv->tooltipArea = view ? view->contentsToWindow(node->getRect()) : IntRect();
+    } else
+        m_webView->priv->tooltipArea = IntRect();
 }
 
 void ChromeClient::setToolTip(const String& toolTip, TextDirection)
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 3e888f8..90be935 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -1670,8 +1670,10 @@ static gboolean webkit_web_view_query_tooltip(GtkWidget *widget, gint x, gint y,
             if (titleNode->isElementNode()) {
                 String title = static_cast<Element*>(titleNode)->title();
                 if (!title.isEmpty()) {
-                    GdkRectangle area = coreFrame->view()->contentsToWindow(node->getRect());
-                    gtk_tooltip_set_tip_area(tooltip, &area);
+                    if (FrameView* view = coreFrame->view()) {
+                        GdkRectangle area = view->contentsToWindow(node->getRect());
+                        gtk_tooltip_set_tip_area(tooltip, &area);
+                    }
                     gtk_tooltip_set_text(tooltip, title.utf8().data());
 
                     return TRUE;

-- 
WebKit Debian packaging