Part 1 of merges for Chromium bug #64589...

WebCore/rendering/RenderLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 231 matching lines @@
 
 bool RenderLayer::hasAcceleratedCompositing() const
 {
 #if USE(ACCELERATED_COMPOSITING)
     return compositor()->hasAcceleratedCompositing();
 #else
     return false;
 #endif
 }
 
+bool RenderLayer::canRender3DTransforms() const
+{
+#if USE(ACCELERATED_COMPOSITING)
+    return compositor()->canRender3DTransforms();
+#else
+    return false;
+#endif
+}
+
 void RenderLayer::updateLayerPositions(UpdateLayerPositionsFlags flags, IntPoint* cachedOffset)
 {
     if (flags & DoFullRepaint) {
         renderer()->repaint();
 #if USE(ACCELERATED_COMPOSITING)
         flags &= ~CheckForRepaint;
         // We need the full repaint to propagate to child layers if we are hardware compositing.
         if (!compositor()->inCompositingMode())
             flags &= ~DoFullRepaint;
 #else
@@ skipping 160 matching lines @@
             m_transform.set(new TransformationMatrix);
         else
             m_transform.clear();
     }
     
     if (hasTransform) {
         RenderBox* box = renderBox();
         ASSERT(box);
         m_transform->makeIdentity();
         box->style()->applyTransform(*m_transform, box->borderBoxRect().size(), RenderStyle::IncludeTransformOrigin);
-        makeMatrixRenderable(*m_transform, hasAcceleratedCompositing());
+        makeMatrixRenderable(*m_transform, canRender3DTransforms());
     }
 
     if (had3DTransform != has3DTransform())
         dirty3DTransformedDescendantStatus();
 }
 
 TransformationMatrix RenderLayer::currentTransform() const
 {
     if (!m_transform)
         return TransformationMatrix();
 
 #if USE(ACCELERATED_COMPOSITING)
     if (renderer()->style()->isRunningAcceleratedAnimation()) {
         TransformationMatrix currTransform;
         RefPtr<RenderStyle> style = renderer()->animation()->getAnimatedStyleForRenderer(renderer());
         style->applyTransform(currTransform, renderBox()->borderBoxRect().size(), RenderStyle::IncludeTransformOrigin);
-        makeMatrixRenderable(currTransform, hasAcceleratedCompositing());
+        makeMatrixRenderable(currTransform, canRender3DTransforms());
         return currTransform;
     }
 #endif
 
     return *m_transform;
 }
 
 TransformationMatrix RenderLayer::renderableTransform(PaintBehavior paintBehavior) const
 {
     if (!m_transform)
@@ skipping 3469 matching lines @@
     }
 }
 
 void showLayerTree(const WebCore::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif