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

Side by Side Diff: sky/engine/core/rendering/RenderBoxModelObject.cpp

Issue 691223003: Remove some more assorted code from RenderBox. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderInline.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 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 referencePoint.move(-toRenderBox(offsetParent)->borderLeft(), -toRen derBox(offsetParent)->borderTop()); 274 referencePoint.move(-toRenderBox(offsetParent)->borderLeft(), -toRen derBox(offsetParent)->borderTop());
275 if (!isOutOfFlowPositioned()) { 275 if (!isOutOfFlowPositioned()) {
276 if (isRelPositioned()) 276 if (isRelPositioned())
277 referencePoint.move(relativePositionOffset()); 277 referencePoint.move(relativePositionOffset());
278 278
279 RenderObject* current; 279 RenderObject* current;
280 for (current = parent(); current != offsetParent && current->parent( ); current = current->parent()) { 280 for (current = parent(); current != offsetParent && current->parent( ); current = current->parent()) {
281 // FIXME: What are we supposed to do inside SVG content? 281 // FIXME: What are we supposed to do inside SVG content?
282 if (!isOutOfFlowPositioned()) { 282 if (!isOutOfFlowPositioned()) {
283 if (current->isBox()) 283 if (current->isBox())
284 referencePoint.moveBy(toRenderBox(current)->topLeftLocat ion()); 284 referencePoint.moveBy(toRenderBox(current)->location());
285 } 285 }
286 } 286 }
287 } 287 }
288 } 288 }
289 289
290 return referencePoint; 290 return referencePoint;
291 } 291 }
292 292
293 LayoutSize RenderBoxModelObject::offsetForInFlowPosition() const 293 LayoutSize RenderBoxModelObject::offsetForInFlowPosition() const
294 { 294 {
(...skipping 2308 matching lines...) Expand 10 before | Expand all | Expand 10 after
2603 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2603 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2604 for (RenderObject* child = startChild; child && child != endChild; ) { 2604 for (RenderObject* child = startChild; child && child != endChild; ) {
2605 // Save our next sibling as moveChildTo will clear it. 2605 // Save our next sibling as moveChildTo will clear it.
2606 RenderObject* nextSibling = child->nextSibling(); 2606 RenderObject* nextSibling = child->nextSibling();
2607 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2607 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2608 child = nextSibling; 2608 child = nextSibling;
2609 } 2609 }
2610 } 2610 }
2611 2611
2612 } // namespace blink 2612 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderInline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698