diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:24:37 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:58 +0000 |
| commit | d8fde132eda313d695830dde5754c80074e2f0d4 (patch) | |
| tree | eac3f66056383cb7ea920e1a84e214d8869ed5ca /WebCore/rendering/RenderLayerCompositor.cpp | |
| parent | 8c1e946b47db286076da27bd0bb86fbdf8cf26ba (diff) | |
| download | external_webkit-d8fde132eda313d695830dde5754c80074e2f0d4.zip external_webkit-d8fde132eda313d695830dde5754c80074e2f0d4.tar.gz external_webkit-d8fde132eda313d695830dde5754c80074e2f0d4.tar.bz2 | |
Merge webkit.org at r54127 : Update RenderLayerCompositor.cpp to account for syntax change.
See http://trac.webkit.org/changeset/53110
Change-Id: Ib82ce428fc761a2791a7ce1fc0de486b6903a43a
Diffstat (limited to 'WebCore/rendering/RenderLayerCompositor.cpp')
| -rw-r--r-- | WebCore/rendering/RenderLayerCompositor.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp index 2730114..dc9b94d 100644 --- a/WebCore/rendering/RenderLayerCompositor.cpp +++ b/WebCore/rendering/RenderLayerCompositor.cpp @@ -943,22 +943,14 @@ bool RenderLayerCompositor::requiresCompositingLayer(const RenderLayer* layer) c } // The root layer always has a compositing layer, but it may not have backing. return (inCompositingMode() && layer->isRootLayer()) || -<<<<<<< HEAD - requiresCompositingForTransform(layer->renderer()) || - requiresCompositingForVideo(layer->renderer()) || - requiresCompositingForCanvas(layer->renderer()) || - layer->renderer()->style()->backfaceVisibility() == BackfaceVisibilityHidden || -#if PLATFORM(ANDROID) - (layer->renderer()->isPositioned() && - layer->renderer()->style()->position() == FixedPosition) || -#endif -======= requiresCompositingForTransform(renderer) || requiresCompositingForVideo(renderer) || requiresCompositingForCanvas(renderer) || requiresCompositingForPlugin(renderer) || renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden || ->>>>>>> webkit.org at r54127 +#if PLATFORM(ANDROID) + (renderer->isPositioned() && renderer->style()->position() == FixedPosition) || +#endif clipsCompositingDescendants(layer) || requiresCompositingForAnimation(renderer); } |