[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[philn at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 5fcef5bbcdc3e039d0f9711f5c36f1ad46f9184d
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 09:27:30 2011 +0000

    2011-01-11  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] minimal build breaks in RenderThemeGtk3
            https://bugs.webkit.org/show_bug.cgi?id=52202
    
            * platform/gtk/RenderThemeGtk3.cpp: Added VIDEO guards around
            initMediaColors().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d33e9e1..4a9f06b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-11  Philippe Normand  <pnormand at igalia.com>
 
+        Reviewed by Eric Seidel.
+
+        [GTK] minimal build breaks in RenderThemeGtk3
+        https://bugs.webkit.org/show_bug.cgi?id=52202
+
+        * platform/gtk/RenderThemeGtk3.cpp: Added VIDEO guards around
+        initMediaColors().
+
+2011-01-11  Philippe Normand  <pnormand at igalia.com>
+
         Reviewed by Eric Carlson.
 
         [GStreamer] PlatformVideoWindowMac implementation
diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
index 1b2cb38..ee2a37f 100644
--- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
+++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
@@ -108,6 +108,7 @@ RenderThemeGtk::~RenderThemeGtk()
 {
 }
 
+#if ENABLE(VIDEO)
 void RenderThemeGtk::initMediaColors()
 {
     GdkRGBA color;
@@ -120,6 +121,7 @@ void RenderThemeGtk::initMediaColors()
     gtk_style_context_get_background_color(containerContext, GTK_STATE_FLAG_SELECTED, &color);
     m_sliderThumbColor = color;
 }
+#endif
 
 static void adjustRectForFocus(GtkStyleContext* context, IntRect& rect)
 {

-- 
WebKit Debian packaging