Merge webkit.org at r54127 : Update RenderLayerCompositor.cpp to account for syntax...

See http://trac.webkit.org/changeset/53110

Change-Id: Ib82ce428fc761a2791a7ce1fc0de486b6903a43a

diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 2730114..dc9b94d 100644 (file)
--- 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);
 }