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

Side by Side Diff: chrome/browser/renderer_host/browser_render_process_host.h

Issue 164071: Merge 22540 - Ensure that we never call into WebCore::Page static methods whe... (Closed) Base URL: svn://chrome-svn/chrome/branches/197/src/
Patch Set: Created 11 years, 4 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 | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/renderer_host/browser_render_process_host.h:r22540
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_
6 #define CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <map> 10 #include <map>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 virtual bool Init(); 57 virtual bool Init();
58 virtual int GetNextRoutingID(); 58 virtual int GetNextRoutingID();
59 virtual void CancelResourceRequests(int render_widget_id); 59 virtual void CancelResourceRequests(int render_widget_id);
60 virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params); 60 virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
61 virtual bool WaitForPaintMsg(int render_widget_id, 61 virtual bool WaitForPaintMsg(int render_widget_id,
62 const base::TimeDelta& max_delay, 62 const base::TimeDelta& max_delay,
63 IPC::Message* msg); 63 IPC::Message* msg);
64 virtual void ReceivedBadMessage(uint16 msg_type); 64 virtual void ReceivedBadMessage(uint16 msg_type);
65 virtual void WidgetRestored(); 65 virtual void WidgetRestored();
66 virtual void WidgetHidden(); 66 virtual void WidgetHidden();
67 virtual void ViewCreated();
67 virtual void AddWord(const std::wstring& word); 68 virtual void AddWord(const std::wstring& word);
68 virtual void AddVisitedLinks(const VisitedLinkCommon::Fingerprints& links); 69 virtual void AddVisitedLinks(const VisitedLinkCommon::Fingerprints& links);
69 virtual void ResetVisitedLinks(); 70 virtual void ResetVisitedLinks();
70 virtual bool FastShutdownIfPossible(); 71 virtual bool FastShutdownIfPossible();
71 virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms); 72 virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms);
72 virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id); 73 virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id);
73 74
74 // IPC::Channel::Sender via RenderProcessHost. 75 // IPC::Channel::Sender via RenderProcessHost.
75 virtual bool Send(IPC::Message* msg); 76 virtual bool Send(IPC::Message* msg);
76 77
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 NotificationRegistrar registrar_; 129 NotificationRegistrar registrar_;
129 130
130 // The count of currently visible widgets. Since the host can be a container 131 // The count of currently visible widgets. Since the host can be a container
131 // for multiple widgets, it uses this count to determine when it should be 132 // for multiple widgets, it uses this count to determine when it should be
132 // backgrounded. 133 // backgrounded.
133 int32 visible_widgets_; 134 int32 visible_widgets_;
134 135
135 // Does this process have backgrounded priority. 136 // Does this process have backgrounded priority.
136 bool backgrounded_; 137 bool backgrounded_;
137 138
139 // Is true only when the process had a render view created.
140 bool view_created_;
141
138 // Used to allow a RenderWidgetHost to intercept various messages on the 142 // Used to allow a RenderWidgetHost to intercept various messages on the
139 // IO thread. 143 // IO thread.
140 scoped_refptr<RenderWidgetHelper> widget_helper_; 144 scoped_refptr<RenderWidgetHelper> widget_helper_;
141 145
142 // The host of audio renderers in the renderer process. 146 // The host of audio renderers in the renderer process.
143 scoped_refptr<AudioRendererHost> audio_renderer_host_; 147 scoped_refptr<AudioRendererHost> audio_renderer_host_;
144 148
145 // A map of transport DIB ids to cached TransportDIBs 149 // A map of transport DIB ids to cached TransportDIBs
146 std::map<TransportDIB::Id, TransportDIB*> cached_dibs_; 150 std::map<TransportDIB::Id, TransportDIB*> cached_dibs_;
147 enum { 151 enum {
(...skipping 14 matching lines...) Expand all
162 // Buffer visited links and send them to to renderer. 166 // Buffer visited links and send them to to renderer.
163 scoped_ptr<VisitedLinkUpdater> visited_link_updater_; 167 scoped_ptr<VisitedLinkUpdater> visited_link_updater_;
164 168
165 // True iff the renderer is a child of a zygote process. 169 // True iff the renderer is a child of a zygote process.
166 bool zygote_child_; 170 bool zygote_child_;
167 171
168 DISALLOW_COPY_AND_ASSIGN(BrowserRenderProcessHost); 172 DISALLOW_COPY_AND_ASSIGN(BrowserRenderProcessHost);
169 }; 173 };
170 174
171 #endif // CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_ 175 #endif // CHROME_BROWSER_RENDERER_HOST_BROWSER_RENDER_PROCESS_HOST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698