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

Side by Side Diff: sky/engine/core/rendering/RenderBoxModelObject.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
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderText.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 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 // constructed and this kludge is not called any more. So only the caret siz e 2474 // constructed and this kludge is not called any more. So only the caret siz e
2475 // of an empty :first-line'd block is wrong. I think we can live with that. 2475 // of an empty :first-line'd block is wrong. I think we can live with that.
2476 RenderStyle* currentStyle = firstLineStyle(); 2476 RenderStyle* currentStyle = firstLineStyle();
2477 2477
2478 enum CaretAlignment { alignLeft, alignRight, alignCenter }; 2478 enum CaretAlignment { alignLeft, alignRight, alignCenter };
2479 2479
2480 CaretAlignment alignment = alignLeft; 2480 CaretAlignment alignment = alignLeft;
2481 2481
2482 switch (currentStyle->textAlign()) { 2482 switch (currentStyle->textAlign()) {
2483 case LEFT: 2483 case LEFT:
2484 case WEBKIT_LEFT:
2485 break; 2484 break;
2486 case CENTER: 2485 case CENTER:
2487 case WEBKIT_CENTER:
2488 alignment = alignCenter; 2486 alignment = alignCenter;
2489 break; 2487 break;
2490 case RIGHT: 2488 case RIGHT:
2491 case WEBKIT_RIGHT:
2492 alignment = alignRight; 2489 alignment = alignRight;
2493 break; 2490 break;
2494 case JUSTIFY: 2491 case JUSTIFY:
2495 case TASTART: 2492 case TASTART:
2496 if (!currentStyle->isLeftToRightDirection()) 2493 if (!currentStyle->isLeftToRightDirection())
2497 alignment = alignRight; 2494 alignment = alignRight;
2498 break; 2495 break;
2499 case TAEND: 2496 case TAEND:
2500 if (currentStyle->isLeftToRightDirection()) 2497 if (currentStyle->isLeftToRightDirection())
2501 alignment = alignRight; 2498 alignment = alignRight;
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2624 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2621 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2625 for (RenderObject* child = startChild; child && child != endChild; ) { 2622 for (RenderObject* child = startChild; child && child != endChild; ) {
2626 // Save our next sibling as moveChildTo will clear it. 2623 // Save our next sibling as moveChildTo will clear it.
2627 RenderObject* nextSibling = child->nextSibling(); 2624 RenderObject* nextSibling = child->nextSibling();
2628 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2625 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2629 child = nextSibling; 2626 child = nextSibling;
2630 } 2627 }
2631 } 2628 }
2632 2629
2633 } // namespace blink 2630 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/engine/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698