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

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

Issue 686723002: Improve RAII of StyleResolverState. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: When baseRenderStyle!=0: 1) don't inherit, and 2) use defaultStyleForElement as fallback parent. 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) 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 #include "core/css/resolver/ElementResolveContext.h" 23 #include "core/css/resolver/ElementResolveContext.h"
24 24
25 #include "core/animation/ActiveAnimations.h"
25 #include "core/dom/Node.h" 26 #include "core/dom/Node.h"
26 #include "core/dom/NodeRenderStyle.h" 27 #include "core/dom/NodeRenderStyle.h"
27 #include "core/dom/NodeRenderingTraversal.h" 28 #include "core/dom/NodeRenderingTraversal.h"
28 #include "core/dom/VisitedLinkState.h" 29 #include "core/dom/VisitedLinkState.h"
30 #include "core/rendering/style/RenderStyle.h"
29 31
30 namespace blink { 32 namespace blink {
31 33
32 ElementResolveContext::ElementResolveContext(const Document& document) 34 static RenderStyle* findRootElementStyle(const Document& document, Element* elem ent)
33 : m_element(nullptr) 35 {
36 Node* documentElement = document.documentElement();
37 if (documentElement && element != documentElement && documentElement->render Style())
38 return documentElement->renderStyle();
39 return document.renderStyle();
40 }
41
42 ElementResolveContext::ElementResolveContext(Document& document, Element* elemen t, RenderStyle* parentStyle)
43 : m_document(document)
44 , m_element(element)
34 , m_parentNode(nullptr) 45 , m_parentNode(nullptr)
35 , m_rootElementStyle(document.documentElement() ? document.documentElement() ->renderStyle() : document.renderStyle()) 46 , m_parentStyle(parentStyle)
36 , m_elementLinkState(NotInsideLink) 47 , m_activeAnimations(element ? element->activeAnimations() : nullptr)
48 , m_baseRenderStyle(m_activeAnimations ? m_activeAnimations->baseRenderStyle () : nullptr)
49 , m_rootElementStyle(findRootElementStyle(document, element))
50 , m_elementLinkState(element ? document.visitedLinkState().determineLinkStat e(*element) : NotInsideLink)
37 , m_distributedToInsertionPoint(false) 51 , m_distributedToInsertionPoint(false)
38 { 52 {
39 } 53 if (element) {
54 NodeRenderingTraversal::ParentDetails parentDetails;
55 m_parentNode = NodeRenderingTraversal::parent(element, &parentDetails);
56 m_distributedToInsertionPoint = parentDetails.insertionPoint();
40 57
41 ElementResolveContext::ElementResolveContext(Element& element) 58 if (!m_parentStyle && m_parentNode)
42 : m_element(&element) 59 m_parentStyle = m_parentNode->renderStyle();
43 , m_elementLinkState(element.document().visitedLinkState().determineLinkStat e(element)) 60 }
44 , m_distributedToInsertionPoint(false)
45 {
46 NodeRenderingTraversal::ParentDetails parentDetails;
47 m_parentNode = NodeRenderingTraversal::parent(&element, &parentDetails);
48 m_distributedToInsertionPoint = parentDetails.insertionPoint();
49
50 const Document& document = element.document();
51 Node* documentElement = document.documentElement();
52 RenderStyle* documentStyle = document.renderStyle();
53 m_rootElementStyle = documentElement && element != documentElement ? documen tElement->renderStyle() : documentStyle;
54 if (!m_rootElementStyle)
55 m_rootElementStyle = documentStyle;
56 } 61 }
57 62
58 } // namespace blink 63 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698