[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c5fc13957f4704c836ac381cbd14509ccb1c1521
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 18:25:53 2010 +0000

    2010-02-18  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Remove some duplication between PluginView and Widget methods, and
            move the setSelfVisible calls to the parent class.
    
            * platform/gtk/WidgetGtk.cpp:
            (WebCore::Widget::show):
            (WebCore::Widget::hide):
            * plugins/gtk/PluginViewGtk.cpp:
            (WebCore::PluginView::setFocus):
            (WebCore::PluginView::show):
            (WebCore::PluginView::hide):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c8349ce..fc72e57 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-18  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Remove some duplication between PluginView and Widget methods, and
+        move the setSelfVisible calls to the parent class.
+
+        * platform/gtk/WidgetGtk.cpp:
+        (WebCore::Widget::show):
+        (WebCore::Widget::hide):
+        * plugins/gtk/PluginViewGtk.cpp:
+        (WebCore::PluginView::setFocus):
+        (WebCore::PluginView::show):
+        (WebCore::PluginView::hide):
+
 2010-02-18  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/gtk/WidgetGtk.cpp b/WebCore/platform/gtk/WidgetGtk.cpp
index 53c10f1..834c21a 100644
--- a/WebCore/platform/gtk/WidgetGtk.cpp
+++ b/WebCore/platform/gtk/WidgetGtk.cpp
@@ -82,16 +82,18 @@ void Widget::setCursor(const Cursor& cursor)
 
 void Widget::show()
 {
-    if (!platformWidget())
-         return;
-    gtk_widget_show(platformWidget());
+    setSelfVisible(true);
+
+    if (isParentVisible() && platformWidget())
+        gtk_widget_show(platformWidget());
 }
 
 void Widget::hide()
 {
-    if (!platformWidget())
-         return;
-    gtk_widget_hide(platformWidget());
+    setSelfVisible(false);
+
+    if (isParentVisible() && platformWidget())
+        gtk_widget_hide(platformWidget());
 }
 
 void Widget::paint(GraphicsContext* context, const IntRect& rect)
diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 6d992fb..222584c 100644
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -158,29 +158,19 @@ void PluginView::updatePluginWidget()
 
 void PluginView::setFocus()
 {
-    if (platformPluginWidget())
-        gtk_widget_grab_focus(platformPluginWidget());
-
+    ASSERT(platformPluginWidget() == platformWidget());
     Widget::setFocus();
 }
 
 void PluginView::show()
 {
-    setSelfVisible(true);
-
-    if (isParentVisible() && platformPluginWidget())
-        gtk_widget_show(platformPluginWidget());
-
+    ASSERT(platformPluginWidget() == platformWidget());
     Widget::show();
 }
 
 void PluginView::hide()
 {
-    setSelfVisible(false);
-
-    if (isParentVisible() && platformPluginWidget())
-        gtk_widget_hide(platformPluginWidget());
-
+    ASSERT(platformPluginWidget() == platformWidget());
     Widget::hide();
 }
 

-- 
WebKit Debian packaging