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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d274dbab47d27fe2a8fed88e073d83ff6b83af96
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 8 01:20:12 2011 +0000

    2011-01-07  Martin Robinson  <mrobinson at igalia.com>
    
            Build fix for GTK+.
    
            * GNUmakefile.am: Add RenderFullScreen.cpp to the sources list.
            * rendering/RenderFullScreen.cpp:
            (RenderFullScreen::setAnimating): Guard the call to contentChanged
            with ENABLED(ACCELERATED_COMPOSITING).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1c76235..30d219d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-07  Martin Robinson  <mrobinson at igalia.com>
+
+        Build fix for GTK+.
+
+        * GNUmakefile.am: Add RenderFullScreen.cpp to the sources list.
+        * rendering/RenderFullScreen.cpp:
+        (RenderFullScreen::setAnimating): Guard the call to contentChanged
+        with ENABLED(ACCELERATED_COMPOSITING).
+
 2011-01-07  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed; speculative fix for Windows debug build.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 0df0b68..0673eb1 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2750,6 +2750,8 @@ webcore_sources += \
 	WebCore/rendering/RenderFrame.h \
 	WebCore/rendering/RenderFrameSet.cpp \
 	WebCore/rendering/RenderFrameSet.h \
+	WebCore/rendering/RenderFullScreen.cpp \
+	WebCore/rendering/RenderFullScreen.h \
 	WebCore/rendering/RenderHTMLCanvas.cpp \
 	WebCore/rendering/RenderHTMLCanvas.h \
 	WebCore/rendering/RenderIFrame.cpp \
diff --git a/WebCore/rendering/RenderFullScreen.cpp b/WebCore/rendering/RenderFullScreen.cpp
index f1c9efa..7cd452f 100644
--- a/WebCore/rendering/RenderFullScreen.cpp
+++ b/WebCore/rendering/RenderFullScreen.cpp
@@ -35,8 +35,10 @@ using namespace WebCore;
 void RenderFullScreen::setAnimating(bool animating)
 {
     m_isAnimating = animating;
+#if ENABLE(ACCELERATED_COMPOSITING)
     if (layer())
         layer()->contentChanged(RenderLayer::FullScreenChanged);
+#endif
 }
 
 PassRefPtr<RenderStyle> RenderFullScreen::createFullScreenStyle()

-- 
WebKit Debian packaging