Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: content/renderer/render_thread.h

Issue 6961039: Revert r75078 now that crbug.com/72007 is fixed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CONTENT_RENDERER_RENDER_THREAD_H_ 5 #ifndef CONTENT_RENDERER_RENDER_THREAD_H_
6 #define CONTENT_RENDERER_RENDER_THREAD_H_ 6 #define CONTENT_RENDERER_RENDER_THREAD_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 // Get the GPU channel. Returns NULL if the channel is not established or 207 // Get the GPU channel. Returns NULL if the channel is not established or
208 // has been lost. 208 // has been lost.
209 GpuChannelHost* GetGpuChannel(); 209 GpuChannelHost* GetGpuChannel();
210 210
211 // Returns a MessageLoopProxy instance corresponding to the message loop 211 // Returns a MessageLoopProxy instance corresponding to the message loop
212 // of the thread on which file operations should be run. Must be called 212 // of the thread on which file operations should be run. Must be called
213 // on the renderer's main thread. 213 // on the renderer's main thread.
214 scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy(); 214 scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy();
215 215
216 // Hack for http://crbug.com/71735.
217 // TODO(jamesr): remove once http://crbug.com/72007 is fixed.
218 RendererWebKitClientImpl* GetWebKitClientImpl() const {
219 return webkit_client_.get();
220 }
221
222 // Schedule a call to IdleHandler with the given initial delay. 216 // Schedule a call to IdleHandler with the given initial delay.
223 void ScheduleIdleHandler(double initial_delay_s); 217 void ScheduleIdleHandler(double initial_delay_s);
224 218
225 // A task we invoke periodically to assist with idle cleanup. 219 // A task we invoke periodically to assist with idle cleanup.
226 void IdleHandler(); 220 void IdleHandler();
227 221
228 // Registers the given V8 extension with WebKit. 222 // Registers the given V8 extension with WebKit.
229 void RegisterExtension(v8::Extension* extension); 223 void RegisterExtension(v8::Extension* extension);
230 224
231 // Returns true iff the extension is registered. 225 // Returns true iff the extension is registered.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 284
291 // Map of registered v8 extensions. The key is the extension name. 285 // Map of registered v8 extensions. The key is the extension name.
292 std::set<std::string> v8_extensions_; 286 std::set<std::string> v8_extensions_;
293 287
294 ObserverList<RenderProcessObserver> observers_; 288 ObserverList<RenderProcessObserver> observers_;
295 289
296 DISALLOW_COPY_AND_ASSIGN(RenderThread); 290 DISALLOW_COPY_AND_ASSIGN(RenderThread);
297 }; 291 };
298 292
299 #endif // CONTENT_RENDERER_RENDER_THREAD_H_ 293 #endif // CONTENT_RENDERER_RENDER_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698