third_party/WebKit/Source/core/css/resolver/StyleResolverState.h - Issue 2056303002: [Layout API] Use Document::layoutViewItem() in ViewportStyleResolver

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/css/resolver/StyleResolverState.h

Issue 2056303002: [Layout API] Use Document::layoutViewItem() in ViewportStyleResolver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changed both declarations to const ref as per rune Created 4 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolverState.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleResolverState.h

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h

index ba78ffe025f0046c0b5b73286a2353f91fd2f3bf..53ac1154b5b543ad64cdcf31eb75bf62f3ae86ad 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h

+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolverState.h

@@ -34,6 +34,7 @@

#include "core/css/resolver/FontBuilder.h"

#include "core/dom/Document.h"

#include "core/dom/Element.h"

+#include "core/layout/api/LayoutViewItem.h"

#include "core/style/CachedUAStyle.h"

#include "core/style/ComputedStyle.h"

#include "core/style/StyleInheritedData.h"

@@ -67,7 +68,7 @@ public:

{

// FIXME: Improve RAII of StyleResolverState to remove this function.

m_style = style;

- m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), rootElementStyle(), document().layoutView(), m_style->effectiveZoom());

+ m_cssToLengthConversionData = CSSToLengthConversionData(m_style.get(), rootElementStyle(), document().layoutViewItem(), m_style->effectiveZoom());

}

const ComputedStyle* style() const { return m_style.get(); }

ComputedStyle* style() { return m_style.get(); }