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

Side by Side Diff: sky/engine/core/rendering/RenderInline.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
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 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 generateCulledLineBoxRects(context, this); 920 generateCulledLineBoxRects(context, this);
921 LayoutRect result(enclosingLayoutRect(floatResult)); 921 LayoutRect result(enclosingLayoutRect(floatResult));
922 for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) { 922 for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) {
923 if (curr->isFloatingOrOutOfFlowPositioned()) 923 if (curr->isFloatingOrOutOfFlowPositioned())
924 continue; 924 continue;
925 925
926 // For overflow we just have to propagate by hand and recompute it all. 926 // For overflow we just have to propagate by hand and recompute it all.
927 if (curr->isBox()) { 927 if (curr->isBox()) {
928 RenderBox* currBox = toRenderBox(curr); 928 RenderBox* currBox = toRenderBox(curr);
929 if (!currBox->hasSelfPaintingLayer() && currBox->inlineBoxWrapper()) { 929 if (!currBox->hasSelfPaintingLayer() && currBox->inlineBoxWrapper()) {
930 LayoutRect logicalRect = currBox->logicalVisualOverflowRectForPr opagation(style()); 930 LayoutRect logicalRect = currBox->visualOverflowRect();
931 logicalRect.moveBy(currBox->location()); 931 logicalRect.moveBy(currBox->location());
932 result.uniteIfNonZero(logicalRect); 932 result.uniteIfNonZero(logicalRect);
933 } 933 }
934 } else if (curr->isRenderInline()) { 934 } else if (curr->isRenderInline()) {
935 // If the child doesn't need line boxes either, then we can recur. 935 // If the child doesn't need line boxes either, then we can recur.
936 RenderInline* currInline = toRenderInline(curr); 936 RenderInline* currInline = toRenderInline(curr);
937 if (!currInline->alwaysCreateLineBoxes()) 937 if (!currInline->alwaysCreateLineBoxes())
938 result.uniteIfNonZero(currInline->culledInlineVisualOverflowBoun dingBox()); 938 result.uniteIfNonZero(currInline->culledInlineVisualOverflowBoun dingBox());
939 else if (!currInline->hasSelfPaintingLayer()) 939 else if (!currInline->hasSelfPaintingLayer())
940 result.uniteIfNonZero(currInline->linesVisualOverflowBoundingBox ()); 940 result.uniteIfNonZero(currInline->linesVisualOverflowBoundingBox ());
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 pixelSnappedBox.maxY(), 1493 pixelSnappedBox.maxY(),
1494 pixelSnappedBox.maxX() + outlineWidth, 1494 pixelSnappedBox.maxX() + outlineWidth,
1495 pixelSnappedBox.maxY() + outlineWidth, 1495 pixelSnappedBox.maxY() + outlineWidth,
1496 BSBottom, outlineColor, outlineStyle, 1496 BSBottom, outlineColor, outlineStyle,
1497 outlineWidth, 1497 outlineWidth,
1498 outlineWidth, 1498 outlineWidth,
1499 antialias); 1499 antialias);
1500 } 1500 }
1501 1501
1502 } // namespace blink 1502 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698