Source/core/dom/StyleSheetCollection.cpp - Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

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/dom/StyleSheetCollection.cpp

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 4 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

« Source/core/css/resolver/ViewportStyleResolver.cpp ('K') | « Source/core/dom/Document.cpp ('k') | Source/core/dom/ViewportArguments.h » ('j') | Source/core/page/PageScaleConstraintsSet.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/StyleSheetCollection.cpp

diff --git a/Source/core/dom/StyleSheetCollection.cpp b/Source/core/dom/StyleSheetCollection.cpp

index a665b8074de6d5510f73e4b4e48524d00b0f2cb9..3dff28f66e8d07016bddbb13981b87ce05ee8038 100644

--- a/Source/core/dom/StyleSheetCollection.cpp

+++ b/Source/core/dom/StyleSheetCollection.cpp

@@ -40,6 +40,7 @@

#include "core/dom/shadow/ShadowRoot.h"

#include "core/html/HTMLIFrameElement.h"

#include "core/html/HTMLLinkElement.h"

+#include "core/html/HTMLMetaElement.h"

#include "core/html/HTMLStyleElement.h"

#include "core/page/Settings.h"

#include "core/svg/SVGStyleElement.h"

@@ -217,7 +218,7 @@ void StyleSheetCollectionForDocument::collectStyleSheets(DocumentStyleSheetColle

sheet = pi->sheet();

if (sheet && !sheet->disabled() && sheet->isCSSStyleSheet())

activeSheet = static_cast<CSSStyleSheet*>(sheet);

- } else if ((n->isHTMLElement() && (n->hasTagName(linkTag) || n->hasTagName(styleTag))) || (n->isSVGElement() && n->hasTagName(SVGNames::styleTag))) {

+ } else if ((n->isHTMLElement() && (n->hasTagName(linkTag) || n->hasTagName(styleTag) || n->hasTagName(metaTag))) || (n->isSVGElement() && n->hasTagName(SVGNames::styleTag))) {

Element* e = toElement(n);

AtomicString title = e->getAttribute(titleAttr);

bool enabledViaScript = false;

@@ -242,8 +243,10 @@ void StyleSheetCollectionForDocument::collectStyleSheets(DocumentStyleSheetColle

title = nullAtom;

} else if (n->isSVGElement() && n->hasTagName(SVGNames::styleTag)) {

sheet = static_cast<SVGStyleElement*>(n)->sheet();

- } else {

+ } else if (n->hasTagName(styleTag)) {

sheet = static_cast<HTMLStyleElement*>(n)->sheet();

+ } else {

+ sheet = static_cast<HTMLMetaElement*>(n)->sheet();

}

if (sheet && !sheet->disabled() && sheet->isCSSStyleSheet())