Diff
Modified: trunk/Source/WebKit/win/ChangeLog (188004 => 188005)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-05 23:50:19 UTC (rev 188005)
@@ -1,3 +1,19 @@
+2015-08-05 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Allow display of mixed content on Windows by default
+ https://bugs.webkit.org/show_bug.cgi?id=147693
+ <rdar://problem/22059707>
+
+ Reviewed by Alex Christensen.
+
+ * Interfaces/IWebPreferencesPrivate.idl: Add preference accessor
+ to allow getting/setting use of insecure content.
+ * WebPreferenceKeysPrivate.h: Add new key for preference.
+ * WebPreferences.cpp: Implement preference accessor.
+ * WebPreferences.h:
+ * WebView.cpp: Set WebCore settings to match prefernces for
+ loading mixed content.
+
2015-08-05 Filip Pizlo <fpi...@apple.com>
Unreviewed, roll out http://trac.webkit.org/changeset/187972.
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (188004 => 188005)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-08-05 23:50:19 UTC (rev 188005)
@@ -166,4 +166,6 @@
{
HRESULT _javascript_RuntimeFlags([out, retval] unsigned* flags);
HRESULT setJavaScriptRuntimeFlags([in] unsigned flags);
+ HRESULT allowDisplayAndRunningOfInsecureContent([out, retval] BOOL* enabled);
+ HRESULT setAllowDisplayAndRunningOfInsecureContent([in] BOOL enabled);
}
\ No newline at end of file
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (188004 => 188005)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-08-05 23:50:19 UTC (rev 188005)
@@ -163,3 +163,5 @@
#define WebKitMockScrollbarsEnabledPreferenceKey "WebKitMockScrollbarsEnabled"
#define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
+
+#define WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey "WebKitAllowDisplayAndRunningOfInsecureContent"
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (188004 => 188005)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-08-05 23:50:19 UTC (rev 188005)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2011, 2014-2015 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -293,6 +293,8 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitRequestAnimationFrameEnabledPreferenceKey), kCFBooleanFalse);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey), kCFBooleanTrue);
+
defaultSettings = defaults;
}
@@ -1842,3 +1844,15 @@
setBoolValue(WebKitEnableInheritURIQueryComponentPreferenceKey, enabled);
return S_OK;
}
+
+HRESULT WebPreferences::allowDisplayAndRunningOfInsecureContent(BOOL* enabled)
+{
+ *enabled = boolValueForKey(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setAllowDisplayAndRunningOfInsecureContent(BOOL enabled)
+{
+ setBoolValue(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey, enabled);
+ return S_OK;
+}
Modified: trunk/Source/WebKit/win/WebPreferences.h (188004 => 188005)
--- trunk/Source/WebKit/win/WebPreferences.h 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/WebPreferences.h 2015-08-05 23:50:19 UTC (rev 188005)
@@ -490,6 +490,8 @@
// IWebPreferencesPrivate2
virtual HRESULT STDMETHODCALLTYPE _javascript_RuntimeFlags(unsigned*);
virtual HRESULT STDMETHODCALLTYPE setJavaScriptRuntimeFlags(unsigned);
+ virtual HRESULT STDMETHODCALLTYPE allowDisplayAndRunningOfInsecureContent(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setAllowDisplayAndRunningOfInsecureContent(BOOL);
// WebPreferences
Modified: trunk/Source/WebKit/win/WebView.cpp (188004 => 188005)
--- trunk/Source/WebKit/win/WebView.cpp 2015-08-05 23:50:06 UTC (rev 188004)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-05 23:50:19 UTC (rev 188005)
@@ -5248,6 +5248,12 @@
return hr;
settings.setEnableInheritURIQueryComponent(enabled);
+ hr = prefsPrivate->allowDisplayAndRunningOfInsecureContent(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setAllowDisplayOfInsecureContent(!!enabled);
+ settings.setAllowRunningOfInsecureContent(!!enabled);
+
hr = prefsPrivate->_javascript_RuntimeFlags(&_javascript_RuntimeFlags);
if (FAILED(hr))
return hr;
