1 files changed, 32 insertions, 22 deletions
diff --git a/chromium/third_party/WebKit/Source/core/loader/SubstituteData.h b/chromium/third_party/WebKit/Source/core/loader/SubstituteData.h
index 48f19283a24..82a1398a28c 100644
--- a/chromium/third_party/WebKit/Source/core/loader/SubstituteData.h
+++ b/chromium/third_party/WebKit/Source/core/loader/SubstituteData.h
@@ -33,32 +33,42 @@
 
 namespace WebCore {
 
-    class SubstituteData {
-    public:
-        SubstituteData() { }
+enum SubstituteDataLoadPolicy {
+    LoadNormally,
+    ForceSynchronousLoad
+};
 
-        SubstituteData(PassRefPtr<SharedBuffer> content, const AtomicString& mimeType, const AtomicString& textEncoding, const KURL& failingURL)
-            : m_content(content)
-            , m_mimeType(mimeType)
-            , m_textEncoding(textEncoding)
-            , m_failingURL(failingURL)
-        {
-        }
+class SubstituteData {
+public:
+    SubstituteData()
+        : m_substituteDataLoadPolicy(LoadNormally)
+    {
+    }
 
-        bool isValid() const { return m_content != 0; }
+    SubstituteData(PassRefPtr<SharedBuffer> content, const AtomicString& mimeType, const AtomicString& textEncoding, const KURL& failingURL, SubstituteDataLoadPolicy substituteDataLoadPolicy = LoadNormally)
+        : m_content(content)
+        , m_mimeType(mimeType)
+        , m_textEncoding(textEncoding)
+        , m_failingURL(failingURL)
+        , m_substituteDataLoadPolicy(substituteDataLoadPolicy)
+    {
+    }
 
-        const SharedBuffer* content() const { return m_content.get(); }
-        const AtomicString& mimeType() const { return m_mimeType; }
-        const AtomicString& textEncoding() const { return m_textEncoding; }
-        const KURL& failingURL() const { return m_failingURL; }
+    bool isValid() const { return m_content; }
 
-    private:
-        RefPtr<SharedBuffer> m_content;
-        AtomicString m_mimeType;
-        AtomicString m_textEncoding;
-        KURL m_failingURL;
-        KURL m_responseURL;
-    };
+    SharedBuffer* content() const { return m_content.get(); }
+    const AtomicString& mimeType() const { return m_mimeType; }
+    const AtomicString& textEncoding() const { return m_textEncoding; }
+    const KURL& failingURL() const { return m_failingURL; }
+    bool forceSynchronousLoad() const { return m_substituteDataLoadPolicy == ForceSynchronousLoad; }
+
+private:
+    RefPtr<SharedBuffer> m_content;
+    AtomicString m_mimeType;
+    AtomicString m_textEncoding;
+    KURL m_failingURL;
+    SubstituteDataLoadPolicy m_substituteDataLoadPolicy;
+};
 
 }