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

Side by Side Diff: Source/core/rendering/RenderInline.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/RenderFlowThread.cpp ('k') | Source/core/rendering/RenderView.h » ('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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 } 1054 }
1055 1055
1056 void RenderInline::computeRectForRepaint(const RenderLayerModelObject* repaintCo ntainer, LayoutRect& rect, bool fixed) const 1056 void RenderInline::computeRectForRepaint(const RenderLayerModelObject* repaintCo ntainer, LayoutRect& rect, bool fixed) const
1057 { 1057 {
1058 if (RenderView* v = view()) { 1058 if (RenderView* v = view()) {
1059 // LayoutState is only valid for root-relative repainting 1059 // LayoutState is only valid for root-relative repainting
1060 if (v->layoutStateEnabled() && !repaintContainer) { 1060 if (v->layoutStateEnabled() && !repaintContainer) {
1061 LayoutState* layoutState = v->layoutState(); 1061 LayoutState* layoutState = v->layoutState();
1062 if (style()->hasInFlowPosition() && layer()) 1062 if (style()->hasInFlowPosition() && layer())
1063 rect.move(layer()->offsetForInFlowPosition()); 1063 rect.move(layer()->offsetForInFlowPosition());
1064 rect.move(layoutState->m_paintOffset); 1064 rect.move(layoutState->paintOffset());
1065 if (layoutState->m_clipped) 1065 if (layoutState->isClipped())
1066 rect.intersect(layoutState->m_clipRect); 1066 rect.intersect(layoutState->clipRect());
1067 return; 1067 return;
1068 } 1068 }
1069 } 1069 }
1070 1070
1071 if (repaintContainer == this) 1071 if (repaintContainer == this)
1072 return; 1072 return;
1073 1073
1074 bool containerSkipped; 1074 bool containerSkipped;
1075 RenderObject* o = container(repaintContainer, &containerSkipped); 1075 RenderObject* o = container(repaintContainer, &containerSkipped);
1076 if (!o) 1076 if (!o)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 } 1139 }
1140 1140
1141 void RenderInline::mapLocalToContainer(const RenderLayerModelObject* repaintCont ainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) const 1141 void RenderInline::mapLocalToContainer(const RenderLayerModelObject* repaintCont ainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed) const
1142 { 1142 {
1143 if (repaintContainer == this) 1143 if (repaintContainer == this)
1144 return; 1144 return;
1145 1145
1146 if (RenderView *v = view()) { 1146 if (RenderView *v = view()) {
1147 if (v->layoutStateEnabled() && !repaintContainer) { 1147 if (v->layoutStateEnabled() && !repaintContainer) {
1148 LayoutState* layoutState = v->layoutState(); 1148 LayoutState* layoutState = v->layoutState();
1149 LayoutSize offset = layoutState->m_paintOffset; 1149 LayoutSize offset = layoutState->paintOffset();
1150 if (style()->hasInFlowPosition() && layer()) 1150 if (style()->hasInFlowPosition() && layer())
1151 offset += layer()->offsetForInFlowPosition(); 1151 offset += layer()->offsetForInFlowPosition();
1152 transformState.move(offset); 1152 transformState.move(offset);
1153 return; 1153 return;
1154 } 1154 }
1155 } 1155 }
1156 1156
1157 bool containerSkipped; 1157 bool containerSkipped;
1158 RenderObject* o = container(repaintContainer, &containerSkipped); 1158 RenderObject* o = container(repaintContainer, &containerSkipped);
1159 if (!o) 1159 if (!o)
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
1572 container = this; 1572 container = this;
1573 1573
1574 FloatPoint absPos = container->localToAbsolute(); 1574 FloatPoint absPos = container->localToAbsolute();
1575 region.bounds.setX(absPos.x() + region.bounds.x()); 1575 region.bounds.setX(absPos.x() + region.bounds.x());
1576 region.bounds.setY(absPos.y() + region.bounds.y()); 1576 region.bounds.setY(absPos.y() + region.bounds.y());
1577 1577
1578 regions.append(region); 1578 regions.append(region);
1579 } 1579 }
1580 1580
1581 } // namespace WebCore 1581 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFlowThread.cpp ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698