Changeset 29862 in webkit

Timestamp:

Jan 29, 2008 6:45:51 PM (16 years ago)

Author:

Adam Roben

Message:

Fix Bug 16786: "Display images when page opens" preference affects Inspector

<​http://bugs.webkit.org/show_bug.cgi?id=16786>
<rdar://5712914>

Reviewed by Anders and Darin.

• WebInspectorClient.cpp: (WebInspectorClient::createPage): Create our own custom WebPreferences so that we won't be affected by global preference changes. This matches what Mac does.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebInspectorClient.cpp (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-01-29  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 16786: "Display images when page opens" preference affects
+        Inspector
+
+        <http://bugs.webkit.org/show_bug.cgi?id=16786>
+        <rdar://5712914>
+
+        Reviewed by Anders and Darin.
+
+        * WebInspectorClient.cpp:
+        (WebInspectorClient::createPage): Create our own custom WebPreferences
+        so that we won't be affected by global preference changes. This
+        matches what Mac does.
+
 2008-01-29  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebInspectorClient.cpp

@@ -116 +116 @@
     m_webView.adoptRef(WebView::createInstance());
 
+    // Keep preferences separate from the rest of the client, making sure we are using expected preference values.
+    // One reason this is good is that it keeps the inspector out of history via "private browsing".
+    COMPtr<WebPreferences> preferences(AdoptCOM, WebPreferences::createInstance());
+    if (FAILED(preferences->setAutosaves(FALSE)))
+        return 0;
+    if (FAILED(preferences->setPrivateBrowsingEnabled(TRUE)))
+        return 0;
+    if (FAILED(preferences->setLoadsImagesAutomatically(TRUE)))
+        return 0;
+    if (FAILED(preferences->setAuthorAndUserStylesEnabled(TRUE)))
+        return 0;
+    if (FAILED(preferences->setAllowsAnimatedImages(TRUE)))
+        return 0;
+    if (FAILED(preferences->setLoadsImagesAutomatically(TRUE)))
+        return 0;
+    if (FAILED(preferences->setPlugInsEnabled(FALSE)))
+        return 0;
+    if (FAILED(preferences->setJavaEnabled(FALSE)))
+        return 0;
+    if (FAILED(preferences->setUserStyleSheetEnabled(FALSE)))
+        return 0;
+    if (FAILED(preferences->setTabsToLinks(FALSE)))
+        return 0;
+    if (FAILED(preferences->setMinimumFontSize(0)))
+        return 0;
+    if (FAILED(preferences->setMinimumLogicalFontSize(9)))
+        return 0;
+
+    if (FAILED(m_webView->setPreferences(preferences.get())))
+        return 0;
+
     if (FAILED(m_webView->setHostWindow((OLE_HANDLE)(ULONG64)m_hwnd)))
         return 0;