Diff
Modified: branches/safari-601.1-branch/Source/WebKit/win/ChangeLog (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/ChangeLog 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/ChangeLog 2015-08-06 23:48:16 UTC (rev 188094)
@@ -1,5 +1,25 @@
2015-08-06 Dana Burkart <dburk...@apple.com>
+ Merge r188005. rdar://problem/22059707
+
+ 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-06 Dana Burkart <dburk...@apple.com>
+
Merge r187894. rdar://problem/15779101
2015-08-04 Alex Christensen <achristen...@webkit.org>
Modified: branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-08-06 23:48:16 UTC (rev 188094)
@@ -168,4 +168,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: branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-08-06 23:48:16 UTC (rev 188094)
@@ -163,3 +163,5 @@
#define WebKitMockScrollbarsEnabledPreferenceKey "WebKitMockScrollbarsEnabled"
#define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
+
+#define WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey "WebKitAllowDisplayAndRunningOfInsecureContent"
Modified: branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.cpp 2015-08-06 23:48:16 UTC (rev 188094)
@@ -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: branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebPreferences.h 2015-08-06 23:48:16 UTC (rev 188094)
@@ -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: branches/safari-601.1-branch/Source/WebKit/win/WebView.cpp (188093 => 188094)
--- branches/safari-601.1-branch/Source/WebKit/win/WebView.cpp 2015-08-06 23:41:39 UTC (rev 188093)
+++ branches/safari-601.1-branch/Source/WebKit/win/WebView.cpp 2015-08-06 23:48:16 UTC (rev 188094)
@@ -5180,6 +5180,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;
