Reviewed by Chris.

        One of the assertions from my previous checkin fired, so
        I made this code more robust.

        * WebCoreSupport.subproj/WebBridge.m:
        (-[WebBridge _preferences]):
        new helper method, returns global preferences if webView is nil,
        otherwise returns webView's preferences
        (-[WebBridge getObjectCacheSize]):
        use new helper method, remove now-unnecessary assert
        (-[WebBridge _retrieveKeyboardUIModeFromPreferences:]):
        ditto

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 67d7ac5cb823b6f6b65991ff5f4a2ac273c6f128..62cba84913902b9ee82e825529ac35f4b9484ff9 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2004-12-16  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris.
+        
+        One of the assertions from my previous checkin fired, so
+        I made this code more robust.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge _preferences]):
+        new helper method, returns global preferences if webView is nil,
+        otherwise returns webView's preferences
+        (-[WebBridge getObjectCacheSize]):
+        use new helper method, remove now-unnecessary assert
+        (-[WebBridge _retrieveKeyboardUIModeFromPreferences:]):
+        ditto
+
 2004-12-16  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 1544fab08b2900b7ba4c891c5a4dd6c9e63aab25..e8fc933fbf7f9e5dac8e879379c22d6546ca962f 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -970,12 +970,19 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
 static BOOL loggedObjectCacheSize = NO;
 #endif
 
+- (WebPreferences *)_preferences
+{
+    WebPreferences *prefs = [[_frame webView] preferences];
+    if (prefs == nil) {
+        prefs = [WebPreferences standardPreferences];
+    }
+    return prefs;
+}
 
 -(int)getObjectCacheSize
 {
     vm_size_t memSize = WebSystemMainMemory();
-    ASSERT([_frame webView]);
-    int cacheSize = [[[_frame webView] preferences] _objectCacheSize];
+    int cacheSize = [[self _preferences] _objectCacheSize];
     int multiplier = 1;
     if (memSize >= 1024 * 1024 * 1024)
         multiplier = 4;
@@ -1215,8 +1222,7 @@ static id <WebFormDelegate> formDelegate(WebBridge *self)
     _keyboardUIMode = (mode & 0x2) ? WebCoreKeyboardAccessFull : WebCoreKeyboardAccessDefault;
     
     // check for tabbing to links
-    ASSERT([_frame webView]);
-    if ([[[_frame webView] preferences] tabsToLinks]) {
+    if ([[self _preferences] tabsToLinks]) {
         _keyboardUIMode |= WebCoreKeyboardAccessTabsToLinks;
     }
 }