| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1981 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1992 const std::string& highlight_text_color, | 1992 const std::string& highlight_text_color, |
| 1993 const std::string& highlight_color) { | 1993 const std::string& highlight_color) { |
| 1994 SystemColorsDidChange(aqua_color_variant, highlight_text_color, | 1994 SystemColorsDidChange(aqua_color_variant, highlight_text_color, |
| 1995 highlight_color); | 1995 highlight_color); |
| 1996 } | 1996 } |
| 1997 #endif | 1997 #endif |
| 1998 | 1998 |
| 1999 void RenderThreadImpl::OnCreateNewSharedWorker( | 1999 void RenderThreadImpl::OnCreateNewSharedWorker( |
| 2000 const WorkerProcessMsg_CreateWorker_Params& params) { | 2000 const WorkerProcessMsg_CreateWorker_Params& params) { |
| 2001 // EmbeddedSharedWorkerStub will self-destruct. | 2001 // EmbeddedSharedWorkerStub will self-destruct. |
| 2002 new EmbeddedSharedWorkerStub(params.url, | 2002 new EmbeddedSharedWorkerStub( |
| 2003 params.name, | 2003 params.url, params.name, params.content_security_policy, |
| 2004 params.content_security_policy, | 2004 params.security_policy_type, params.creation_address_space, |
| 2005 params.security_policy_type, | 2005 params.pause_on_start, params.route_id); |
| 2006 params.pause_on_start, | |
| 2007 params.route_id); | |
| 2008 } | 2006 } |
| 2009 | 2007 |
| 2010 void RenderThreadImpl::OnMemoryPressure( | 2008 void RenderThreadImpl::OnMemoryPressure( |
| 2011 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { | 2009 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { |
| 2012 ReleaseFreeMemory(); | 2010 ReleaseFreeMemory(); |
| 2013 | 2011 |
| 2014 // Do not call into blink if it is not initialized. | 2012 // Do not call into blink if it is not initialized. |
| 2015 if (blink_platform_impl_) { | 2013 if (blink_platform_impl_) { |
| 2016 blink::WebMemoryPressureListener::onMemoryPressure( | 2014 blink::WebMemoryPressureListener::onMemoryPressure( |
| 2017 static_cast<blink::WebMemoryPressureLevel>(memory_pressure_level)); | 2015 static_cast<blink::WebMemoryPressureLevel>(memory_pressure_level)); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2174 } | 2172 } |
| 2175 | 2173 |
| 2176 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2174 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2177 size_t erased = | 2175 size_t erased = |
| 2178 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2176 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2179 routing_id_); | 2177 routing_id_); |
| 2180 DCHECK_EQ(1u, erased); | 2178 DCHECK_EQ(1u, erased); |
| 2181 } | 2179 } |
| 2182 | 2180 |
| 2183 } // namespace content | 2181 } // namespace content |
| OLD | NEW |