<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188005] trunk/Source/WebKit/win</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188005">188005</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 16:50:19 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl">trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferenceKeysPrivateh">trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencesh">trunk/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-05 Brent Fulgham <bfulgham@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.
+
</ins><span class="cx"> 2015-08-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, roll out http://trac.webkit.org/changeset/187972.
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -166,4 +166,6 @@
</span><span class="cx"> {
</span><span class="cx"> HRESULT javaScriptRuntimeFlags([out, retval] unsigned* flags);
</span><span class="cx"> HRESULT setJavaScriptRuntimeFlags([in] unsigned flags);
</span><ins>+ HRESULT allowDisplayAndRunningOfInsecureContent([out, retval] BOOL* enabled);
+ HRESULT setAllowDisplayAndRunningOfInsecureContent([in] BOOL enabled);
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -163,3 +163,5 @@
</span><span class="cx"> #define WebKitMockScrollbarsEnabledPreferenceKey "WebKitMockScrollbarsEnabled"
</span><span class="cx">
</span><span class="cx"> #define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
</span><ins>+
+#define WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey "WebKitAllowDisplayAndRunningOfInsecureContent"
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2011, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -293,6 +293,8 @@
</span><span class="cx">
</span><span class="cx"> CFDictionaryAddValue(defaults, CFSTR(WebKitRequestAnimationFrameEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx">
</span><ins>+ CFDictionaryAddValue(defaults, CFSTR(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey), kCFBooleanTrue);
+
</ins><span class="cx"> defaultSettings = defaults;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1842,3 +1844,15 @@
</span><span class="cx"> setBoolValue(WebKitEnableInheritURIQueryComponentPreferenceKey, enabled);
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><ins>+
+HRESULT WebPreferences::allowDisplayAndRunningOfInsecureContent(BOOL* enabled)
+{
+ *enabled = boolValueForKey(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey);
+ return S_OK;
+}
+
+HRESULT WebPreferences::setAllowDisplayAndRunningOfInsecureContent(BOOL enabled)
+{
+ setBoolValue(WebKitAllowDisplayAndRunningOfInsecureContentPreferenceKey, enabled);
+ return S_OK;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.h (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -490,6 +490,8 @@
</span><span class="cx"> // IWebPreferencesPrivate2
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE javaScriptRuntimeFlags(unsigned*);
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setJavaScriptRuntimeFlags(unsigned);
</span><ins>+ virtual HRESULT STDMETHODCALLTYPE allowDisplayAndRunningOfInsecureContent(BOOL*);
+ virtual HRESULT STDMETHODCALLTYPE setAllowDisplayAndRunningOfInsecureContent(BOOL);
</ins><span class="cx">
</span><span class="cx"> // WebPreferences
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (188004 => 188005)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5248,6 +5248,12 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings.setEnableInheritURIQueryComponent(enabled);
</span><span class="cx">
</span><ins>+ hr = prefsPrivate->allowDisplayAndRunningOfInsecureContent(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings.setAllowDisplayOfInsecureContent(!!enabled);
+ settings.setAllowRunningOfInsecureContent(!!enabled);
+
</ins><span class="cx"> hr = prefsPrivate->javaScriptRuntimeFlags(&javaScriptRuntimeFlags);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span></span></pre>
</div>
</div>
</body>
</html>