Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1430)

Unified Diff: Source/core/rendering/RenderInline.cpp

Issue 17327003: Move pushMappingToContainer to RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderInline.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderInline.cpp
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp
index 96c9ee5dd78e00518af44d4986ad1e10e756d648..af8708a7cbb3d444ce9d6e73114f4b80f86f529f 100644
--- a/Source/core/rendering/RenderInline.cpp
+++ b/Source/core/rendering/RenderInline.cpp
@@ -1199,39 +1199,6 @@ void RenderInline::mapLocalToContainer(const RenderLayerModelObject* repaintCont
o->mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
}
-const RenderObject* RenderInline::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
-{
- ASSERT(ancestorToStopAt != this);
-
- bool ancestorSkipped;
- RenderObject* container = this->container(ancestorToStopAt, &ancestorSkipped);
- if (!container)
- return 0;
-
- LayoutSize adjustmentForSkippedAncestor;
- if (ancestorSkipped) {
- // There can't be a transform between repaintContainer and o, because transforms create containers, so it should be safe
- // to just subtract the delta between the ancestor and o.
- adjustmentForSkippedAncestor = -ancestorToStopAt->offsetFromAncestorContainer(container);
- }
-
- bool offsetDependsOnPoint = false;
- LayoutSize containerOffset = offsetFromContainer(container, LayoutPoint(), &offsetDependsOnPoint);
-
- bool preserve3D = container->style()->preserves3D() || style()->preserves3D();
- if (shouldUseTransformFromContainer(container)) {
- TransformationMatrix t;
- getTransformFromContainer(container, containerOffset, t);
- t.translateRight(adjustmentForSkippedAncestor.width(), adjustmentForSkippedAncestor.height()); // FIXME: right?
- geometryMap.push(this, t, preserve3D, offsetDependsOnPoint);
- } else {
- containerOffset += adjustmentForSkippedAncestor;
- geometryMap.push(this, containerOffset, preserve3D, offsetDependsOnPoint);
- }
-
- return ancestorSkipped ? ancestorToStopAt : container;
-}
-
void RenderInline::updateDragState(bool dragOn)
{
RenderBoxModelObject::updateDragState(dragOn);
« no previous file with comments | « Source/core/rendering/RenderInline.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698