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

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f382a75431f3ece160ffdbdbda5b285f21dc82e1
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 18:54:30 2010 +0000

    2010-12-09  Antonio Gomes  <agomes at rim.com>
    
            Rubber stamped by Gustavo Noronha.
    
            Buildfix for GTK+ with building with -no-video.
    
            paintStockIcon static function was implemented under the ENABLE(VIDEO) guard
            but used from outside the guard. See RenderThemeGtk::paintSearchFieldResultsDecoration()
            and RenderThemeGtk::paintSearchFieldCancelButton() methods.
    
            * platform/gtk/RenderThemeGtk.cpp:
            (WebCore::getMediaElementFromRenderObject):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73629 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c58544c..b75849a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-09  Antonio Gomes  <agomes at rim.com>
+
+        Rubber stamped by by Gustavo Noronha Silva.
+
+        Buildfix for GTK+ with building with -no-video.
+
+        paintStockIcon static function was implemented under the ENABLE(VIDEO) guard
+        but used from outside the guard. See RenderThemeGtk::paintSearchFieldResultsDecoration()
+        and RenderThemeGtk::paintSearchFieldCancelButton() methods.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::getMediaElementFromRenderObject):
+
 2010-12-07  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Daniel Bates.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index 75bfd5b..4db857d 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -55,17 +55,6 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-#if ENABLE(VIDEO)
-static HTMLMediaElement* getMediaElementFromRenderObject(RenderObject* o)
-{
-    Node* node = o->node();
-    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
-    if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
-        return 0;
-
-    return static_cast<HTMLMediaElement*>(mediaNode);
-}
-
 static void paintStockIcon(GraphicsContext* context, const IntPoint& iconPoint, GtkStyle* style, const char* iconName,
                            GtkTextDirection direction, GtkStateType state, GtkIconSize iconSize)
 {
@@ -79,6 +68,17 @@ static void paintStockIcon(GraphicsContext* context, const IntPoint& iconPoint,
     cairo_restore(cr);
 }
 
+#if ENABLE(VIDEO)
+static HTMLMediaElement* getMediaElementFromRenderObject(RenderObject* o)
+{
+    Node* node = o->node();
+    Node* mediaNode = node ? node->shadowAncestorNode() : 0;
+    if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
+        return 0;
+
+    return static_cast<HTMLMediaElement*>(mediaNode);
+}
+
 static GtkIconSize getMediaButtonIconSize(int mediaIconSize)
 {
     GtkIconSize iconSize = gtk_icon_size_from_name("webkit-media-button-size");

-- 
WebKit Debian packaging