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

Side by Side Diff: Source/core/css/resolver/FontBuilder.cpp

Issue 266443002: code clean-up, issue crbug.com/260966 is fixed with (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Correcting Assert Check Created 6 years, 7 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 | no next file » | 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 * 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 : m_document(0) 63 : m_document(0)
64 , m_useSVGZoomRules(false) 64 , m_useSVGZoomRules(false)
65 , m_fontSizehasViewportUnits(false) 65 , m_fontSizehasViewportUnits(false)
66 , m_style(0) 66 , m_style(0)
67 , m_fontDirty(false) 67 , m_fontDirty(false)
68 { 68 {
69 } 69 }
70 70
71 void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* sty le, bool useSVGZoomRules) 71 void FontBuilder::initForStyleResolve(const Document& document, RenderStyle* sty le, bool useSVGZoomRules)
72 { 72 {
73 // All documents need to be in a frame (and thus have access to Settings) 73 ASSERT(document.frame());
74 // for style-resolution to make sense.
75 // Unfortunately SVG Animations currently violate this: crbug.com/260966
76 // ASSERT(m_document->frame());
77 m_document = &document; 74 m_document = &document;
78 m_useSVGZoomRules = useSVGZoomRules; 75 m_useSVGZoomRules = useSVGZoomRules;
79 m_style = style; 76 m_style = style;
80 m_fontDirty = false; 77 m_fontDirty = false;
81 } 78 }
82 79
83 inline static void setFontFamilyToStandard(FontDescription& fontDescription, con st Document* document) 80 inline static void setFontFamilyToStandard(FontDescription& fontDescription, con st Document* document)
84 { 81 {
85 if (!document || !document->settings()) 82 if (!document || !document->settings())
86 return; 83 return;
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 FontOrientation fontOrientation; 666 FontOrientation fontOrientation;
670 NonCJKGlyphOrientation glyphOrientation; 667 NonCJKGlyphOrientation glyphOrientation;
671 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ; 668 getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation) ;
672 fontDescription.setOrientation(fontOrientation); 669 fontDescription.setOrientation(fontOrientation);
673 fontDescription.setNonCJKGlyphOrientation(glyphOrientation); 670 fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
674 documentStyle->setFontDescription(fontDescription); 671 documentStyle->setFontDescription(fontDescription);
675 documentStyle->font().update(fontSelector); 672 documentStyle->font().update(fontSelector);
676 } 673 }
677 674
678 } 675 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698