Changeset 91436 in webkit

Timestamp:

Jul 20, 2011 6:42:51 PM (13 years ago)

Author:

leviw@chromium.org

Message:

Switch getTransformFromContainer and its uses to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=64908

Reviewed by Simon Fraser.

Switching getTransformFromContainer and its uses to use the new Layout
Types from strictly integer ones.

No new tests, no new functionality.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::mapLocalToContainer):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::mapLocalToContainer):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::createLocalTransformState):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::getTransformFromContainer):

• rendering/RenderObject.h:
• rendering/RenderView.cpp:

(WebCore::RenderView::mapLocalToContainer):
(WebCore::RenderView::mapAbsoluteToLocalPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-20  Levi Weintraub  <leviw@chromium.org>
+
+        Switch getTransformFromContainer and its uses to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=64908
+
+        Reviewed by Simon Fraser.
+
+        Switching getTransformFromContainer and its uses to use the new Layout
+        Types from strictly integer ones.
+
+        No new tests, no new functionality.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::mapLocalToContainer):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::mapLocalToContainer):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::createLocalTransformState):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::getTransformFromContainer):
+        * rendering/RenderObject.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::mapLocalToContainer):
+        (WebCore::RenderView::mapAbsoluteToLocalPoint):
+
 2011-07-20  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1210 +1210 @@
         if (v->layoutStateEnabled() && !repaintContainer) {
             LayoutState* layoutState = v->layoutState();
-            IntSize offset = layoutState->m_paintOffset;
+            LayoutSize offset = layoutState->m_paintOffset;
             offset.expand(x(), y());
             if (style()->position() == RelativePosition && layer())

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1118 +1118 @@
         if (v->layoutStateEnabled() && !repaintContainer) {
             LayoutState* layoutState = v->layoutState();
-            IntSize offset = layoutState->m_paintOffset;
+            LayoutSize offset = layoutState->m_paintOffset;
             if (style()->position() == RelativePosition && layer())
                 offset += layer()->relativePositionOffset();

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2932 +2932 @@
     if (renderer()->shouldUseTransformFromContainer(containerRenderer)) {
         TransformationMatrix containerTransform;
-        renderer()->getTransformFromContainer(containerRenderer, toSize(offset), containerTransform);
+        renderer()->getTransformFromContainer(containerRenderer, toLayoutSize(offset), containerTransform);
         transformState->applyTransform(containerTransform, HitTestingTransformState::AccumulateTransform);
     } else {

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1888 +1888 @@
 }
 
-void RenderObject::getTransformFromContainer(const RenderObject* containerObject, const IntSize& offsetInContainer, TransformationMatrix& transform) const
+void RenderObject::getTransformFromContainer(const RenderObject* containerObject, const LayoutSize& offsetInContainer, TransformationMatrix& transform) const
 {
     transform.makeIdentity();

trunk/Source/WebCore/rendering/RenderObject.h

@@ -776 +776 @@
 
     bool shouldUseTransformFromContainer(const RenderObject* container) const;
-    void getTransformFromContainer(const RenderObject* container, const IntSize& offsetInContainer, TransformationMatrix&) const;
+    void getTransformFromContainer(const RenderObject* container, const LayoutSize& offsetInContainer, TransformationMatrix&) const;
     
     virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint&) { };

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -145 +145 @@
     if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {
         TransformationMatrix t;
-        getTransformFromContainer(0, IntSize(), t);
+        getTransformFromContainer(0, LayoutSize(), t);
         transformState.applyTransform(t);
     }
@@ -160 +160 @@
     if (useTransforms && shouldUseTransformFromContainer(0)) {
         TransformationMatrix t;
-        getTransformFromContainer(0, IntSize(), t);
+        getTransformFromContainer(0, LayoutSize(), t);
         transformState.applyTransform(t);
     }