Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebKit2 / WebProcess / WebCoreSupport / qt / WebFrameNetworkingContext.cpp

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
index 5fcaa84..0248f70 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
@@ -29,6 +29,7 @@ namespace WebCore {
 WebFrameNetworkingContext::WebFrameNetworkingContext(Frame* frame)
     : FrameNetworkingContext(frame)
     , m_originatingObject(0)
+    , m_mimeSniffingEnabled(true)
 {
 }
 
@@ -47,4 +48,9 @@ QNetworkAccessManager* WebFrameNetworkingContext::networkAccessManager() const
     return WebKit::WebProcess::shared().networkAccessManager();
 }
 
+bool WebFrameNetworkingContext::mimeSniffingEnabled() const
+{
+    return m_mimeSniffingEnabled;
+}
+
 }