summaryrefslogtreecommitdiff
path: root/Source/WebCore/testing/InternalSettings.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-27 21:51:42 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-27 21:51:42 +0200
commitbe01689f43cf6882cf670d33df49ead1f570c53a (patch)
tree4bb2161d8983b38e3e7ed37b4a50303bfd5e2e85 /Source/WebCore/testing/InternalSettings.cpp
parenta89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (diff)
downloadqtwebkit-be01689f43cf6882cf670d33df49ead1f570c53a.tar.gz
Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)
Diffstat (limited to 'Source/WebCore/testing/InternalSettings.cpp')
-rw-r--r--Source/WebCore/testing/InternalSettings.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index 8594b704d..d99335b91 100644
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -100,6 +100,7 @@ InternalSettings::InternalSettings(Frame* frame)
#endif
, m_originalEditingBehavior(settings()->editingBehaviorType())
, m_originalFixedPositionCreatesStackingContext(settings()->fixedPositionCreatesStackingContext())
+ , m_originalSyncXHRInDocumentsEnabled(settings()->syncXHRInDocumentsEnabled())
{
}
@@ -113,6 +114,7 @@ void InternalSettings::restoreTo(Settings* settings)
#endif
settings->setEditingBehaviorType(m_originalEditingBehavior);
settings->setFixedPositionCreatesStackingContext(m_originalFixedPositionCreatesStackingContext);
+ settings->setSyncXHRInDocumentsEnabled(m_originalSyncXHRInDocumentsEnabled);
}
Settings* InternalSettings::settings() const
@@ -352,4 +354,10 @@ void InternalSettings::setFixedPositionCreatesStackingContext(bool creates, Exce
settings()->setFixedPositionCreatesStackingContext(creates);
}
+void InternalSettings::setSyncXHRInDocumentsEnabled(bool creates, ExceptionCode& ec)
+{
+ InternalSettingsGuardForFrameView();
+ settings()->setSyncXHRInDocumentsEnabled(creates);
+}
+
}