2011-01-07 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Jan 2011 01:20:12 +0000 (01:20 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 8 Jan 2011 01:20:12 +0000 (01:20 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@75296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/rendering/RenderFullScreen.cpp

index 1c76235..30d219d 100644 (file)
@@ -1,3 +1,12 @@
+2011-01-07  Martin Robinson  <mrobinson@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@webkit.org>
 
         Unreviewed; speculative fix for Windows debug build.
index 0df0b68..0673eb1 100644 (file)
@@ -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 \
index f1c9efa..7cd452f 100644 (file)
@@ -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()