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

Side by Side Diff: third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

Issue 2460813002: Make slots in non-shadow trees participate in a flat tree (Closed)
Patch Set: update expectation Created 4 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 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
8 * (http://www.torchmobile.com/) 8 * (http://www.torchmobile.com/)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 30 matching lines...) Expand all
41 #include "core/layout/LayoutText.h" 41 #include "core/layout/LayoutText.h"
42 #include "core/layout/LayoutView.h" 42 #include "core/layout/LayoutView.h"
43 #include "core/svg/SVGElement.h" 43 #include "core/svg/SVGElement.h"
44 #include "platform/RuntimeEnabledFeatures.h" 44 #include "platform/RuntimeEnabledFeatures.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element, 48 LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element,
49 ComputedStyle* style) 49 ComputedStyle* style)
50 : LayoutTreeBuilder(element, nullptr), m_style(style) { 50 : LayoutTreeBuilder(element, nullptr), m_style(style) {
51 DCHECK(!element.isSlotOrActiveInsertionPoint()); 51 DCHECK(!element.isActiveSlotOrActiveInsertionPoint());
52 if (element.isFirstLetterPseudoElement()) { 52 if (element.isFirstLetterPseudoElement()) {
53 if (LayoutObject* nextLayoutObject = 53 if (LayoutObject* nextLayoutObject =
54 FirstLetterPseudoElement::firstLetterTextLayoutObject(element)) 54 FirstLetterPseudoElement::firstLetterTextLayoutObject(element))
55 m_layoutObjectParent = nextLayoutObject->parent(); 55 m_layoutObjectParent = nextLayoutObject->parent();
56 } else if (ContainerNode* containerNode = 56 } else if (ContainerNode* containerNode =
57 LayoutTreeBuilderTraversal::parent(element)) { 57 LayoutTreeBuilderTraversal::parent(element)) {
58 m_layoutObjectParent = containerNode->layoutObject(); 58 m_layoutObjectParent = containerNode->layoutObject();
59 } 59 }
60 } 60 }
61 61
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 m_layoutObjectParent->isInsideFlowThread()); 174 m_layoutObjectParent->isInsideFlowThread());
175 175
176 LayoutObject* nextLayoutObject = this->nextLayoutObject(); 176 LayoutObject* nextLayoutObject = this->nextLayoutObject();
177 m_node->setLayoutObject(newLayoutObject); 177 m_node->setLayoutObject(newLayoutObject);
178 // Parent takes care of the animations, no need to call setAnimatableStyle. 178 // Parent takes care of the animations, no need to call setAnimatableStyle.
179 newLayoutObject->setStyle(&style); 179 newLayoutObject->setStyle(&style);
180 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject); 180 m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject);
181 } 181 }
182 182
183 } // namespace blink 183 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Element.cpp ('k') | third_party/WebKit/Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698