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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 319283002: [FastTextAutosizer] Inherit the text autosizing multiplier (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove non-critical changes Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te xtStrokeWidth) 539 || rareInheritedData->textStrokeWidth != other.rareInheritedData->te xtStrokeWidth)
540 return true; 540 return true;
541 541
542 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t())) 542 if (!rareInheritedData->shadowDataEquivalent(*other.rareInheritedData.ge t()))
543 return true; 543 return true;
544 544
545 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t())) 545 if (!rareInheritedData->quotesDataEquivalent(*other.rareInheritedData.ge t()))
546 return true; 546 return true;
547 } 547 }
548 548
549 if (visual->m_textAutosizingMultiplier != other.visual->m_textAutosizingMult iplier) 549 if (inherited->textAutosizingMultiplier != other.inherited->textAutosizingMu ltiplier)
550 return true; 550 return true;
551 551
552 if (inherited.get() != other.inherited.get()) { 552 if (inherited.get() != other.inherited.get()) {
553 if (inherited->line_height != other.inherited->line_height 553 if (inherited->line_height != other.inherited->line_height
554 || inherited->font != other.inherited->font 554 || inherited->font != other.inherited->font
555 || inherited->horizontal_border_spacing != other.inherited->horizont al_border_spacing 555 || inherited->horizontal_border_spacing != other.inherited->horizont al_border_spacing
556 || inherited->vertical_border_spacing != other.inherited->vertical_b order_spacing) 556 || inherited->vertical_border_spacing != other.inherited->vertical_b order_spacing)
557 return true; 557 return true;
558 } 558 }
559 559
(...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 // right 1707 // right
1708 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1708 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1709 if (radiiSum > rect.height()) 1709 if (radiiSum > rect.height())
1710 factor = std::min(rect.height() / radiiSum, factor); 1710 factor = std::min(rect.height() / radiiSum, factor);
1711 1711
1712 ASSERT(factor <= 1); 1712 ASSERT(factor <= 1);
1713 return factor; 1713 return factor;
1714 } 1714 }
1715 1715
1716 } // namespace WebCore 1716 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698