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 <vector> | 10 #include <vector> |
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1174 if (!success) | 1174 if (!success) |
1175 return scoped_ptr<gfx::GpuMemoryBuffer>(); | 1175 return scoped_ptr<gfx::GpuMemoryBuffer>(); |
1176 | 1176 |
1177 return GpuMemoryBufferImpl::CreateFromHandle( | 1177 return GpuMemoryBufferImpl::CreateFromHandle( |
1178 handle, gfx::Size(width, height), internalformat) | 1178 handle, gfx::Size(width, height), internalformat) |
1179 .PassAs<gfx::GpuMemoryBuffer>(); | 1179 .PassAs<gfx::GpuMemoryBuffer>(); |
1180 } | 1180 } |
1181 | 1181 |
1182 void RenderThreadImpl::ConnectToService( | 1182 void RenderThreadImpl::ConnectToService( |
1183 const mojo::String& service_name, | 1183 const mojo::String& service_name, |
| 1184 const mojo::String& name, |
1184 mojo::ScopedMessagePipeHandle message_pipe) { | 1185 mojo::ScopedMessagePipeHandle message_pipe) { |
1185 // TODO(darin): Invent some kind of registration system to use here. | 1186 // TODO(darin): Invent some kind of registration system to use here. |
1186 if (service_name.To<base::StringPiece>() == kRendererService_WebUISetup) { | 1187 if (service_name.To<base::StringPiece>() == kRendererService_WebUISetup) { |
1187 WebUISetupImpl::Bind(message_pipe.Pass()); | 1188 WebUISetupImpl::Bind(message_pipe.Pass()); |
1188 } else { | 1189 } else { |
1189 NOTREACHED() << "Unknown service name"; | 1190 NOTREACHED() << "Unknown service name"; |
1190 } | 1191 } |
1191 } | 1192 } |
1192 | 1193 |
1193 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { | 1194 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 hidden_widget_count_--; | 1519 hidden_widget_count_--; |
1519 | 1520 |
1520 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { | 1521 if (!GetContentClient()->renderer()->RunIdleHandlerWhenWidgetsHidden()) { |
1521 return; | 1522 return; |
1522 } | 1523 } |
1523 | 1524 |
1524 ScheduleIdleHandler(kLongIdleHandlerDelayMs); | 1525 ScheduleIdleHandler(kLongIdleHandlerDelayMs); |
1525 } | 1526 } |
1526 | 1527 |
1527 } // namespace content | 1528 } // namespace content |
OLD | NEW |