[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[japhet at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d308d025e8fd3360e6aafcedafa82076a306eeab
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 18:19:13 2010 +0000

    2010-09-23  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, build fix.
    
            Look for hyperlinkAuditingEnabled in the right set of preferences.
    
            * WebView.cpp:
            (WebView::notifyPreferencesChanged):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68169 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 1a09dd1..6023491 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-23  Nate Chapin  <japhet at chromium.org>
 
+        Unreviewed, build fix.
+
+        Add a missing comma in webkitwebsettings.cpp.
+
+        * webkit/webkitwebsettings.cpp:
+
+2010-09-23  Nate Chapin  <japhet at chromium.org>
+
         Reviewed by Darin Fisher.
 
         Add hyperlink auditing settings (i.e., <a ping>).
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 0b7cbd7..2bd7db5 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -158,7 +158,7 @@ enum {
     PROP_ENABLE_SITE_SPECIFIC_QUIRKS,
     PROP_ENABLE_PAGE_CACHE,
     PROP_AUTO_RESIZE_WINDOW,
-    PROP_ENABLE_JAVA_APPLET
+    PROP_ENABLE_JAVA_APPLET,
     PROP_ENABLE_HYPERLINK_AUDITING
 };
 
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 406694b..ab90f7d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-23  Nate Chapin  <japhet at chromium.org>
 
+        Unreviewed, build fix.
+
+        Look for hyperlinkAuditingEnabled in the right set of preferences.
+
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
+2010-09-23  Nate Chapin  <japhet at chromium.org>
+
         Reviewed by Darin Fisher.
 
         Add hyperlink auditing settings (i.e., <a ping>).
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 5ea707a..99a6599 100755
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -4663,6 +4663,11 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
     if (FAILED(hr))
         return hr;
     settings->setFontRenderingMode(smoothingType != FontSmoothingTypeWindows ? NormalRenderingMode : AlternateRenderingMode);
+    
+    hr = preferences->hyperlinkAuditingEnabled(&enabled);
+    if (FAILED(hr))
+        return hr;
+    settings->setHyperlinkAuditingEnabled(enabled);
 
     COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences);
     if (prefsPrivate) {
@@ -4778,11 +4783,6 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
         return hr;
     settings->setMemoryInfoEnabled(enabled);
 
-    hr = prefsPrivate->hyperlinkAuditingEnabled(&enabled);
-    if (FAILED(hr))
-        return hr;
-    settings->setHyperlinkAuditingEnabled(enabled);
-
     if (!m_closeWindowTimer)
         m_mainFrame->invalidate(); // FIXME
 

-- 
WebKit Debian packaging