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

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: Fix unused var + minor diff noise. 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,
(...skipping 14 matching lines...) Expand all
25 #include "core/dom/Node.h" 25 #include "core/dom/Node.h"
26 #include "core/dom/NodeRenderStyle.h" 26 #include "core/dom/NodeRenderStyle.h"
27 #include "core/dom/NodeRenderingTraversal.h" 27 #include "core/dom/NodeRenderingTraversal.h"
28 #include "core/dom/VisitedLinkState.h" 28 #include "core/dom/VisitedLinkState.h"
29 29
30 namespace blink { 30 namespace blink {
31 31
32 ElementResolveContext::ElementResolveContext(const Document& document) 32 ElementResolveContext::ElementResolveContext(const Document& document)
33 : m_element(nullptr) 33 : m_element(nullptr)
34 , m_parentNode(nullptr) 34 , m_parentNode(nullptr)
35 , m_parentStyle(nullptr)
35 , m_rootElementStyle(document.documentElement() ? document.documentElement() ->renderStyle() : document.renderStyle()) 36 , m_rootElementStyle(document.documentElement() ? document.documentElement() ->renderStyle() : document.renderStyle())
36 , m_elementLinkState(NotInsideLink) 37 , m_elementLinkState(NotInsideLink)
37 , m_distributedToInsertionPoint(false) 38 , m_distributedToInsertionPoint(false)
38 { 39 {
39 } 40 }
40 41
41 ElementResolveContext::ElementResolveContext(Element& element) 42 ElementResolveContext::ElementResolveContext(Element& element, RenderStyle* pare ntStyle)
42 : m_element(&element) 43 : m_element(&element)
44 , m_parentStyle(parentStyle)
43 , m_elementLinkState(element.document().visitedLinkState().determineLinkStat e(element)) 45 , m_elementLinkState(element.document().visitedLinkState().determineLinkStat e(element))
44 , m_distributedToInsertionPoint(false) 46 , m_distributedToInsertionPoint(false)
45 { 47 {
46 NodeRenderingTraversal::ParentDetails parentDetails; 48 NodeRenderingTraversal::ParentDetails parentDetails;
47 m_parentNode = NodeRenderingTraversal::parent(&element, &parentDetails); 49 m_parentNode = NodeRenderingTraversal::parent(&element, &parentDetails);
48 m_distributedToInsertionPoint = parentDetails.insertionPoint(); 50 m_distributedToInsertionPoint = parentDetails.insertionPoint();
49 51
50 const Document& document = element.document(); 52 const Document& document = element.document();
51 Node* documentElement = document.documentElement(); 53 Node* documentElement = document.documentElement();
52 RenderStyle* documentStyle = document.renderStyle(); 54 RenderStyle* documentStyle = document.renderStyle();
53 m_rootElementStyle = documentElement && element != documentElement ? documen tElement->renderStyle() : documentStyle; 55 m_rootElementStyle = documentElement && element != documentElement ? documen tElement->renderStyle() : documentStyle;
54 if (!m_rootElementStyle) 56 if (!m_rootElementStyle)
55 m_rootElementStyle = documentStyle; 57 m_rootElementStyle = documentStyle;
58 if (!m_parentStyle && m_parentNode)
59 m_parentStyle = m_parentNode->renderStyle();
56 } 60 }
57 61
58 } // namespace blink 62 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698