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

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

Issue 64293008: Wrap CSS length conversion arguments in an object (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: bool for useEffectiveZoom instead of -1 magic number Created 7 years 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) 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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 15 matching lines...) Expand all
26 #include "core/dom/Node.h" 26 #include "core/dom/Node.h"
27 #include "core/dom/NodeRenderStyle.h" 27 #include "core/dom/NodeRenderStyle.h"
28 #include "core/page/Page.h" 28 #include "core/page/Page.h"
29 29
30 namespace WebCore { 30 namespace WebCore {
31 31
32 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren derStyle* parentStyle, RenderRegion* regionForStyling) 32 StyleResolverState::StyleResolverState(Document& document, Element* element, Ren derStyle* parentStyle, RenderRegion* regionForStyling)
33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv eContext()) 33 : m_elementContext(element ? ElementResolveContext(*element) : ElementResolv eContext())
34 , m_document(document) 34 , m_document(document)
35 , m_style(0) 35 , m_style(0)
36 , m_cssToLengthConversionData(0, 0)
36 , m_parentStyle(parentStyle) 37 , m_parentStyle(parentStyle)
37 , m_regionForStyling(regionForStyling) 38 , m_regionForStyling(regionForStyling)
38 , m_applyPropertyToRegularStyle(true) 39 , m_applyPropertyToRegularStyle(true)
39 , m_applyPropertyToVisitedLinkStyle(false) 40 , m_applyPropertyToVisitedLinkStyle(false)
40 , m_lineHeightValue(0) 41 , m_lineHeightValue(0)
41 , m_styleMap(*this, m_elementStyleResources) 42 , m_styleMap(*this, m_elementStyleResources)
42 , m_currentRule(0) 43 , m_currentRule(0)
43 { 44 {
44 if (m_elementContext.resetStyleInheritance()) 45 if (m_elementContext.resetStyleInheritance())
45 m_parentStyle = 0; 46 m_parentStyle = 0;
46 else if (!parentStyle && m_elementContext.parentNode()) 47 else if (!parentStyle && m_elementContext.parentNode())
47 m_parentStyle = m_elementContext.parentNode()->renderStyle(); 48 m_parentStyle = m_elementContext.parentNode()->renderStyle();
48 49
50 m_cssToLengthConversionData.setRootStyle(rootElementStyle());
alancutter (OOO until 2018) 2013/11/27 09:30:58 This can be moved into the constructor list (as di
Timothy Loh 2013/11/28 03:41:53 Done.
51
49 // FIXME: How can we not have a page here? 52 // FIXME: How can we not have a page here?
50 if (Page* page = document.page()) 53 if (Page* page = document.page())
51 m_elementStyleResources.setDeviceScaleFactor(page->deviceScaleFactor()); 54 m_elementStyleResources.setDeviceScaleFactor(page->deviceScaleFactor());
52 } 55 }
53 56
54 } // namespace WebCore 57 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698