Bug 35380 – [Qt] Compilation fails when WTF_USE_ACCELERATED_COMPOSITING=0

• Status: RESOLVED
• Resolution: FIXED
• Component: CSS

[Jarkko Sakkinen]

WebKit trunk compilation failes when WTF_USE_ACCELERATED_COMPOSITING is set to zero.

I resolved this issue by doing the following change:

###########################################################################################################
diff --git a/WebCore/css/MediaQueryEvaluator.cpp b/WebCore/css/MediaQueryEvaluator.cpp
index 4963ed4..6864231 100644
--- a/WebCore/css/MediaQueryEvaluator.cpp
+++ b/WebCore/css/MediaQueryEvaluator.cpp
@@ -47,7 +47,7 @@
 #include "PlatformScreen.h"
 #include <wtf/HashMap.h>
 
-#if ENABLE(3D_RENDERING)
+#if ENABLE(3D_RENDERING) && USE(ACCELERATED_COMPOSITING)
 #include "RenderLayerCompositor.h"
 #endif
 
@@ -472,10 +472,12 @@ static bool transform_3dMediaFeatureEval(CSSValue* value, RenderStyle*, Frame* f
     bool returnValueIfNoParameter;
     int have3dRendering;
 
-#if ENABLE(3D_RENDERING)
+#if ENABLE(3D_RENDERING) 
     bool threeDEnabled = false;
+#if USE(ACCELERATED_COMPOSITING)
     if (RenderView* view = frame->contentRenderer())
         threeDEnabled = view->compositor()->hasAcceleratedCompositing();
+#endif
 
     returnValueIfNoParameter = threeDEnabled;
     have3dRendering = threeDEnabled ? 1 : 0;
###########################################################################################################

[Jarkko Sakkinen]

Created attachment 49478 [details]
Fix suggestion

Quickly done fix for the issue.

[Kenneth Rohde Christiansen]

Comment on attachment 49478 [details]
Fix suggestion

Looks OK to me, but needs a ChangeLog

[Jarkko Sakkinen]

Created attachment 49480 [details]
Compilation fix to MediaQuerySelector.cpp when WTF_USE_ACCELERATED_COMPOSITING=0

[Jarkko Sakkinen]

Created attachment 49574 [details]
Same fix, added missing bug URL.

[WebKit Commit Bot]

Comment on attachment 49574 [details]
Same fix, added missing bug URL.

Clearing flags on attachment: 49574

Committed r55303: <http://trac.webkit.org/changeset/55303>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.