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

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

Issue 688213002: First pass at removing dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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 1283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 blockPosition = firstLineBox()->logicalTop(); 1294 blockPosition = firstLineBox()->logicalTop();
1295 } else { 1295 } else {
1296 inlinePosition = layer()->staticInlinePosition(); 1296 inlinePosition = layer()->staticInlinePosition();
1297 blockPosition = layer()->staticBlockPosition(); 1297 blockPosition = layer()->staticBlockPosition();
1298 } 1298 }
1299 1299
1300 // Per http://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width an abso lute positioned box 1300 // Per http://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width an abso lute positioned box
1301 // with a static position should locate itself as though it is a normal flow box in relation to 1301 // with a static position should locate itself as though it is a normal flow box in relation to
1302 // its containing block. If this relative-positioned inline has a negative o ffset we need to 1302 // its containing block. If this relative-positioned inline has a negative o ffset we need to
1303 // compensate for it so that we align the positioned object with the edge of its containing block. 1303 // compensate for it so that we align the positioned object with the edge of its containing block.
1304 if (child.style()->hasStaticInlinePosition(style()->isHorizontalWritingMode( ))) 1304 if (child.style()->hasStaticInlinePosition())
1305 logicalOffset.setWidth(std::max(LayoutUnit(), -offsetForInFlowPosition() .width())); 1305 logicalOffset.setWidth(std::max(LayoutUnit(), -offsetForInFlowPosition() .width()));
1306 else 1306 else
1307 logicalOffset.setWidth(inlinePosition); 1307 logicalOffset.setWidth(inlinePosition);
1308 1308
1309 if (!child.style()->hasStaticBlockPosition(style()->isHorizontalWritingMode( ))) 1309 if (!child.style()->hasStaticBlockPosition())
1310 logicalOffset.setHeight(blockPosition); 1310 logicalOffset.setHeight(blockPosition);
1311 1311
1312 return style()->isHorizontalWritingMode() ? logicalOffset : logicalOffset.tr ansposedSize(); 1312 return logicalOffset;
1313 } 1313 }
1314 1314
1315 void RenderInline::imageChanged(WrappedImagePtr, const IntRect*) 1315 void RenderInline::imageChanged(WrappedImagePtr, const IntRect*)
1316 { 1316 {
1317 if (!parent()) 1317 if (!parent())
1318 return; 1318 return;
1319 1319
1320 // FIXME: We can do better. 1320 // FIXME: We can do better.
1321 setShouldDoFullPaintInvalidation(true); 1321 setShouldDoFullPaintInvalidation(true);
1322 } 1322 }
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 pixelSnappedBox.maxY(), 1526 pixelSnappedBox.maxY(),
1527 pixelSnappedBox.maxX() + outlineWidth, 1527 pixelSnappedBox.maxX() + outlineWidth,
1528 pixelSnappedBox.maxY() + outlineWidth, 1528 pixelSnappedBox.maxY() + outlineWidth,
1529 BSBottom, outlineColor, outlineStyle, 1529 BSBottom, outlineColor, outlineStyle,
1530 outlineWidth, 1530 outlineWidth,
1531 outlineWidth, 1531 outlineWidth,
1532 antialias); 1532 antialias);
1533 } 1533 }
1534 1534
1535 } // namespace blink 1535 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderFlexibleBox.cpp ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698