<!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>[182928] trunk/Source/WebKit/mac</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/182928">182928</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-04-16 17:28:20 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose JavaScriptMarkupEnabled preference for WebKit1
<rdar://problem/19939450>
https://bugs.webkit.org/show_bug.cgi?id=143855
Reviewed by Dan Bernstein.
* WebView/WebPreferenceKeysPrivate.h:
Add new key, WebKitJavaScriptMarkupEnabledPreferenceKey
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
Initialize WebKitJavaScriptMarkupEnabledPreferenceKey to YES.
(-[WebPreferences isJavaScriptMarkupEnabled]):
(-[WebPreferences setJavaScriptMarkupEnabled:]):
Implement getter/setter.
* WebView/WebPreferencesPrivate.h:
Add new property, javaScriptMarkupEnabled.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):
Map the new preference to WebCore's scriptMarkupEnabled setting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182927 => 182928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-17 00:25:14 UTC (rev 182927)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-17 00:28:20 UTC (rev 182928)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-04-16 Sam Weinig <sam@webkit.org>
+
+ Expose JavaScriptMarkupEnabled preference for WebKit1
+ <rdar://problem/19939450>
+ https://bugs.webkit.org/show_bug.cgi?id=143855
+
+ Reviewed by Dan Bernstein.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ Add new key, WebKitJavaScriptMarkupEnabledPreferenceKey
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ Initialize WebKitJavaScriptMarkupEnabledPreferenceKey to YES.
+
+ (-[WebPreferences isJavaScriptMarkupEnabled]):
+ (-[WebPreferences setJavaScriptMarkupEnabled:]):
+ Implement getter/setter.
+
+ * WebView/WebPreferencesPrivate.h:
+ Add new property, javaScriptMarkupEnabled.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+ Map the new preference to WebCore's scriptMarkupEnabled setting.
+
</ins><span class="cx"> 2015-04-15 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Disable "Save to Downloads" option for local files
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (182927 => 182928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-04-17 00:25:14 UTC (rev 182927)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-04-17 00:28:20 UTC (rev 182928)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #define WebKitShrinksStandaloneImagesToFitPreferenceKey @"WebKitShrinksStandaloneImagesToFit"
</span><span class="cx"> #define WebKitJavaEnabledPreferenceKey @"WebKitJavaEnabled"
</span><span class="cx"> #define WebKitJavaScriptEnabledPreferenceKey @"WebKitJavaScriptEnabled"
</span><ins>+#define WebKitJavaScriptMarkupEnabledPreferenceKey @"WebKitJavaScriptMarkupEnabled"
</ins><span class="cx"> #define WebKitWebSecurityEnabledPreferenceKey @"WebKitWebSecurityEnabled"
</span><span class="cx"> #define WebKitAllowUniversalAccessFromFileURLsPreferenceKey @"WebKitAllowUniversalAccessFromFileURLs"
</span><span class="cx"> #define WebKitAllowFileAccessFromFileURLsPreferenceKey @"WebKitAllowFileAccessFromFileURLs"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (182927 => 182928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-17 00:25:14 UTC (rev 182927)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-04-17 00:28:20 UTC (rev 182928)
</span><span class="lines">@@ -432,6 +432,7 @@
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitJavaEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitJavaScriptEnabledPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:YES], WebKitJavaScriptMarkupEnabledPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:YES], WebKitWebSecurityEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowUniversalAccessFromFileURLsPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowFileAccessFromFileURLsPreferenceKey,
</span><span class="lines">@@ -2494,6 +2495,16 @@
</span><span class="cx"> return [self _boolValueForKey:WebKitAntialiasedFontDilationEnabledKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)javaScriptMarkupEnabled
+{
+ return [self _boolValueForKey:WebKitJavaScriptMarkupEnabledPreferenceKey];
+}
+
+- (void)setJavaScriptMarkupEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitJavaScriptMarkupEnabledPreferenceKey];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebInternal)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (182927 => 182928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-04-17 00:25:14 UTC (rev 182927)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-04-17 00:28:20 UTC (rev 182928)
</span><span class="lines">@@ -439,6 +439,8 @@
</span><span class="cx"> - (void)setAntialiasedFontDilationEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)antialiasedFontDilationEnabled;
</span><span class="cx">
</span><ins>+@property (nonatomic) BOOL javaScriptMarkupEnabled;
+
</ins><span class="cx"> #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</span><span class="cx"> - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (182927 => 182928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-17 00:25:14 UTC (rev 182927)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-04-17 00:28:20 UTC (rev 182928)
</span><span class="lines">@@ -2218,6 +2218,7 @@
</span><span class="cx"> settings.setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
</span><span class="cx"> settings.setJavaEnabled([preferences isJavaEnabled]);
</span><span class="cx"> settings.setScriptEnabled([preferences isJavaScriptEnabled]);
</span><ins>+ settings.setScriptMarkupEnabled([preferences javaScriptMarkupEnabled]);
</ins><span class="cx"> settings.setWebSecurityEnabled([preferences isWebSecurityEnabled]);
</span><span class="cx"> settings.setAllowUniversalAccessFromFileURLs([preferences allowUniversalAccessFromFileURLs]);
</span><span class="cx"> settings.setAllowFileAccessFromFileURLs([preferences allowFileAccessFromFileURLs]);
</span></span></pre>
</div>
</div>
</body>
</html>