Send content settings based on the URL to the renderer instead of just the host.

chrome/renderer/render_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 576 matching lines @@
                         OnAdvanceToNextMisspelling)
     IPC_MESSAGE_HANDLER(ViewMsg_ToggleSpellCheck, OnToggleSpellCheck)
     IPC_MESSAGE_HANDLER(ViewMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(ViewMsg_SelectAll, OnSelectAll)
     IPC_MESSAGE_HANDLER(ViewMsg_CopyImageAt, OnCopyImageAt)
     IPC_MESSAGE_HANDLER(ViewMsg_ExecuteEditCommand, OnExecuteEditCommand)
     IPC_MESSAGE_HANDLER(ViewMsg_Find, OnFind)
     IPC_MESSAGE_HANDLER(ViewMsg_StopFinding, OnStopFinding)
     IPC_MESSAGE_HANDLER(ViewMsg_FindReplyACK, OnFindReplyAck)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
-    IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForLoadingHost,
-                        OnSetContentSettingsForLoadingHost)
-    IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingHost,
-                        OnSetZoomLevelForLoadingHost)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetContentSettingsForLoadingURL,
+                        OnSetContentSettingsForLoadingURL)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForLoadingURL,
+                        OnSetZoomLevelForLoadingURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
                         OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(ViewMsg_SetupDevToolsClient, OnSetupDevToolsClient)
     IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavIcon, OnDownloadFavIcon)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_CSSInsertRequest, OnCSSInsertRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewMsg_ReservePageIDRange, OnReservePageIDRange)
     IPC_MESSAGE_HANDLER(ViewMsg_FillPasswordForm, OnFillPasswordForm)
@@ skipping 617 matching lines @@
 
     // Clear "block" flags for the new page. This needs to happen before any of
     // allowScripts(), allowImages(), allowPlugins() is called for the new page
     // so that these functions can correctly detect that a piece of content
     // flipped from "not blocked" to "blocked".
     ClearBlockedContentSettings();
 
     // Set content settings. Default them from the parent window if one exists.
     // This makes sure about:blank windows work as expected.
     HostContentSettings::iterator host_content_settings =
-        host_content_settings_.find(GURL(request.url()).host());
+        host_content_settings_.find(GURL(request.url()));
     if (host_content_settings != host_content_settings_.end()) {
       SetContentSettings(host_content_settings->second);
 
       // These content settings were merely recorded transiently for this load.
       // We can erase them now.  If at some point we reload this page, the
       // browser will send us new, up-to-date content settings.
       host_content_settings_.erase(host_content_settings);
     } else if (frame->opener()) {
       WebView* opener_view = frame->opener()->view();
       RenderView* opener = FromWebView(opener_view);
       SetContentSettings(opener->current_content_settings_);
     }
 
     // Set zoom level.
     HostZoomLevels::iterator host_zoom =
-        host_zoom_levels_.find(GURL(request.url()).host());
+        host_zoom_levels_.find(GURL(request.url()));
     if (host_zoom != host_zoom_levels_.end()) {
       webview()->setZoomLevel(false, host_zoom->second);
       // This zoom level was merely recorded transiently for this load.  We can
       // erase it now.  If at some point we reload this page, the browser will
       // send us a new, up-to-date zoom level.
       host_zoom_levels_.erase(host_zoom);
     }
 
     // Update contents MIME type for main frame.
     params.contents_mime_type = ds->response().mimeType().utf8();
@@ skipping 2324 matching lines @@
       return;
     }
     delegate->Zoom(zoom);
     return;
   }
 
   int zoom_level = webview()->zoomLevel();
   int new_zoom_level = webview()->setZoomLevel(false,
       (function == PageZoom::RESET) ? 0 : (zoom_level + function));
 
-  // Tell the browser which host got zoomed so it can update the saved values.
-  // Pages like the safe browsing interstitial can have empty hosts; don't
-  // record those.
-  std::string host(GURL(webview()->mainFrame()->url()).host());
-  if (!host.empty())
-    Send(new ViewHostMsg_DidZoomHost(host, new_zoom_level));
+  // Tell the browser which url got zoomed so it can update the saved values.
+  Send(new ViewHostMsg_DidZoomURL(
+      GURL(webview()->mainFrame()->url()), new_zoom_level));
 }
 
-void RenderView::OnSetContentSettingsForLoadingHost(
-    std::string host,
+void RenderView::OnSetContentSettingsForLoadingURL(
+    const GURL& url,
     const ContentSettings& content_settings) {
-  host_content_settings_[host] = content_settings;
+  host_content_settings_[url] = content_settings;
 }
 
-void RenderView::OnSetZoomLevelForLoadingHost(std::string host,
-                                              int zoom_level) {
-  host_zoom_levels_[host] = zoom_level;
+void RenderView::OnSetZoomLevelForLoadingURL(const GURL& url,
+                                             int zoom_level) {
+  host_zoom_levels_[url] = zoom_level;
 }
 
 void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->setPageEncoding(WebString::fromUTF8(encoding_name));
 }
 
 void RenderView::OnResetPageEncodingToDefault() {
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
@@ skipping 1340 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }