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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 711203002: Remove zoom() and effectiveZoom(). (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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); } 497 TextAlignLast textAlignLast() const { return static_cast<TextAlignLast>(rare InheritedData->m_textAlignLast); }
498 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); } 498 TextJustify textJustify() const { return static_cast<TextJustify>(rareInheri tedData->m_textJustify); }
499 TextDecoration textDecorationsInEffect() const; 499 TextDecoration textDecorationsInEffect() const;
500 const Vector<AppliedTextDecoration>& appliedTextDecorations() const; 500 const Vector<AppliedTextDecoration>& appliedTextDecorations() const;
501 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); } 501 TextDecoration textDecoration() const { return static_cast<TextDecoration>(v isual->textDecoration); }
502 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); } 502 TextUnderlinePosition textUnderlinePosition() const { return static_cast<Tex tUnderlinePosition>(rareInheritedData->m_textUnderlinePosition); }
503 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); } 503 TextDecorationStyle textDecorationStyle() const { return static_cast<TextDec orationStyle>(rareNonInheritedData->m_textDecorationStyle); }
504 float wordSpacing() const; 504 float wordSpacing() const;
505 float letterSpacing() const; 505 float letterSpacing() const;
506 506
507 // FIXME(sky): Remove
508 float zoom() const { return 1.0f; }
509 float effectiveZoom() const { return 1.0f; }
510
511 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); } 507 TextDirection direction() const { return static_cast<TextDirection>(inherite d_flags._direction); }
512 bool isLeftToRightDirection() const { return direction() == LTR; } 508 bool isLeftToRightDirection() const { return direction() == LTR; }
513 509
514 const Length& specifiedLineHeight() const; 510 const Length& specifiedLineHeight() const;
515 Length lineHeight() const; 511 Length lineHeight() const;
516 int computedLineHeight() const; 512 int computedLineHeight() const;
517 513
518 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_f lags._white_space); } 514 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(inherited_f lags._white_space); }
519 static bool autoWrap(EWhiteSpace ws) 515 static bool autoWrap(EWhiteSpace ws)
520 { 516 {
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 1450
1455 rareInheritedData.access()->m_textOrientation = textOrientation; 1451 rareInheritedData.access()->m_textOrientation = textOrientation;
1456 return true; 1452 return true;
1457 } 1453 }
1458 1454
1459 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1455 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1460 1456
1461 } // namespace blink 1457 } // namespace blink
1462 1458
1463 #endif // RenderStyle_h 1459 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderReplaced.cpp ('k') | sky/engine/core/rendering/style/StyleFetchedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698