Build fix.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 13 Aug 2011 07:00:48 +0000 (07:00 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 13 Aug 2011 07:00:48 +0000 (07:00 +0000)
* WebView.cpp:
(WebView::notifyPreferencesChanged):

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

Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp

index 372c3159c48922056b0d71b0bcd9dbc0a4914b51..f2cc9693eda1b2b5bb8753722397c2cef5897629 100644 (file)
@@ -1,3 +1,10 @@
+2011-08-13  Dan Bernstein  <mitz@apple.com>
+
+        Build fix.
+
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
 2011-08-12  Dan Bernstein  <mitz@apple.com>
 
         Add an option to automatically show tooltips (with the full text) over truncated text
index 098e56295808a6244681eb596bc04226d57c166d..dec4ae999ecb4f799ba89a744c7401ab3305af6a 100644 (file)
@@ -4719,12 +4719,6 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
 
     settings->setShowsURLsInToolTips(false);
 
-    hr = preferences->showsToolTipOverTruncatedText(&enabled);
-    if (FAILED(hr))
-        return hr;
-
-    settings->setShowsToolTipOverTruncatedText(enabled);
-
     settings->setForceFTPDirectoryListings(true);
     settings->setDeveloperExtrasEnabled(developerExtrasEnabled());
     settings->setNeedsSiteSpecificQuirks(s_allowSiteSpecificHacks);
@@ -4871,6 +4865,12 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
     settings->setUseHixie76WebSocketProtocol(enabled);
 #endif
 
+    hr = prefsPrivate->showsToolTipOverTruncatedText(&enabled);
+    if (FAILED(hr))
+        return hr;
+
+    settings->setShowsToolTipOverTruncatedText(enabled);
+
     if (!m_closeWindowTimer)
         m_mainFrame->invalidate(); // FIXME