| 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 1977 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 const std::string& highlight_text_color, | 1988 const std::string& highlight_text_color, |
| 1989 const std::string& highlight_color) { | 1989 const std::string& highlight_color) { |
| 1990 SystemColorsDidChange(aqua_color_variant, highlight_text_color, | 1990 SystemColorsDidChange(aqua_color_variant, highlight_text_color, |
| 1991 highlight_color); | 1991 highlight_color); |
| 1992 } | 1992 } |
| 1993 #endif | 1993 #endif |
| 1994 | 1994 |
| 1995 void RenderThreadImpl::OnCreateNewSharedWorker( | 1995 void RenderThreadImpl::OnCreateNewSharedWorker( |
| 1996 const WorkerProcessMsg_CreateWorker_Params& params) { | 1996 const WorkerProcessMsg_CreateWorker_Params& params) { |
| 1997 // EmbeddedSharedWorkerStub will self-destruct. | 1997 // EmbeddedSharedWorkerStub will self-destruct. |
| 1998 new EmbeddedSharedWorkerStub(params.url, | 1998 new EmbeddedSharedWorkerStub( |
| 1999 params.name, | 1999 params.url, params.name, params.content_security_policy, |
| 2000 params.content_security_policy, | 2000 params.security_policy_type, params.creation_address_space, |
| 2001 params.security_policy_type, | 2001 params.pause_on_start, params.route_id); |
| 2002 params.pause_on_start, | |
| 2003 params.route_id); | |
| 2004 } | 2002 } |
| 2005 | 2003 |
| 2006 void RenderThreadImpl::OnMemoryPressure( | 2004 void RenderThreadImpl::OnMemoryPressure( |
| 2007 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { | 2005 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level) { |
| 2008 ReleaseFreeMemory(); | 2006 ReleaseFreeMemory(); |
| 2009 | 2007 |
| 2010 // Do not call into blink if it is not initialized. | 2008 // Do not call into blink if it is not initialized. |
| 2011 if (blink_platform_impl_) { | 2009 if (blink_platform_impl_) { |
| 2012 blink::WebMemoryPressureListener::onMemoryPressure( | 2010 blink::WebMemoryPressureListener::onMemoryPressure( |
| 2013 static_cast<blink::WebMemoryPressureLevel>(memory_pressure_level)); | 2011 static_cast<blink::WebMemoryPressureLevel>(memory_pressure_level)); |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2170 } | 2168 } |
| 2171 | 2169 |
| 2172 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { | 2170 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { |
| 2173 size_t erased = | 2171 size_t erased = |
| 2174 RenderThreadImpl::current()->pending_render_frame_connects_.erase( | 2172 RenderThreadImpl::current()->pending_render_frame_connects_.erase( |
| 2175 routing_id_); | 2173 routing_id_); |
| 2176 DCHECK_EQ(1u, erased); | 2174 DCHECK_EQ(1u, erased); |
| 2177 } | 2175 } |
| 2178 | 2176 |
| 2179 } // namespace content | 2177 } // namespace content |
| OLD | NEW |