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.


git-svn-id: svn://svn.chromium.org/blink/trunk@18756 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit/ChangeLog

+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>
 
         Reviewed by John.

third_party/WebKit/WebKit/WebView/WebHTMLView.mm

@@ -1901,9 +1901,9 @@ static WebHTMLView *lastHitView = nil;
 {
     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];
 }
 
@@ -3073,13 +3073,14 @@ done:
 - (void)setDataSource:(WebDataSource *)dataSource 
 {
     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];
 }
 
 - (void)dataSourceUpdated:(WebDataSource *)dataSource