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

[kevino at webkit.org]

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

    Reviewed by Kevin Ollivier.
    
    Fix crash during HitTest call.
    https://bugs.webkit.org/show_bug.cgi?id=43372
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64568 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 362f6e5..74fd095 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-03  Malcolm MacLeod  <mmacleod at webmail.co.za>
+
+        Reviewed by Kevin Ollivier.
+
+        Fix crash during HitTest call.
+        https://bugs.webkit.org/show_bug.cgi?id=43372
+
+        * WebFrame.cpp:
+        (wxWebFrame::HitTest):
+        * WebView.cpp:
+        (wxWebViewDOMElementInfo::wxWebViewDOMElementInfo):
+
 2010-07-27  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index b8d2ac2..a66605c 100644
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -458,7 +458,6 @@ wxWebViewDOMElementInfo wxWebFrame::HitTest(const wxPoint& pos) const
     if (m_impl->frame->view()) {
         WebCore::HitTestResult result = m_impl->frame->eventHandler()->hitTestResultAtPoint(m_impl->frame->view()->windowToContents(pos), false);
         if (result.innerNode()) {
-            domInfo.SetInnerNode(new WebDOMNode(result.innerNode()));
             domInfo.SetLink(result.absoluteLinkURL().string());
             domInfo.SetText(result.textContent());
             domInfo.SetImageSrc(result.absoluteImageURL().string());
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 88d0ad9..3b0bcb0 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -235,7 +235,9 @@ wxWebViewDOMElementInfo::wxWebViewDOMElementInfo() :
     m_isSelected(false),
     m_text(wxEmptyString),
     m_imageSrc(wxEmptyString),
-    m_link(wxEmptyString)
+    m_link(wxEmptyString),
+    m_urlElement(NULL),
+    m_innerNode(NULL)
 {
 }
 

-- 
WebKit Debian packaging