Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)

3 files changed, 11 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);
+}
+
 }
diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
index 7fea75dfb..92b1bdfeb 100644
--- a/Source/WebCore/testing/InternalSettings.h
+++ b/Source/WebCore/testing/InternalSettings.h
@@ -77,6 +77,7 @@ public:
     void setMediaPlaybackRequiresUserGesture(bool, ExceptionCode&);
     void setEditingBehavior(const String&, ExceptionCode&);
     void setFixedPositionCreatesStackingContext(bool, ExceptionCode&);
+    void setSyncXHRInDocumentsEnabled(bool, ExceptionCode&);
 
     void restoreTo(Settings*);
 
@@ -95,6 +96,7 @@ private:
 #endif
     EditingBehaviorType m_originalEditingBehavior;
     bool m_originalFixedPositionCreatesStackingContext;
+    bool m_originalSyncXHRInDocumentsEnabled;
 };
 
 } // namespace WebCore
diff --git a/Source/WebCore/testing/InternalSettings.idl b/Source/WebCore/testing/InternalSettings.idl
index 7b30179bd..2ef35f2ab 100644
--- a/Source/WebCore/testing/InternalSettings.idl
+++ b/Source/WebCore/testing/InternalSettings.idl
@@ -55,6 +55,7 @@ module window {
         void setMediaPlaybackRequiresUserGesture(in boolean enabled) raises(DOMException);
         void setEditingBehavior(in DOMString behavior) raises(DOMException);
         void setFixedPositionCreatesStackingContext(in boolean creates) raises(DOMException);
+        void setSyncXHRInDocumentsEnabled(in boolean enabled) raises(DOMException);
     };
 }