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

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

Issue 708843002: Remove -webkit-auto, -webkit-center, -webkit-left, -webkit-right. (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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 RenderStyle* cbStyle = cb->style(); 552 RenderStyle* cbStyle = cb->style();
553 553
554 float leftEdge; 554 float leftEdge;
555 float rightEdge; 555 float rightEdge;
556 leftEdge = std::min<float>(0, rootLeft); 556 leftEdge = std::min<float>(0, rootLeft);
557 rightEdge = std::max<float>(cb->logicalWidth().toFloat(), rootRight); 557 rightEdge = std::max<float>(cb->logicalWidth().toFloat(), rootRight);
558 558
559 bool rightAligned = false; 559 bool rightAligned = false;
560 switch (cbStyle->textAlign()) { 560 switch (cbStyle->textAlign()) {
561 case RIGHT: 561 case RIGHT:
562 case WEBKIT_RIGHT:
563 rightAligned = true; 562 rightAligned = true;
564 break; 563 break;
565 case LEFT: 564 case LEFT:
566 case WEBKIT_LEFT:
567 case CENTER: 565 case CENTER:
568 case WEBKIT_CENTER:
569 break; 566 break;
570 case JUSTIFY: 567 case JUSTIFY:
571 case TASTART: 568 case TASTART:
572 rightAligned = !cbStyle->isLeftToRightDirection(); 569 rightAligned = !cbStyle->isLeftToRightDirection();
573 break; 570 break;
574 case TAEND: 571 case TAEND:
575 rightAligned = cbStyle->isLeftToRightDirection(); 572 rightAligned = cbStyle->isLeftToRightDirection();
576 break; 573 break;
577 } 574 }
578 575
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 ASSERT(child->prevTextBox() == prev); 1647 ASSERT(child->prevTextBox() == prev);
1651 prev = child; 1648 prev = child;
1652 } 1649 }
1653 ASSERT(prev == m_lastTextBox); 1650 ASSERT(prev == m_lastTextBox);
1654 #endif 1651 #endif
1655 } 1652 }
1656 1653
1657 #endif 1654 #endif
1658 1655
1659 } // namespace blink 1656 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBoxModelObject.cpp ('k') | sky/engine/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698