third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 2797973002: Removing duplicate functions and symbol names in core/css

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/ComputedStyleCSSValueMapping.cpp

Issue 2797973002: Removing duplicate functions and symbol names in core/css (Closed)

Patch Set: Removed unnecessary include Created 3 years, 8 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/CSSPrimitiveValue.h ('k') | third_party/WebKit/Source/core/css/invalidation/StyleInvalidator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 1bef3d692014ce44db6f4c819d86b0c49551ad3c..793642c5151863b5744ceed4e122f0a8a4f35819 100644

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

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

@@ -57,6 +57,7 @@

#include "core/css/CSSValueList.h"

#include "core/css/CSSValuePair.h"

#include "core/css/PropertyRegistry.h"

+#include "core/css/zoomAdjustedPixelValue.h"

#include "core/layout/LayoutBlock.h"

#include "core/layout/LayoutBox.h"

#include "core/layout/LayoutGrid.h"

@@ -76,13 +77,6 @@ inline static bool isFlexOrGrid(const ComputedStyle* style) {

return style && style->isDisplayFlexibleOrGridBox();

}

-inline static CSSPrimitiveValue* zoomAdjustedPixelValue(

- double value,

- const ComputedStyle& style) {

- return CSSPrimitiveValue::create(adjustFloatForAbsoluteZoom(value, style),

- CSSPrimitiveValue::UnitType::Pixels);

inline static CSSValue* zoomAdjustedPixelValueOrAuto(

const Length& length,

const ComputedStyle& style) {