diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/rendering/RenderLayerBacking.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index 8001c42..d0a36c7 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -70,7 +70,7 @@ static IntRect clipBox(RenderBox* renderer); static inline bool isAcceleratedCanvas(RenderObject* renderer) { -#if ENABLE(3D_CANVAS) || ENABLE(ACCELERATED_2D_CANVAS) +#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) if (renderer->isCanvas()) { HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(renderer->node()); if (CanvasRenderingContext* context = canvas->renderingContext()) @@ -287,7 +287,7 @@ bool RenderLayerBacking::updateGraphicsLayerConfiguration() m_graphicsLayer->setContentsToMedia(mediaElement->platformLayer()); } #endif -#if ENABLE(3D_CANVAS) || ENABLE(ACCELERATED_2D_CANVAS) +#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) else if (isAcceleratedCanvas(renderer)) { HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(renderer->node()); if (CanvasRenderingContext* context = canvas->renderingContext()) @@ -803,7 +803,7 @@ bool RenderLayerBacking::containsPaintedContent() const return hasBoxDecorationsOrBackground(renderer()); #endif #if PLATFORM(MAC) && PLATFORM(CA) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) -#elif ENABLE(3D_CANVAS) || ENABLE(ACCELERATED_2D_CANVAS) +#elif ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) if (isAcceleratedCanvas(renderer())) return hasBoxDecorationsOrBackground(renderer()); #endif @@ -843,7 +843,7 @@ void RenderLayerBacking::contentChanged(RenderLayer::ContentChangeType changeTyp updateAfterLayout(CompositingChildren, isUpdateRoot); } -#if ENABLE(3D_CANVAS) || ENABLE(ACCELERATED_2D_CANVAS) +#if ENABLE(WEBGL) || ENABLE(ACCELERATED_2D_CANVAS) if ((changeType == RenderLayer::CanvasChanged) && isAcceleratedCanvas(renderer())) { m_graphicsLayer->setContentsNeedsDisplay(); return; |