Source/core/css/resolver/ViewportStyleResolver.cpp - Issue 16646002: Move the CSS Device Adaptation @viewport rule support behind a runtime flag

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: Source/core/css/resolver/ViewportStyleResolver.cpp

Issue 16646002: Move the CSS Device Adaptation @viewport rule support behind a runtime flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: For landing Created 7 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:

Index: Source/core/css/resolver/ViewportStyleResolver.cpp

diff --git a/Source/core/css/resolver/ViewportStyleResolver.cpp b/Source/core/css/resolver/ViewportStyleResolver.cpp

index 36cbf2c5597ca22623bbbc97914a494ec75461f0..38a644d4e6bedadb8a7ae3331db1a805cdfee8da 100644

--- a/Source/core/css/resolver/ViewportStyleResolver.cpp

+++ b/Source/core/css/resolver/ViewportStyleResolver.cpp

@@ -30,12 +30,11 @@

#include "config.h"

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

-#if ENABLE(CSS_DEVICE_ADAPTATION)

#include "CSSValueKeywords.h"

#include "core/css/StylePropertySet.h"

#include "core/css/StyleRule.h"

#include "core/dom/Document.h"

+#include "core/dom/NodeRenderStyle.h"

#include "core/dom/ViewportArguments.h"

#include "core/page/Page.h"

#include "core/rendering/RenderView.h"

@@ -142,7 +141,7 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const

}

- switch (primitiveValue->getIdent()) {

+ switch (primitiveValue->getValueID()) {

case CSSValueAuto:

return defaultValue;

case CSSValueDeviceHeight:

@@ -163,5 +162,3 @@ float ViewportStyleResolver::getViewportArgumentValue(CSSPropertyID id) const

}

} // namespace WebCore

-#endif // ENABLE(CSS_DEVICE_ADAPTATION)

« no previous file with comments | « Source/core/css/resolver/ViewportStyleResolver.h ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »