[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 b4aaf635d949342a86223276725a5128c52bcec9
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 19:24:48 2010 +0000

    2010-09-23  Nate Chapin  <japhet at chromium.org>
    
            Unreviewed, build fix.
    
            Move hyperlinkAuditingEnabled to IWebPreferencesPrivate.idl
            and touch WebKit.idl
    
            * Interfaces/IWebPreferences.idl:
            * Interfaces/IWebPreferencesPrivate.idl:
            * Interfaces/WebKit.idl:
            * WebView.cpp:
            (WebView::notifyPreferencesChanged):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ab90f7d..dccce16 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -2,6 +2,19 @@
 
         Unreviewed, build fix.
 
+        Move hyperlinkAuditingEnabled to IWebPreferencesPrivate.idl
+        and touch WebKit.idl
+
+        * Interfaces/IWebPreferences.idl:
+        * Interfaces/IWebPreferencesPrivate.idl:
+        * Interfaces/WebKit.idl:
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
+2010-09-23  Nate Chapin  <japhet at chromium.org>
+
+        Unreviewed, build fix.
+
         Look for hyperlinkAuditingEnabled in the right set of preferences.
 
         * WebView.cpp:
diff --git a/WebKit/win/Interfaces/IWebPreferences.idl b/WebKit/win/Interfaces/IWebPreferences.idl
index 678557b..4fb3de8 100644
--- a/WebKit/win/Interfaces/IWebPreferences.idl
+++ b/WebKit/win/Interfaces/IWebPreferences.idl
@@ -198,7 +198,4 @@ interface IWebPreferences : IUnknown
 
     HRESULT editingBehavior([out, retval] WebKitEditingBehavior* editingBehavior);
     HRESULT setEditingBehavior([in] WebKitEditingBehavior behavior);
-
-    HRESULT hyperlinkAuditingEnabled(BOOL *hyperlinkAuditingEnabled);
-    HRESULT setHyperlinkAuditingEnabled(BOOL hyperlinkAuditingEnabled);
 }
diff --git a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
index bca8d6f..68cbcf3 100644
--- a/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
+++ b/WebKit/win/Interfaces/IWebPreferencesPrivate.idl
@@ -118,4 +118,7 @@ interface IWebPreferencesPrivate : IUnknown
 
     HRESULT memoryInfoEnabled([out, retval] BOOL *enabled);
     HRESULT setMemoryInfoEnabled([in] BOOL enabled);
+
+    HRESULT hyperlinkAuditingEnabled(BOOL *hyperlinkAuditingEnabled);
+    HRESULT setHyperlinkAuditingEnabled(BOOL hyperlinkAuditingEnabled);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index d25cdfe..8938501 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -20,7 +20,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 cpp_quote("/*")
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 99a6599..2effb06 100755
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -4663,11 +4663,6 @@ 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) {
@@ -4782,6 +4777,11 @@ HRESULT WebView::notifyPreferencesChanged(IWebNotification* notification)
     if (FAILED(hr))
         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