third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp - Issue 2727233005: Remove calls to styleForLayoutObject() in LayoutTreeBuilder::style()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

Issue 2727233005: Remove calls to styleForLayoutObject() in LayoutTreeBuilder::style() (Closed)

Patch Set: Format issue Created 3 years, 9 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:

Index: third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

diff --git a/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp b/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

index d6df798b0f74e0a0ac49c3206c4ce4bbbb770dde..9bf2079b3b56e655cc78e544d5672dfa980a5560 100644

--- a/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

+++ b/third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp

@@ -100,8 +100,12 @@ bool LayoutTreeBuilderForElement::shouldCreateLayoutObject() const {

}

ComputedStyle& LayoutTreeBuilderForElement::style() const {

- if (!m_style)

+ m_style =

+ m_node->document().getStyleReattachData(*m_node).computedStyle.get();

+ if (!m_style) {

+ // This should happen in the case of Elements that have CustomStyleCallbacks

m_style = m_node->styleForLayoutObject();

+ }

return *m_style;

}