| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_host/render_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 RenderWidgetHostDelegate::RENDERER_UNRESPONSIVE_UNKNOWN), | 214 RenderWidgetHostDelegate::RENDERER_UNRESPONSIVE_UNKNOWN), |
| 215 new_content_rendering_delay_( | 215 new_content_rendering_delay_( |
| 216 base::TimeDelta::FromMilliseconds(kNewContentRenderingDelayMs)), | 216 base::TimeDelta::FromMilliseconds(kNewContentRenderingDelayMs)), |
| 217 weak_factory_(this) { | 217 weak_factory_(this) { |
| 218 CHECK(delegate_); | 218 CHECK(delegate_); |
| 219 CHECK_NE(MSG_ROUTING_NONE, routing_id_); | 219 CHECK_NE(MSG_ROUTING_NONE, routing_id_); |
| 220 | 220 |
| 221 #if defined(OS_WIN) | 221 #if defined(OS_WIN) |
| 222 // Update the display color profile cache so that it is likely to be up to | 222 // Update the display color profile cache so that it is likely to be up to |
| 223 // date when the renderer process requests the color profile. | 223 // date when the renderer process requests the color profile. |
| 224 if (gfx::ColorSpace::CachedProfilesNeedUpdate()) { | 224 if (gfx::ICCProfile::CachedProfilesNeedUpdate()) { |
| 225 BrowserThread::PostBlockingPoolTask( | 225 BrowserThread::PostBlockingPoolTask( |
| 226 FROM_HERE, | 226 FROM_HERE, |
| 227 base::Bind(&gfx::ColorSpace::UpdateCachedProfilesOnBackgroundThread)); | 227 base::Bind(&gfx::ICCProfile::UpdateCachedProfilesOnBackgroundThread)); |
| 228 } | 228 } |
| 229 #endif | 229 #endif |
| 230 | 230 |
| 231 std::pair<RoutingIDWidgetMap::iterator, bool> result = | 231 std::pair<RoutingIDWidgetMap::iterator, bool> result = |
| 232 g_routing_id_widget_map.Get().insert(std::make_pair( | 232 g_routing_id_widget_map.Get().insert(std::make_pair( |
| 233 RenderWidgetHostID(process->GetID(), routing_id_), this)); | 233 RenderWidgetHostID(process->GetID(), routing_id_), this)); |
| 234 CHECK(result.second) << "Inserting a duplicate item!"; | 234 CHECK(result.second) << "Inserting a duplicate item!"; |
| 235 process_->AddRoute(routing_id_, this); | 235 process_->AddRoute(routing_id_, this); |
| 236 | 236 |
| 237 // If we're initially visible, tell the process host that we're alive. | 237 // If we're initially visible, tell the process host that we're alive. |
| (...skipping 1928 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2166 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2166 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
| 2167 } | 2167 } |
| 2168 | 2168 |
| 2169 BrowserAccessibilityManager* | 2169 BrowserAccessibilityManager* |
| 2170 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2170 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
| 2171 return delegate_ ? | 2171 return delegate_ ? |
| 2172 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2172 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
| 2173 } | 2173 } |
| 2174 | 2174 |
| 2175 } // namespace content | 2175 } // namespace content |
| OLD | NEW |