Changeset 18756 in webkit

Timestamp:

Jan 10, 2007 8:44:54 PM (17 years ago)

Author:

bdash

Message:

2007-01-10 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=11775 'Show URLs in Tool Tips' preference is ignored

• WebView/WebHTMLView.mm: (-[WebHTMLView _resetCachedWebPreferences:]): (-[WebHTMLView setDataSource:]): Added a call to _resetCachedWebPreferences:. Added an assertion that the view is not closed, instead of reopening it. Reopening should not occur, now that <​http://bugs.webkit.org/show_bug.cgi?id=12087> is fixed.

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebHTMLView.mm (modified) (2 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-01-10  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11775
+          'Show URLs in Tool Tips' preference is ignored
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _resetCachedWebPreferences:]):
+        (-[WebHTMLView setDataSource:]): Added a call to _resetCachedWebPreferences:.
+        Added an assertion that the view is not closed, instead of reopening it.
+        Reopening should not occur, now that <http://bugs.webkit.org/show_bug.cgi?id=12087>
+        is fixed.
+
 2007-01-10  Beth Dakin  <bdakin@apple.com>
 

trunk/WebKit/WebView/WebHTMLView.mm

@@ -1902 +1902 @@
     WebPreferences *preferences = [[self _webView] preferences];
     // Check for nil because we might not yet have an associated webView when this is called
-    if (preferences == nil) {
+    if (preferences == nil)
         preferences = [WebPreferences standardPreferences];
-    }
+
     _private->showsURLsInToolTips = [preferences showsURLsInToolTips];
 }
@@ -3074 +3074 @@
 {
     ASSERT(dataSource);
-    if (_private->dataSource == dataSource)
-        return;
-    ASSERT(!_private->dataSource);
-    _private->closed = NO; // setting a data source reopens a closed view
-    _private->dataSource = [dataSource retain];
-    [_private->pluginController setDataSource:dataSource];
-    [self addMouseMovedObserver];
+    if (_private->dataSource != dataSource) {
+        ASSERT(!_private->dataSource);
+        ASSERT(!_private->closed);
+        _private->dataSource = [dataSource retain];
+        [_private->pluginController setDataSource:dataSource];
+        [self addMouseMovedObserver];
+    }
+    [self _resetCachedWebPreferences:nil];
 }