| Index: third_party/WebKit/Source/core/dom/Document.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
|
| index 7e71bc5bcce2252168e86b66841384409382ce42..fc6a38b823b794797a432f4060afe9b6c7b95034 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Document.cpp
|
| @@ -2576,7 +2576,7 @@ AXObjectCache* Document::existingAXObjectCache() const {
|
|
|
| AXObjectCache* Document::axObjectCache() const {
|
| Settings* settings = this->settings();
|
| - if (!settings || !settings->accessibilityEnabled())
|
| + if (!settings || !settings->GetAccessibilityEnabled())
|
| return 0;
|
|
|
| // The only document that actually has a AXObjectCache is the top-level
|
| @@ -2951,7 +2951,7 @@ void Document::implicitClose() {
|
| m_loadEventProgress = LoadEventCompleted;
|
|
|
| if (frame() && !layoutViewItem().isNull() &&
|
| - settings()->accessibilityEnabled()) {
|
| + settings()->GetAccessibilityEnabled()) {
|
| if (AXObjectCache* cache = axObjectCache()) {
|
| if (this == &axObjectCacheOwner())
|
| cache->handleLoadComplete(this);
|
| @@ -3438,7 +3438,7 @@ void Document::maybeHandleHttpRefresh(const String& content,
|
|
|
| bool Document::shouldMergeWithLegacyDescription(
|
| ViewportDescription::Type origin) const {
|
| - return settings() && settings()->viewportMetaMergeContentQuirk() &&
|
| + return settings() && settings()->GetViewportMetaMergeContentQuirk() &&
|
| m_legacyViewportDescription.isMetaViewportType() &&
|
| m_legacyViewportDescription.type == origin;
|
| }
|
| @@ -3465,7 +3465,7 @@ void Document::setViewportDescription(
|
|
|
| ViewportDescription Document::viewportDescription() const {
|
| ViewportDescription appliedViewportDescription = m_viewportDescription;
|
| - bool viewportMetaEnabled = settings() && settings()->viewportMetaEnabled();
|
| + bool viewportMetaEnabled = settings() && settings()->GetViewportMetaEnabled();
|
| if (m_legacyViewportDescription.type !=
|
| ViewportDescription::UserAgentStyleSheet &&
|
| viewportMetaEnabled)
|
| @@ -4495,7 +4495,7 @@ bool Document::isInInvisibleSubframe() const {
|
| }
|
|
|
| String Document::cookie(ExceptionState& exceptionState) const {
|
| - if (settings() && !settings()->cookieEnabled())
|
| + if (settings() && !settings()->GetCookieEnabled())
|
| return String();
|
|
|
| // FIXME: The HTML5 DOM spec states that this attribute can raise an
|
| @@ -4529,7 +4529,7 @@ String Document::cookie(ExceptionState& exceptionState) const {
|
| }
|
|
|
| void Document::setCookie(const String& value, ExceptionState& exceptionState) {
|
| - if (settings() && !settings()->cookieEnabled())
|
| + if (settings() && !settings()->GetCookieEnabled())
|
| return;
|
|
|
| // FIXME: The HTML5 DOM spec states that this attribute can raise an
|
| @@ -5521,17 +5521,17 @@ void Document::initSecurityContext(const DocumentInit& initializer) {
|
| enforceSuborigin(*getSecurityOrigin()->suborigin());
|
|
|
| if (Settings* settings = initializer.settings()) {
|
| - if (!settings->webSecurityEnabled()) {
|
| + if (!settings->GetWebSecurityEnabled()) {
|
| // Web security is turned off. We should let this document access every
|
| // other document. This is used primary by testing harnesses for web
|
| // sites.
|
| getSecurityOrigin()->grantUniversalAccess();
|
| } else if (getSecurityOrigin()->isLocal()) {
|
| - if (settings->allowUniversalAccessFromFileURLs()) {
|
| + if (settings->GetAllowUniversalAccessFromFileURLs()) {
|
| // Some clients want local URLs to have universal access, but that
|
| // setting is dangerous for other clients.
|
| getSecurityOrigin()->grantUniversalAccess();
|
| - } else if (!settings->allowFileAccessFromFileURLs()) {
|
| + } else if (!settings->GetAllowFileAccessFromFileURLs()) {
|
| // Some clients do not want local URLs to have access to other local
|
| // URLs.
|
| getSecurityOrigin()->blockLocalAccessFromLocalOrigin();
|
| @@ -5697,7 +5697,7 @@ void Document::initDNSPrefetch() {
|
| Settings* settings = this->settings();
|
|
|
| m_haveExplicitlyDisabledDNSPrefetch = false;
|
| - m_isDNSPrefetchEnabled = settings && settings->dnsPrefetchingEnabled() &&
|
| + m_isDNSPrefetchEnabled = settings && settings->GetDNSPrefetchingEnabled() &&
|
| getSecurityOrigin()->protocol() == "http";
|
|
|
| // Inherit DNS prefetch opt-out from parent frame
|
|
|