[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:08:26 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 84e2f88c04f6047bebcee33ca4ce0ff6b54d36fd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 1 02:23:26 2003 +0000

    	Fix for 3470489, I just forgot to commit a piece of my patch.  This has actually even
    	been reviewed by ken already.
    
    	Reviewed by kocienda
    
            * khtml/rendering/render_replaced.cpp:
            (RenderWidget::eventFilter):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6eefc30..b0c7bbf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-31  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3470489, I just forgot to commit a piece of my patch.  This has actually even
+	been reviewed by ken already.
+
+	Reviewed by kocienda
+	
+        * khtml/rendering/render_replaced.cpp:
+        (RenderWidget::eventFilter):
+
 2003-10-31  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_replaced.cpp b/WebCore/khtml/rendering/render_replaced.cpp
index f5d3bcb..2ab7864 100644
--- a/WebCore/khtml/rendering/render_replaced.cpp
+++ b/WebCore/khtml/rendering/render_replaced.cpp
@@ -347,7 +347,8 @@ bool RenderWidget::eventFilter(QObject* /*o*/, QEvent* e)
         if ( QFocusEvent::reason() != QFocusEvent::Popup )
        {
            //kdDebug(6000) << "RenderWidget::eventFilter captures FocusOut" << endl;
-            elem->getDocument()->setFocusNode(0);
+            if (elem->getDocument()->focusNode() == elem)
+                elem->getDocument()->setFocusNode(0);
 //             if (  elem->isEditable() ) {
 //                 KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>( elem->view->part()->browserExtension() );
 //                 if ( ext )  ext->editableWidgetBlurred( m_widget );

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list