<!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>[162075] 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/162075">162075</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-15 09:46:58 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/162054">r162054</a>.
http://trac.webkit.org/changeset/162054
https://bugs.webkit.org/show_bug.cgi?id=127053
Causes assertion failures in DumpRenderTree (Requested by ap
on #webkit).
* WebView/WebPreferences.mm:
(-[WebPreferences initWithIdentifier:sendChangeNotification:initWithIdentifier:]):
(-[WebPreferences initWithCoder:]):
(+[WebPreferences standardPreferences]):
(-[WebPreferences dealloc]):
(-[WebPreferences setPrivateBrowsingEnabled:]):
(-[WebPreferences _invalidateCachedPreferences]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</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 (162074 => 162075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-15 17:45:43 UTC (rev 162074)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-15 17:46:58 UTC (rev 162075)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-15 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r162054.
+ http://trac.webkit.org/changeset/162054
+ https://bugs.webkit.org/show_bug.cgi?id=127053
+
+ Causes assertion failures in DumpRenderTree (Requested by ap
+ on #webkit).
+
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences initWithIdentifier:sendChangeNotification:initWithIdentifier:]):
+ (-[WebPreferences initWithCoder:]):
+ (+[WebPreferences standardPreferences]):
+ (-[WebPreferences dealloc]):
+ (-[WebPreferences setPrivateBrowsingEnabled:]):
+ (-[WebPreferences _invalidateCachedPreferences]):
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2014-01-14 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when multiple WebView instances have different PrivateBrowsing settings
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (162074 => 162075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-01-15 17:45:43 UTC (rev 162074)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-01-15 17:46:58 UTC (rev 162075)
</span><span class="lines">@@ -70,8 +70,6 @@
</span><span class="cx"> static WebPreferences *_standardPreferences;
</span><span class="cx"> static NSMutableDictionary *webPreferencesInstances;
</span><span class="cx">
</span><del>-static unsigned webPreferencesInstanceCountWithPrivateBrowsingEnabled;
-
</del><span class="cx"> static bool contains(const char* const array[], int count, const char* item)
</span><span class="cx"> {
</span><span class="cx"> if (!item)
</span><span class="lines">@@ -266,8 +264,6 @@
</span><span class="cx">
</span><span class="cx"> [[self class] _setInstance:self forIdentifier:_private->identifier.get()];
</span><span class="cx">
</span><del>- [self _updatePrivateBrowsingStateFrom:NO to:[self privateBrowsingEnabled]];
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (sendChangeNotification) {
</span><span class="cx"> [self _postPreferencesChangedNotification];
</span><span class="lines">@@ -324,7 +320,6 @@
</span><span class="cx"> self = [instance retain];
</span><span class="cx"> } else {
</span><span class="cx"> [[self class] _setInstance:self forIdentifier:_private->identifier.get()];
</span><del>- [self _updatePrivateBrowsingStateFrom:NO to:[self privateBrowsingEnabled]];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="lines">@@ -365,7 +360,6 @@
</span><span class="cx"> [_standardPreferences setAutosaves:YES];
</span><span class="cx"> }
</span><span class="cx"> #else
</span><del>- // FIXME: This check is necessary to avoid recursion (see <rdar://problem/9564337>), but it also makes _standardPreferences construction not thread safe.
</del><span class="cx"> if (_standardPreferences)
</span><span class="cx"> return _standardPreferences;
</span><span class="cx">
</span><span class="lines">@@ -606,8 +600,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- [self _updatePrivateBrowsingStateFrom:[self privateBrowsingEnabled] to:NO];
-
</del><span class="cx"> delete _private;
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="lines">@@ -1080,10 +1072,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-- (void)setPrivateBrowsingEnabled:(BOOL)enabled
</del><ins>+- (void)setPrivateBrowsingEnabled:(BOOL)flag
</ins><span class="cx"> {
</span><del>- [self _updatePrivateBrowsingStateFrom:[self privateBrowsingEnabled] to:enabled];
- [self _setBoolValue:enabled forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
</del><ins>+ [self _setBoolValue:flag forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)privateBrowsingEnabled
</span><span class="lines">@@ -1091,21 +1082,6 @@
</span><span class="cx"> return [self _boolValueForKey:WebKitPrivateBrowsingEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_updatePrivateBrowsingStateFrom:(BOOL)wasEnabled to:(BOOL)enabled
-{
- if (enabled == wasEnabled)
- return;
- if (enabled > wasEnabled) {
- WebFrameNetworkingContext::ensurePrivateBrowsingSession();
- ++webPreferencesInstanceCountWithPrivateBrowsingEnabled;
- } else {
- ASSERT(webPreferencesInstanceCountWithPrivateBrowsingEnabled);
- --webPreferencesInstanceCountWithPrivateBrowsingEnabled;
- if (!webPreferencesInstanceCountWithPrivateBrowsingEnabled)
- WebFrameNetworkingContext::destroyPrivateBrowsingSession();
- }
-}
-
</del><span class="cx"> - (void)setUsesPageCache:(BOOL)usesPageCache
</span><span class="cx"> {
</span><span class="cx"> [self _setBoolValue:usesPageCache forKey:WebKitUsesPageCachePreferenceKey];
</span><span class="lines">@@ -2289,15 +2265,11 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (void)_invalidateCachedPreferences
</span><span class="cx"> {
</span><del>- BOOL privateBrowsingWasEnabled = [self privateBrowsingEnabled];
-
</del><span class="cx"> dispatch_barrier_sync(_private->readWriteQueue, ^{
</span><span class="cx"> if (_private->values)
</span><span class="cx"> _private->values = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- [self _updatePrivateBrowsingStateFrom:privateBrowsingWasEnabled to:[self privateBrowsingEnabled]];
-
</del><span class="cx"> // Tell any live WebViews to refresh their preferences
</span><span class="cx"> [self _postPreferencesChangedNotification];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (162074 => 162075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-15 17:45:43 UTC (rev 162074)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-15 17:46:58 UTC (rev 162075)
</span><span class="lines">@@ -2316,7 +2316,16 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
</span><span class="cx"> #endif
</span><del>- settings.setPrivateBrowsingEnabled([preferences privateBrowsingEnabled]);
</del><ins>+
+ bool privateBrowsingEnabled = [preferences privateBrowsingEnabled];
+#if PLATFORM(MAC) || USE(CFNETWORK)
+ if (privateBrowsingEnabled)
+ WebFrameNetworkingContext::ensurePrivateBrowsingSession();
+ else
+ WebFrameNetworkingContext::destroyPrivateBrowsingSession();
+#endif
+ settings.setPrivateBrowsingEnabled(privateBrowsingEnabled);
+
</ins><span class="cx"> settings.setSansSerifFontFamily([preferences sansSerifFontFamily]);
</span><span class="cx"> settings.setSerifFontFamily([preferences serifFontFamily]);
</span><span class="cx"> settings.setStandardFontFamily([preferences standardFontFamily]);
</span></span></pre>
</div>
</div>
</body>
</html>