| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/tab_contents/tab_contents.h" | 5 #include "content/browser/tab_contents/tab_contents.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1023 | 1023 |
| 1024 void TabContents::OnDidLoadResourceFromMemoryCache( | 1024 void TabContents::OnDidLoadResourceFromMemoryCache( |
| 1025 const GURL& url, | 1025 const GURL& url, |
| 1026 const std::string& security_info, | 1026 const std::string& security_info, |
| 1027 const std::string& http_method, | 1027 const std::string& http_method, |
| 1028 ResourceType::Type resource_type) { | 1028 ResourceType::Type resource_type) { |
| 1029 base::StatsCounter cache("WebKit.CacheHit"); | 1029 base::StatsCounter cache("WebKit.CacheHit"); |
| 1030 cache.Increment(); | 1030 cache.Increment(); |
| 1031 | 1031 |
| 1032 // Send out a notification that we loaded a resource from our memory cache. | 1032 // Send out a notification that we loaded a resource from our memory cache. |
| 1033 int cert_id = 0; | 1033 int cert_id = 0, cert_status = 0, security_bits = -1, connection_status = 0; |
| 1034 net::CertStatus cert_status = 0; | |
| 1035 int security_bits = -1; | |
| 1036 int connection_status = 0; | |
| 1037 SSLManager::DeserializeSecurityInfo(security_info, | 1034 SSLManager::DeserializeSecurityInfo(security_info, |
| 1038 &cert_id, &cert_status, | 1035 &cert_id, &cert_status, |
| 1039 &security_bits, | 1036 &security_bits, |
| 1040 &connection_status); | 1037 &connection_status); |
| 1041 LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(), | 1038 LoadFromMemoryCacheDetails details(url, GetRenderProcessHost()->id(), |
| 1042 cert_id, cert_status); | 1039 cert_id, cert_status); |
| 1043 | 1040 |
| 1044 NotificationService::current()->Notify( | 1041 NotificationService::current()->Notify( |
| 1045 content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE, | 1042 content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE, |
| 1046 Source<NavigationController>(&controller_), | 1043 Source<NavigationController>(&controller_), |
| (...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2018 } | 2015 } |
| 2019 | 2016 |
| 2020 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { | 2017 void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { |
| 2021 render_manager_.SwapInRenderViewHost(rvh); | 2018 render_manager_.SwapInRenderViewHost(rvh); |
| 2022 } | 2019 } |
| 2023 | 2020 |
| 2024 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { | 2021 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) { |
| 2025 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); | 2022 RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh); |
| 2026 rwh_view->SetSize(view()->GetContainerSize()); | 2023 rwh_view->SetSize(view()->GetContainerSize()); |
| 2027 } | 2024 } |
| OLD | NEW |