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

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 207223003: Make LayoutState members private (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixing debug build issues Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 1800 matching lines...) Expand 10 before | Expand all | Expand 10 after
1811 } 1811 }
1812 1812
1813 void RenderBox::mapLocalToContainer(const RenderLayerModelObject* repaintContain er, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) co nst 1813 void RenderBox::mapLocalToContainer(const RenderLayerModelObject* repaintContain er, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) co nst
1814 { 1814 {
1815 if (repaintContainer == this) 1815 if (repaintContainer == this)
1816 return; 1816 return;
1817 1817
1818 if (RenderView* v = view()) { 1818 if (RenderView* v = view()) {
1819 if (v->layoutStateEnabled() && !repaintContainer) { 1819 if (v->layoutStateEnabled() && !repaintContainer) {
1820 LayoutState* layoutState = v->layoutState(); 1820 LayoutState* layoutState = v->layoutState();
1821 LayoutSize offset = layoutState->m_paintOffset + locationOffset(); 1821 LayoutSize offset = layoutState->paintOffset() + locationOffset();
1822 if (style()->hasInFlowPosition() && layer()) 1822 if (style()->hasInFlowPosition() && layer())
1823 offset += layer()->offsetForInFlowPosition(); 1823 offset += layer()->offsetForInFlowPosition();
1824 transformState.move(offset); 1824 transformState.move(offset);
1825 return; 1825 return;
1826 } 1826 }
1827 } 1827 }
1828 1828
1829 bool containerSkipped; 1829 bool containerSkipped;
1830 RenderObject* o = container(repaintContainer, &containerSkipped); 1830 RenderObject* o = container(repaintContainer, &containerSkipped);
1831 if (!o) 1831 if (!o)
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
2016 LayoutState* layoutState = v->layoutState(); 2016 LayoutState* layoutState = v->layoutState();
2017 2017
2018 if (layer() && layer()->transform()) 2018 if (layer() && layer()->transform())
2019 rect = layer()->transform()->mapRect(pixelSnappedIntRect(rect)); 2019 rect = layer()->transform()->mapRect(pixelSnappedIntRect(rect));
2020 2020
2021 // We can't trust the bits on RenderObject, because this might be ca lled while re-resolving style. 2021 // We can't trust the bits on RenderObject, because this might be ca lled while re-resolving style.
2022 if (styleToUse->hasInFlowPosition() && layer()) 2022 if (styleToUse->hasInFlowPosition() && layer())
2023 rect.move(layer()->offsetForInFlowPosition()); 2023 rect.move(layer()->offsetForInFlowPosition());
2024 2024
2025 rect.moveBy(location()); 2025 rect.moveBy(location());
2026 rect.move(layoutState->m_paintOffset); 2026 rect.move(layoutState->paintOffset());
2027 if (layoutState->m_clipped) 2027 if (layoutState->isClipped())
2028 rect.intersect(layoutState->m_clipRect); 2028 rect.intersect(layoutState->clipRect());
2029 return; 2029 return;
2030 } 2030 }
2031 } 2031 }
2032 2032
2033 if (hasReflection()) 2033 if (hasReflection())
2034 rect.unite(reflectedRect(rect)); 2034 rect.unite(reflectedRect(rect));
2035 2035
2036 if (repaintContainer == this) { 2036 if (repaintContainer == this) {
2037 if (repaintContainer->style()->isFlippedBlocksWritingMode()) 2037 if (repaintContainer->style()->isFlippedBlocksWritingMode())
2038 flipForWritingMode(rect); 2038 flipForWritingMode(rect);
(...skipping 2651 matching lines...) Expand 10 before | Expand all | Expand 10 after
4690 return 0; 4690 return 0;
4691 4691
4692 if (!layoutState && !flowThreadContainingBlock()) 4692 if (!layoutState && !flowThreadContainingBlock())
4693 return 0; 4693 return 0;
4694 4694
4695 RenderBlock* containerBlock = containingBlock(); 4695 RenderBlock* containerBlock = containingBlock();
4696 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); 4696 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
4697 } 4697 }
4698 4698
4699 } // namespace WebCore 4699 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlockFlow.cpp ('k') | Source/core/rendering/RenderFlowThread.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698