Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: Source/core/html/HTMLMetaElement-in.cpp

Issue 26444008: Remove several Page.h includes in preparation for removing page/ dependencies from the rest of core (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
Index: Source/core/html/HTMLMetaElement-in.cpp
diff --git a/Source/core/html/HTMLMetaElement-in.cpp b/Source/core/html/HTMLMetaElement-in.cpp
index d96fa2cd08a99ed49aa0e5349a0c573a4938dbbd..c32724eed0179ae9763e27a8a8fbced9b436adff 100644
--- a/Source/core/html/HTMLMetaElement-in.cpp
+++ b/Source/core/html/HTMLMetaElement-in.cpp
@@ -25,7 +25,6 @@
#include "HTMLNames.h"
#include "core/dom/Document.h"
-#include "core/page/Page.h"
#include "core/page/Settings.h"
namespace WebCore {
@@ -196,7 +195,7 @@ Length HTMLMetaElement::parseViewportValueAsLength(const String& keyString, cons
if (value < 0)
return Length(); // auto
- if (!value && document().page() && document().page()->settings().viewportMetaZeroValuesQuirk()) {
+ if (!value && document().settings() && document().settings()->viewportMetaZeroValuesQuirk()) {
if (keyString == "width")
return Length(100, ViewportPercentageWidth);
if (keyString == "height")
@@ -239,7 +238,7 @@ float HTMLMetaElement::parseViewportValueAsZoom(const String& keyString, const S
if (value > 10.0)
reportViewportWarning(MaximumScaleTooLargeError, String(), String());
- if (!value && document().page() && document().page()->settings().viewportMetaZeroValuesQuirk())
+ if (!value && document().settings() && document().settings()->viewportMetaZeroValuesQuirk())
return ViewportDescription::ValueAuto;
return clampScaleValue(value);
@@ -399,7 +398,7 @@ void HTMLMetaElement::processViewportContentAttribute(const String& content, Vie
{
ASSERT(!content.isNull());
- if (!document().page() || !document().shouldOverrideLegacyViewport(origin))
+ if (!document().settings() || !document().shouldOverrideLegacyViewport(origin))
return;
ViewportDescription newDescriptionFromLegacyTag(origin);
@@ -413,12 +412,12 @@ void HTMLMetaElement::processViewportContentAttribute(const String& content, Vie
newDescriptionFromLegacyTag.minZoom = std::min(newDescriptionFromLegacyTag.minZoom, float(5));
}
- const Settings& settings = document().page()->settings();
+ const Settings* settings = document().settings();
if (newDescriptionFromLegacyTag.maxWidth.isAuto()) {
if (newDescriptionFromLegacyTag.zoom == ViewportDescription::ValueAuto) {
newDescriptionFromLegacyTag.minWidth = Length(ExtendToZoom);
- newDescriptionFromLegacyTag.maxWidth = Length(settings.layoutFallbackWidth(), Fixed);
+ newDescriptionFromLegacyTag.maxWidth = Length(settings->layoutFallbackWidth(), Fixed);
} else if (newDescriptionFromLegacyTag.maxHeight.isAuto()) {
newDescriptionFromLegacyTag.minWidth = Length(ExtendToZoom);
newDescriptionFromLegacyTag.maxWidth = Length(ExtendToZoom);

Powered by Google App Engine
This is Rietveld 408576698