Changeset 162075 in webkit

Timestamp:

Jan 15, 2014, 9:46:58 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

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:]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPreferences.mm (modified) (8 diffs)
• WebView/WebView.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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:]):
+
 2014-01-14  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -71 +71 @@
 static NSMutableDictionary *webPreferencesInstances;
 
-static unsigned webPreferencesInstanceCountWithPrivateBrowsingEnabled;
-
 static bool contains(const char* const array[], int count, const char* item)
 {
@@ -267 +265 @@
     [[self class] _setInstance:self forIdentifier:_private->identifier.get()];
 
-    [self _updatePrivateBrowsingStateFrom:NO to:[self privateBrowsingEnabled]];
-
 #if PLATFORM(IOS)
     if (sendChangeNotification) {
@@ -325 +321 @@
     } else {
         [[self class] _setInstance:self forIdentifier:_private->identifier.get()];
-        [self _updatePrivateBrowsingStateFrom:NO to:[self privateBrowsingEnabled]];
     }
 
@@ -366 +361 @@
     }
 #else
-    // FIXME: This check is necessary to avoid recursion (see <rdar://problem/9564337>), but it also makes _standardPreferences construction not thread safe.
     if (_standardPreferences)
         return _standardPreferences;
@@ -607 +601 @@
 - (void)dealloc
 {
-    [self _updatePrivateBrowsingStateFrom:[self privateBrowsingEnabled] to:NO];
-
     delete _private;
     [super dealloc];
@@ -1081 +1073 @@
 #endif
 
-- (void)setPrivateBrowsingEnabled:(BOOL)enabled
-{
-    [self _updatePrivateBrowsingStateFrom:[self privateBrowsingEnabled] to:enabled];
-    [self _setBoolValue:enabled forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
+- (void)setPrivateBrowsingEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitPrivateBrowsingEnabledPreferenceKey];
 }
 
@@ -1090 +1081 @@
 {
     return [self _boolValueForKey:WebKitPrivateBrowsingEnabledPreferenceKey];
-}
-
-- (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();
-    }
 }
 
@@ -2290 +2266 @@
 - (void)_invalidateCachedPreferences
 {
-    BOOL privateBrowsingWasEnabled = [self privateBrowsingEnabled];
-
     dispatch_barrier_sync(_private->readWriteQueue, ^{
         if (_private->values)
             _private->values = adoptNS([[NSMutableDictionary alloc] init]);
     });
-
-    [self _updatePrivateBrowsingStateFrom:privateBrowsingWasEnabled to:[self privateBrowsingEnabled]];
 
     // Tell any live WebViews to refresh their preferences

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -2317 +2317 @@
     settings.setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
 #endif
-    settings.setPrivateBrowsingEnabled([preferences privateBrowsingEnabled]);
+
+    bool privateBrowsingEnabled = [preferences privateBrowsingEnabled];
+#if PLATFORM(MAC) || USE(CFNETWORK)
+    if (privateBrowsingEnabled)
+        WebFrameNetworkingContext::ensurePrivateBrowsingSession();
+    else
+        WebFrameNetworkingContext::destroyPrivateBrowsingSession();
+#endif
+    settings.setPrivateBrowsingEnabled(privateBrowsingEnabled);
+
     settings.setSansSerifFontFamily([preferences sansSerifFontFamily]);
     settings.setSerifFontFamily([preferences serifFontFamily]);