[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 095be28211b3d81b66aea91dbd64b710ef915a67
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 15:50:55 2011 +0000

    2011-01-03  Antonio Gomes  <agomes at rim.com>
    
            Unreviewed build fix for WebKit/Gtk+.
    
            RenderThemeGtk::initMediaColors() in RenderThemeGtk2.cpp needs to be
            guarded by ENABLE(VIDEO), as it is in its header.
    
            No new tests.
    
            * platform/gtk/RenderThemeGtk2.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74890 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e1ed58..7ad58c1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-03  Antonio Gomes  <agomes at rim.com>
+
+        Unreviewed build fix for WebKit/Gtk+.
+
+        RenderThemeGtk::initMediaColors() in RenderThemeGtk2.cpp needs to be
+        guarded by ENABLE(VIDEO), as it is in its header.
+
+        No new tests.
+
+        * platform/gtk/RenderThemeGtk2.cpp:
+
 2011-01-02  Dan Bernstein  <mitz at apple.com>
 
         Rubber-stamped by Simon Fraser.
diff --git a/WebCore/platform/gtk/RenderThemeGtk2.cpp b/WebCore/platform/gtk/RenderThemeGtk2.cpp
index b3943ae..576ec41 100644
--- a/WebCore/platform/gtk/RenderThemeGtk2.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk2.cpp
@@ -49,6 +49,7 @@ namespace WebCore {
 // This is not a static method, because we want to avoid having GTK+ headers in RenderThemeGtk.h.
 extern GtkTextDirection gtkTextDirection(TextDirection);
 
+#if ENABLE(VIDEO)
 void RenderThemeGtk::initMediaColors()
 {
     GtkStyle* style = gtk_widget_get_style(GTK_WIDGET(gtkContainer()));
@@ -56,6 +57,7 @@ void RenderThemeGtk::initMediaColors()
     m_sliderColor = style->bg[GTK_STATE_ACTIVE];
     m_sliderThumbColor = style->bg[GTK_STATE_SELECTED];
 }
+#endif
 
 GtkStateType RenderThemeGtk::getGtkStateType(RenderObject* object)
 {

-- 
WebKit Debian packaging