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

Unified Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 684383002: Delete a ton more dead vertical writing mode code. (Closed) Base URL: git@github.com:domokit/mojo.git@writingmode1
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/InlineTextBox.cpp ('k') | sky/engine/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderBlock.cpp
diff --git a/sky/engine/core/rendering/RenderBlock.cpp b/sky/engine/core/rendering/RenderBlock.cpp
index e69bcb3154df002b7e45f50197efe9e77ef5d925..b23c09a2e7654dd2e704591720ff32d5b88241fc 100644
--- a/sky/engine/core/rendering/RenderBlock.cpp
+++ b/sky/engine/core/rendering/RenderBlock.cpp
@@ -948,15 +948,6 @@ void RenderBlock::finishDelayUpdateScrollInfo()
void RenderBlock::updateScrollInfoAfterLayout()
{
if (hasOverflowClip()) {
- if (style()->isFlippedBlocksWritingMode()) {
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=97937
- // Workaround for now. We cannot delay the scroll info for overflow
- // for items with opposite writing directions, as the contents needs
- // to overflow in that direction
- layer()->scrollableArea()->updateAfterLayout();
- return;
- }
-
if (gDelayUpdateScrollInfo)
gDelayedUpdateScrollInfoSet->add(this);
else
@@ -2285,9 +2276,6 @@ PositionWithAffinity RenderBlock::positionForPointWithInlineChildren(const Layou
if (!firstRootBox())
return createPositionWithAffinity(0, DOWNSTREAM);
- bool linesAreFlipped = style()->isFlippedLinesWritingMode();
- bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
-
// look for the closest line box in the root box which is at the passed-in y coordinate
InlineBox* closestBox = 0;
RootInlineBox* firstRootBoxWithChildren = 0;
@@ -2298,23 +2286,13 @@ PositionWithAffinity RenderBlock::positionForPointWithInlineChildren(const Layou
if (!firstRootBoxWithChildren)
firstRootBoxWithChildren = root;
- if (!linesAreFlipped && root->isFirstAfterPageBreak() && (pointInLogicalContents.y() < root->lineTopWithLeading()
- || (blocksAreFlipped && pointInLogicalContents.y() == root->lineTopWithLeading())))
+ if (root->isFirstAfterPageBreak() && (pointInLogicalContents.y() < root->lineTopWithLeading()))
break;
lastRootBoxWithChildren = root;
// check if this root line box is located at this y coordinate
- if (pointInLogicalContents.y() < root->selectionBottom() || (blocksAreFlipped && pointInLogicalContents.y() == root->selectionBottom())) {
- if (linesAreFlipped) {
- RootInlineBox* nextRootBoxWithChildren = root->nextRootBox();
- while (nextRootBoxWithChildren && !nextRootBoxWithChildren->firstLeafChild())
- nextRootBoxWithChildren = nextRootBoxWithChildren->nextRootBox();
-
- if (nextRootBoxWithChildren && nextRootBoxWithChildren->isFirstAfterPageBreak() && (pointInLogicalContents.y() > nextRootBoxWithChildren->lineTopWithLeading()
- || (!blocksAreFlipped && pointInLogicalContents.y() == nextRootBoxWithChildren->lineTopWithLeading())))
- continue;
- }
+ if (pointInLogicalContents.y() < root->selectionBottom()) {
closestBox = root->closestLeafChildForLogicalLeftPosition(pointInLogicalContents.x());
if (closestBox)
break;
@@ -2331,8 +2309,7 @@ PositionWithAffinity RenderBlock::positionForPointWithInlineChildren(const Layou
if (closestBox) {
if (moveCaretToBoundary) {
LayoutUnit firstRootBoxWithChildrenTop = std::min<LayoutUnit>(firstRootBoxWithChildren->selectionTop(), firstRootBoxWithChildren->logicalTop());
- if (pointInLogicalContents.y() < firstRootBoxWithChildrenTop
- || (blocksAreFlipped && pointInLogicalContents.y() == firstRootBoxWithChildrenTop)) {
+ if (pointInLogicalContents.y() < firstRootBoxWithChildrenTop) {
InlineBox* box = firstRootBoxWithChildren->firstLeafChild();
if (box->isLineBreak()) {
if (InlineBox* newBox = box->nextLeafChildIgnoringLineBreak())
@@ -2397,10 +2374,9 @@ PositionWithAffinity RenderBlock::positionForPoint(const LayoutPoint& point)
while (lastCandidateBox && !isChildHitTestCandidate(lastCandidateBox))
lastCandidateBox = lastCandidateBox->previousSiblingBox();
- bool blocksAreFlipped = style()->isFlippedBlocksWritingMode();
if (lastCandidateBox) {
if (pointInLogicalContents.y() > logicalTopForChild(lastCandidateBox)
- || (!blocksAreFlipped && pointInLogicalContents.y() == logicalTopForChild(lastCandidateBox)))
+ || (pointInLogicalContents.y() == logicalTopForChild(lastCandidateBox)))
return positionForPointRespectingEditingBoundaries(this, lastCandidateBox, pointInContents);
for (RenderBox* childBox = firstChildBox(); childBox; childBox = childBox->nextSiblingBox()) {
@@ -2408,8 +2384,7 @@ PositionWithAffinity RenderBlock::positionForPoint(const LayoutPoint& point)
continue;
LayoutUnit childLogicalBottom = logicalTopForChild(childBox) + logicalHeightForChild(childBox);
// We hit child if our click is above the bottom of its padding box (like IE6/7 and FF3).
- if (isChildHitTestCandidate(childBox) && (pointInLogicalContents.y() < childLogicalBottom
- || (blocksAreFlipped && pointInLogicalContents.y() == childLogicalBottom)))
+ if (isChildHitTestCandidate(childBox) && (pointInLogicalContents.y() < childLogicalBottom))
return positionForPointRespectingEditingBoundaries(this, childBox, pointInContents);
}
}
« no previous file with comments | « sky/engine/core/rendering/InlineTextBox.cpp ('k') | sky/engine/core/rendering/RenderBlockLineLayout.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698