| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google 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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 450 switch (style->textOrientation()) { | 450 switch (style->textOrientation()) { |
| 451 case TextOrientationVerticalRight: | 451 case TextOrientationVerticalRight: |
| 452 fontOrientation = Vertical; | 452 fontOrientation = Vertical; |
| 453 glyphOrientation = NonCJKGlyphOrientationVerticalRight; | 453 glyphOrientation = NonCJKGlyphOrientationVerticalRight; |
| 454 return; | 454 return; |
| 455 case TextOrientationUpright: | 455 case TextOrientationUpright: |
| 456 fontOrientation = Vertical; | 456 fontOrientation = Vertical; |
| 457 glyphOrientation = NonCJKGlyphOrientationUpright; | 457 glyphOrientation = NonCJKGlyphOrientationUpright; |
| 458 return; | 458 return; |
| 459 case TextOrientationSideways: | 459 case TextOrientationSideways: |
| 460 if (style->writingMode() == LeftToRightWritingMode) { | |
| 461 // FIXME: This should map to sideways-left, which is not supported y
et. | |
| 462 fontOrientation = Vertical; | |
| 463 glyphOrientation = NonCJKGlyphOrientationVerticalRight; | |
| 464 return; | |
| 465 } | |
| 466 fontOrientation = Horizontal; | 460 fontOrientation = Horizontal; |
| 467 glyphOrientation = NonCJKGlyphOrientationVerticalRight; | 461 glyphOrientation = NonCJKGlyphOrientationVerticalRight; |
| 468 return; | 462 return; |
| 469 case TextOrientationSidewaysRight: | 463 case TextOrientationSidewaysRight: |
| 470 fontOrientation = Horizontal; | 464 fontOrientation = Horizontal; |
| 471 glyphOrientation = NonCJKGlyphOrientationVerticalRight; | 465 glyphOrientation = NonCJKGlyphOrientationVerticalRight; |
| 472 return; | 466 return; |
| 473 default: | 467 default: |
| 474 ASSERT_NOT_REACHED(); | 468 ASSERT_NOT_REACHED(); |
| 475 fontOrientation = Horizontal; | 469 fontOrientation = Horizontal; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 FontOrientation fontOrientation; | 558 FontOrientation fontOrientation; |
| 565 NonCJKGlyphOrientation glyphOrientation; | 559 NonCJKGlyphOrientation glyphOrientation; |
| 566 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; | 560 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation)
; |
| 567 fontDescription.setOrientation(fontOrientation); | 561 fontDescription.setOrientation(fontOrientation); |
| 568 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); | 562 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); |
| 569 documentStyle->setFontDescription(fontDescription); | 563 documentStyle->setFontDescription(fontDescription); |
| 570 documentStyle->font().update(fontSelector); | 564 documentStyle->font().update(fontSelector); |
| 571 } | 565 } |
| 572 | 566 |
| 573 } | 567 } |
| OLD | NEW |