third_party/WebKit/Source/core/css/resolver/ViewportStyleResolver.cpp - Issue 2414343002: Implement MediaValues for initial viewport.

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

Issue 2414343002: Implement MediaValues for initial viewport. (Closed)

Patch Set: CORE_EXPORT in inheritance chain for Windows Created 4 years, 2 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/MediaValuesInitialViewportTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b92f28fc199caa101a2fed2db74c3360316169d5..c2367a102b5c2f0b21f809e9c681338c4c2903a1 100644

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

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

@@ -33,7 +33,7 @@

#include "core/css/CSSDefaultStyleSheets.h"

#include "core/css/CSSPrimitiveValueMappings.h"

#include "core/css/CSSToLengthConversionData.h"

-#include "core/css/MediaValuesDynamic.h"

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

#include "core/css/StylePropertySet.h"

#include "core/css/StyleRule.h"

#include "core/css/StyleSheetContents.h"

@@ -49,10 +49,8 @@ namespace blink {

ViewportStyleResolver::ViewportStyleResolver(Document& document)

: m_document(document), m_hasAuthorStyle(false) {

DCHECK(document.frame());

- // TODO(rune@opera.com): The MediaValues object passed here should reflect the

- // initial viewport, not the actual viewport. See https://crbug.com/332763

- m_initialViewportMedium =

- new MediaQueryEvaluator(MediaValuesDynamic::create(document.frame()));

+ m_initialViewportMedium = new MediaQueryEvaluator(

+ MediaValuesInitialViewport::create(*document.frame()));

}

void ViewportStyleResolver::collectViewportRulesFromUASheets() {