From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 24 May 2011 11:24:40 +0100 Subject: Merge WebKit at r80534: Intial merge by Git Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61 --- Source/WebCore/rendering/RenderLayerBacking.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp') diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index d0a36c7..bda34ee 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -36,7 +36,6 @@ #include "CSSStyleSelector.h" #include "FrameView.h" #include "GraphicsContext.h" -#include "GraphicsContext3D.h" #include "GraphicsLayer.h" #include "HTMLCanvasElement.h" #include "HTMLElement.h" @@ -55,7 +54,10 @@ #include "RenderVideo.h" #include "RenderView.h" #include "Settings.h" -#include "WebGLRenderingContext.h" + +#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) +#include "GraphicsContext3D.h" +#endif using namespace std; -- cgit v1.1