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

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

Issue 1402933002: Revert "Post loading tasks on the appropriate WebFrameScheduler's queue." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 2 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
OLDNEW
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 #ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
6 #define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_ 6 #define CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/id_map.h" 9 #include "base/id_map.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 const blink::WebDeviceOrientationData& data); 198 const blink::WebDeviceOrientationData& data);
199 199
200 // Notifies blink::WebBatteryStatusListener that battery status has changed. 200 // Notifies blink::WebBatteryStatusListener that battery status has changed.
201 void MockBatteryStatusChangedForTesting( 201 void MockBatteryStatusChangedForTesting(
202 const blink::WebBatteryStatus& status); 202 const blink::WebBatteryStatus& status);
203 203
204 WebDatabaseObserverImpl* web_database_observer_impl() { 204 WebDatabaseObserverImpl* web_database_observer_impl() {
205 return web_database_observer_impl_.get(); 205 return web_database_observer_impl_.get();
206 } 206 }
207 207
208 blink::WebURLLoader* createURLLoader() override;
209
210 private: 208 private:
211 bool CheckPreparsedJsCachingEnabled() const; 209 bool CheckPreparsedJsCachingEnabled() const;
212 210
213 // Factory that takes a type and return PlatformEventObserverBase that matches 211 // Factory that takes a type and return PlatformEventObserverBase that matches
214 // it. 212 // it.
215 static PlatformEventObserverBase* CreatePlatformEventObserverFromType( 213 static PlatformEventObserverBase* CreatePlatformEventObserverFromType(
216 blink::WebPlatformEventType type); 214 blink::WebPlatformEventType type);
217 215
218 // Use the data previously set via SetMockDevice...DataForTesting() and send 216 // Use the data previously set via SetMockDevice...DataForTesting() and send
219 // them to the registered listener. 217 // them to the registered listener.
(...skipping 29 matching lines...) Expand all
249 247
250 scoped_ptr<blink::WebBlobRegistry> blob_registry_; 248 scoped_ptr<blink::WebBlobRegistry> blob_registry_;
251 249
252 WebPublicSuffixListImpl public_suffix_list_; 250 WebPublicSuffixListImpl public_suffix_list_;
253 251
254 scoped_ptr<DeviceLightEventPump> device_light_event_pump_; 252 scoped_ptr<DeviceLightEventPump> device_light_event_pump_;
255 scoped_ptr<DeviceMotionEventPump> device_motion_event_pump_; 253 scoped_ptr<DeviceMotionEventPump> device_motion_event_pump_;
256 scoped_ptr<DeviceOrientationEventPump> device_orientation_event_pump_; 254 scoped_ptr<DeviceOrientationEventPump> device_orientation_event_pump_;
257 255
258 scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_; 256 scoped_refptr<base::SingleThreadTaskRunner> default_task_runner_;
259 scoped_refptr<base::SingleThreadTaskRunner> loading_task_runner_;
260 scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_; 257 scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
261 scoped_refptr<ThreadSafeSender> thread_safe_sender_; 258 scoped_refptr<ThreadSafeSender> thread_safe_sender_;
262 scoped_refptr<QuotaMessageFilter> quota_message_filter_; 259 scoped_refptr<QuotaMessageFilter> quota_message_filter_;
263 260
264 scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_; 261 scoped_ptr<WebDatabaseObserverImpl> web_database_observer_impl_;
265 262
266 cc_blink::WebCompositorSupportImpl compositor_support_; 263 cc_blink::WebCompositorSupportImpl compositor_support_;
267 264
268 scoped_ptr<blink::WebScrollbarBehavior> web_scrollbar_behavior_; 265 scoped_ptr<blink::WebScrollbarBehavior> web_scrollbar_behavior_;
269 266
270 scoped_ptr<BatteryStatusDispatcher> battery_status_dispatcher_; 267 scoped_ptr<BatteryStatusDispatcher> battery_status_dispatcher_;
271 268
272 // Handle to the Vibration mojo service. 269 // Handle to the Vibration mojo service.
273 device::VibrationManagerPtr vibration_manager_; 270 device::VibrationManagerPtr vibration_manager_;
274 271
275 IDMap<PlatformEventObserverBase, IDMapOwnPointer> platform_event_observers_; 272 IDMap<PlatformEventObserverBase, IDMapOwnPointer> platform_event_observers_;
276 273
277 DISALLOW_COPY_AND_ASSIGN(RendererBlinkPlatformImpl); 274 DISALLOW_COPY_AND_ASSIGN(RendererBlinkPlatformImpl);
278 }; 275 };
279 276
280 } // namespace content 277 } // namespace content
281 278
282 #endif // CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_ 279 #endif // CONTENT_RENDERER_RENDERER_BLINK_PLATFORM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/renderer_blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698