Move transforms from RenderLayer to RenderBox.

sky/engine/core/rendering/RenderBox.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 15 matching lines @@
 #include "sky/engine/core/rendering/FilterEffectRenderer.h"
 #include "sky/engine/core/rendering/RenderBoxModelObject.h"
 #include "sky/engine/core/rendering/RenderOverflow.h"
 
 namespace blink {
 
 struct LayerPaintingInfo;
 struct PaintInfo;
 class HitTestingTransformState;
 class RenderBlockFlow;
+class TransformationMatrix;
 
 enum SizeType { MainOrPreferredSize, MinSize, MaxSize };
 enum AvailableLogicalHeightType { ExcludeMarginBorderPadding, IncludeMarginBorderPadding };
 enum MarginDirection { BlockDirection, InlineDirection };
 
 enum ShouldComputePreferred { ComputeActual, ComputePreferred };
 
 enum ContentsClipBehavior { ForceContentsClip, SkipContentsClipIfPossible };
 
 struct RenderBoxRareData {
@@ skipping 164 matching lines @@
 
     void addVisualEffectOverflow();
     LayoutBoxExtent computeVisualEffectOverflowExtent() const;
     void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, child->locationOffset()); }
     void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
     void clearLayoutOverflow();
     void clearAllOverflows() { m_overflow.clear(); }
 
     void updateLayerTransformAfterLayout();
 
+    // This transform has the transform-origin baked in.
+    TransformationMatrix* transform() const { return m_transform.get(); }
+    bool has3DTransform() const { return m_transform && !m_transform->isAffine(); }
+
     LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); }
     LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); }
     LayoutUnit contentLogicalWidth() const { return contentWidth(); }
     LayoutUnit contentLogicalHeight() const { return contentHeight(); }
 
     // IE extensions. Used to calculate offsetWidth/Height.  Overridden by inlines (RenderFlow)
     // to return the remaining width on a given line (and the height of a single line).
     virtual LayoutUnit offsetWidth() const override { return width(); }
     virtual LayoutUnit offsetHeight() const override { return height(); }
 
@@ skipping 248 matching lines @@
 
     virtual void mapLocalToContainer(const RenderBox* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const override;
 
     void paintRootBoxFillLayers(const PaintInfo&);
 
     RenderObject* splitAnonymousBoxesAroundChild(RenderObject* beforeChild);
 
     void updateIntrinsicContentLogicalHeight(LayoutUnit intrinsicContentLogicalHeight) const { m_intrinsicContentLogicalHeight = intrinsicContentLogicalHeight; }
 
 private:
+    void updateTransformationMatrix();
+    void updateTransform(const RenderStyle* oldStyle);
     void updateFromStyle();
     void updateFilters();
 
     PassRefPtr<HitTestingTransformState> createLocalTransformState(
         RenderLayer* rootLayer, RenderLayer* containerLayer,
         const LayoutRect& hitTestRect, const HitTestLocation& hitTestLocation,
         const HitTestingTransformState* containerTransformState) const;
     bool hitTestNonLayerDescendants(const HitTestRequest& request, HitTestResult& result,
         const LayoutRect& layerBounds, const HitTestLocation& hitTestLocation);
 
@@ skipping 52 matching lines @@
 
     // The preferred logical width of the element if it were to break its lines at every possible opportunity.
     LayoutUnit m_minPreferredLogicalWidth;
 
     // The preferred logical width of the element if it never breaks any lines at all.
     LayoutUnit m_maxPreferredLogicalWidth;
 
     // Our overflow information.
     OwnPtr<RenderOverflow> m_overflow;
 
+    // TODO(ojan): Move these two into RenderBoxRareData.
     OwnPtr<FilterEffectRenderer> m_filterRenderer;
+    OwnPtr<TransformationMatrix> m_transform;
 
 private:
     OwnPtr<RenderLayer> m_layer;
     OwnPtr<RenderBoxRareData> m_rareData;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderBox, isBox());
 
 inline RenderBox* RenderBox::previousSiblingBox() const
 {
@@ skipping 31 matching lines @@
         if (UNLIKELY(inlineBoxWrapper() != 0))
             deleteLineBoxWrapper();
     }
 
     ensureRareData().m_inlineBoxWrapper = boxWrapper;
 }
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_RENDERING_RENDERBOX_H_