third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp - 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/CSSToLengthConversionData.cpp

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.h ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolverState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

index f34b0ea19ac82159af6cfc063ceffb2302588a4e..8fe2a1719d832f8444a609060f6399f2eb11e9c6 100644

--- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

+++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp

@@ -31,7 +31,7 @@

#include "core/css/CSSToLengthConversionData.h"

#include "core/css/CSSHelper.h"

-#include "core/layout/LayoutView.h"

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

#include "core/style/ComputedStyle.h"

namespace blink {

@@ -67,8 +67,8 @@ float CSSToLengthConversionData::FontSizes::ch() const

return m_font->getFontMetrics().zeroWidth();

}

-CSSToLengthConversionData::ViewportSize::ViewportSize(const LayoutView* layoutView)

- : m_size(layoutView ? layoutView->viewportSizeForViewportUnits() : DoubleSize())

+CSSToLengthConversionData::ViewportSize::ViewportSize(const LayoutViewItem& layoutViewItem)

+ : m_size(!layoutViewItem.isNull() ? layoutViewItem.viewportSizeForViewportUnits() : DoubleSize())

{

}

@@ -81,8 +81,8 @@ CSSToLengthConversionData::CSSToLengthConversionData(const ComputedStyle* style,

ASSERT(m_style);

}

-CSSToLengthConversionData::CSSToLengthConversionData(const ComputedStyle* style, const ComputedStyle* rootStyle, const LayoutView* layoutView, float zoom)

- : CSSToLengthConversionData(style, FontSizes(style, rootStyle), ViewportSize(layoutView), zoom)

+CSSToLengthConversionData::CSSToLengthConversionData(const ComputedStyle* style, const ComputedStyle* rootStyle, const LayoutViewItem& layoutViewItem, float zoom)

+ : CSSToLengthConversionData(style, FontSizes(style, rootStyle), ViewportSize(layoutViewItem), zoom)

{

}