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

Side by Side Diff: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 1020833002: Remove duplicate Enum Font Pitch (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebasing patch Created 5 years, 9 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
« no previous file with comments | « no previous file | Source/core/editing/EditingStyle.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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
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 Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 if (int keywordSize = style->fontDescription().keywordSize()) 438 if (int keywordSize = style->fontDescription().keywordSize())
439 return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyw ord(keywordSize)); 439 return cssValuePool().createIdentifierValue(cssIdentifierForFontSizeKeyw ord(keywordSize));
440 440
441 441
442 return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style); 442 return zoomAdjustedPixelValue(style->fontDescription().computedPixelSize(), *style);
443 } 443 }
444 444
445 FixedPitchFontType CSSComputedStyleDeclaration::fixedPitchFontType() const 445 FixedPitchFontType CSSComputedStyleDeclaration::fixedPitchFontType() const
446 { 446 {
447 if (!m_node) 447 if (!m_node)
448 return NonFixedPitchFont; 448 return VariablePitchFont;
449 449
450 const LayoutStyle* style = m_node->computedStyle(m_pseudoElementSpecifier); 450 const LayoutStyle* style = m_node->computedStyle(m_pseudoElementSpecifier);
451 if (!style) 451 if (!style)
452 return NonFixedPitchFont; 452 return VariablePitchFont;
453 453
454 return style->fontDescription().fixedPitchFontType(); 454 return style->fontDescription().fixedPitchFontType();
455 } 455 }
456 456
457 static void logUnimplementedPropertyID(CSSPropertyID propertyID) 457 static void logUnimplementedPropertyID(CSSPropertyID propertyID)
458 { 458 {
459 DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ()); 459 DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ());
460 if (!propertyIDSet.add(propertyID).isNewEntry) 460 if (!propertyIDSet.add(propertyID).isNewEntry)
461 return; 461 return;
462 462
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 exceptionState.throwDOMException(NoModificationAllowedError, "These styles a re computed, and therefore the '" + getPropertyNameString(id) + "' property is r ead-only."); 694 exceptionState.throwDOMException(NoModificationAllowedError, "These styles a re computed, and therefore the '" + getPropertyNameString(id) + "' property is r ead-only.");
695 } 695 }
696 696
697 DEFINE_TRACE(CSSComputedStyleDeclaration) 697 DEFINE_TRACE(CSSComputedStyleDeclaration)
698 { 698 {
699 visitor->trace(m_node); 699 visitor->trace(m_node);
700 CSSStyleDeclaration::trace(visitor); 700 CSSStyleDeclaration::trace(visitor);
701 } 701 }
702 702
703 } // namespace blink 703 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/editing/EditingStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698