| 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 943 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 954 | 954 |
| 955 // Allow calling this from the compositor thread. | 955 // Allow calling this from the compositor thread. |
| 956 if (MessageLoop::current() == message_loop()) | 956 if (MessageLoop::current() == message_loop()) |
| 957 ChildThread::Send(message); | 957 ChildThread::Send(message); |
| 958 else | 958 else |
| 959 sync_message_filter()->Send(message); | 959 sync_message_filter()->Send(message); |
| 960 | 960 |
| 961 return route_id; | 961 return route_id; |
| 962 } | 962 } |
| 963 | 963 |
| 964 void RenderThreadImpl::CreateImage( |
| 965 gfx::PluginWindowHandle window, |
| 966 int32 image_id, |
| 967 const CreateImageCallback& callback) { |
| 968 NOTREACHED(); |
| 969 } |
| 970 |
| 971 void RenderThreadImpl::DeleteImage(int32 image_id, int32 sync_point) { |
| 972 NOTREACHED(); |
| 973 } |
| 974 |
| 964 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { | 975 void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() { |
| 965 suspend_webkit_shared_timer_ = false; | 976 suspend_webkit_shared_timer_ = false; |
| 966 } | 977 } |
| 967 | 978 |
| 968 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { | 979 void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() { |
| 969 notify_webkit_of_modal_loop_ = false; | 980 notify_webkit_of_modal_loop_ = false; |
| 970 } | 981 } |
| 971 | 982 |
| 972 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& host, | 983 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const std::string& host, |
| 973 double zoom_level) { | 984 double zoom_level) { |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 | 1160 |
| 1150 scoped_refptr<base::MessageLoopProxy> | 1161 scoped_refptr<base::MessageLoopProxy> |
| 1151 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1162 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 1152 DCHECK(message_loop() == MessageLoop::current()); | 1163 DCHECK(message_loop() == MessageLoop::current()); |
| 1153 if (!file_thread_.get()) { | 1164 if (!file_thread_.get()) { |
| 1154 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1165 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 1155 file_thread_->Start(); | 1166 file_thread_->Start(); |
| 1156 } | 1167 } |
| 1157 return file_thread_->message_loop_proxy(); | 1168 return file_thread_->message_loop_proxy(); |
| 1158 } | 1169 } |
| OLD | NEW |