- Revision
- 91436
- Author
- [email protected]
- Date
- 2011-07-20 18:42:51 -0700 (Wed, 20 Jul 2011)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (91435 => 91436)
--- trunk/Source/WebCore/ChangeLog 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/ChangeLog 2011-07-21 01:42:51 UTC (rev 91436)
@@ -1,3 +1,28 @@
+2011-07-20 Levi Weintraub <[email protected]>
+
+ 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 <[email protected]>
Scrollbar color heuristic needs to be hooked up in WebKit1
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-21 01:42:51 UTC (rev 91436)
@@ -1209,7 +1209,7 @@
if (RenderView* v = view()) {
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())
offset += layer()->relativePositionOffset();
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-07-21 01:42:51 UTC (rev 91436)
@@ -1117,7 +1117,7 @@
if (RenderView *v = view()) {
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();
transformState.move(offset);
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2011-07-21 01:42:51 UTC (rev 91436)
@@ -2931,7 +2931,7 @@
RenderObject* containerRenderer = containerLayer ? containerLayer->renderer() : 0;
if (renderer()->shouldUseTransformFromContainer(containerRenderer)) {
TransformationMatrix containerTransform;
- renderer()->getTransformFromContainer(containerRenderer, toSize(offset), containerTransform);
+ renderer()->getTransformFromContainer(containerRenderer, toLayoutSize(offset), containerTransform);
transformState->applyTransform(containerTransform, HitTestingTransformState::AccumulateTransform);
} else {
transformState->translate(offset.x(), offset.y(), HitTestingTransformState::AccumulateTransform);
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-07-21 01:42:51 UTC (rev 91436)
@@ -1887,7 +1887,7 @@
#endif
}
-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();
transform.translate(offsetInContainer.width(), offsetInContainer.height());
Modified: trunk/Source/WebCore/rendering/RenderObject.h (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-07-21 01:42:51 UTC (rev 91436)
@@ -775,7 +775,7 @@
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
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&) { };
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (91435 => 91436)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2011-07-21 01:32:17 UTC (rev 91435)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2011-07-21 01:42:51 UTC (rev 91436)
@@ -144,7 +144,7 @@
if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
- getTransformFromContainer(0, IntSize(), t);
+ getTransformFromContainer(0, LayoutSize(), t);
transformState.applyTransform(t);
}
@@ -159,7 +159,7 @@
if (useTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
- getTransformFromContainer(0, IntSize(), t);
+ getTransformFromContainer(0, LayoutSize(), t);
transformState.applyTransform(t);
}
}
