OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_thread.h" | 5 #include "chrome/renderer/render_thread.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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1078 | 1078 |
1079 void RenderThread::OnSpellCheckEnableAutoSpellCorrect(bool enable) { | 1079 void RenderThread::OnSpellCheckEnableAutoSpellCorrect(bool enable) { |
1080 spellchecker_->EnableAutoSpellCorrect(enable); | 1080 spellchecker_->EnableAutoSpellCorrect(enable); |
1081 } | 1081 } |
1082 | 1082 |
1083 void RenderThread::OnSetIsIncognitoProcess(bool is_incognito_process) { | 1083 void RenderThread::OnSetIsIncognitoProcess(bool is_incognito_process) { |
1084 is_incognito_process_ = is_incognito_process; | 1084 is_incognito_process_ = is_incognito_process; |
1085 } | 1085 } |
1086 | 1086 |
1087 void RenderThread::OnGpuChannelEstablished( | 1087 void RenderThread::OnGpuChannelEstablished( |
1088 const IPC::ChannelHandle& channel_handle, const GPUInfo& gpu_info) { | 1088 const IPC::ChannelHandle& channel_handle, |
| 1089 base::ProcessHandle gpu_renderer_process, |
| 1090 const GPUInfo& gpu_info) { |
1089 gpu_channel_->set_gpu_info(gpu_info); | 1091 gpu_channel_->set_gpu_info(gpu_info); |
1090 | 1092 |
1091 if (channel_handle.name.size() != 0) { | 1093 if (channel_handle.name.size() != 0) { |
1092 // Connect to the GPU process if a channel name was received. | 1094 // Connect to the GPU process if a channel name was received. |
1093 gpu_channel_->Connect(channel_handle); | 1095 gpu_channel_->Connect(channel_handle, gpu_renderer_process); |
1094 } else { | 1096 } else { |
1095 // Otherwise cancel the connection. | 1097 // Otherwise cancel the connection. |
1096 gpu_channel_ = NULL; | 1098 gpu_channel_ = NULL; |
1097 } | 1099 } |
1098 } | 1100 } |
1099 | 1101 |
1100 void RenderThread::OnSetPhishingModel(IPC::PlatformFileForTransit model_file) { | 1102 void RenderThread::OnSetPhishingModel(IPC::PlatformFileForTransit model_file) { |
1101 safe_browsing::PhishingClassifierDelegate::SetPhishingModel(model_file); | 1103 safe_browsing::PhishingClassifierDelegate::SetPhishingModel(model_file); |
1102 } | 1104 } |
1103 | 1105 |
(...skipping 27 matching lines...) Expand all Loading... |
1131 } | 1133 } |
1132 | 1134 |
1133 return false; | 1135 return false; |
1134 } | 1136 } |
1135 | 1137 |
1136 void RenderThread::RegisterExtension(v8::Extension* extension, | 1138 void RenderThread::RegisterExtension(v8::Extension* extension, |
1137 bool restrict_to_extensions) { | 1139 bool restrict_to_extensions) { |
1138 WebScriptController::registerExtension(extension); | 1140 WebScriptController::registerExtension(extension); |
1139 v8_extensions_[extension->name()] = restrict_to_extensions; | 1141 v8_extensions_[extension->name()] = restrict_to_extensions; |
1140 } | 1142 } |
OLD | NEW |