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

Side by Side Diff: content/child/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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHILD_BLINK_PLATFORM_IMPL_H_ 5 #ifndef CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ 6 #define CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/containers/scoped_ptr_hash_map.h" 9 #include "base/containers/scoped_ptr_hash_map.h"
10 #include "base/threading/thread_local_storage.h" 10 #include "base/threading/thread_local_storage.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 int domEnumFromCodeString(const blink::WebString& codeString) override; 188 int domEnumFromCodeString(const blink::WebString& codeString) override;
189 blink::WebString domKeyStringFromEnum(int dom_key) override; 189 blink::WebString domKeyStringFromEnum(int dom_key) override;
190 int domKeyEnumFromString(const blink::WebString& key_string) override; 190 int domKeyEnumFromString(const blink::WebString& key_string) override;
191 191
192 private: 192 private:
193 void InternalInit(); 193 void InternalInit();
194 void UpdateWebThreadTLS(blink::WebThread* thread); 194 void UpdateWebThreadTLS(blink::WebThread* thread);
195 195
196 bool IsMainThread() const; 196 bool IsMainThread() const;
197 197
198 scoped_refptr<base::SingleThreadTaskRunner> MainTaskRunnerForCurrentThread();
199
198 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; 200 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
199 WebThemeEngineImpl native_theme_engine_; 201 WebThemeEngineImpl native_theme_engine_;
200 WebFallbackThemeEngineImpl fallback_theme_engine_; 202 WebFallbackThemeEngineImpl fallback_theme_engine_;
201 base::ThreadLocalStorage::Slot current_thread_slot_; 203 base::ThreadLocalStorage::Slot current_thread_slot_;
202 webcrypto::WebCryptoImpl web_crypto_; 204 webcrypto::WebCryptoImpl web_crypto_;
203 scoped_ptr<WebGeofencingProviderImpl> geofencing_provider_; 205 scoped_ptr<WebGeofencingProviderImpl> geofencing_provider_;
204 base::ScopedPtrHashMap<blink::WebMemoryDumpProvider*, 206 base::ScopedPtrHashMap<blink::WebMemoryDumpProvider*,
205 scoped_ptr<WebMemoryDumpProviderAdapter>> 207 scoped_ptr<WebMemoryDumpProviderAdapter>>
206 memory_dump_providers_; 208 memory_dump_providers_;
207 209
208 scoped_refptr<ThreadSafeSender> thread_safe_sender_; 210 scoped_refptr<ThreadSafeSender> thread_safe_sender_;
209 scoped_refptr<NotificationDispatcher> notification_dispatcher_; 211 scoped_refptr<NotificationDispatcher> notification_dispatcher_;
210 scoped_refptr<PushDispatcher> push_dispatcher_; 212 scoped_refptr<PushDispatcher> push_dispatcher_;
211 scoped_ptr<PermissionDispatcher> permission_client_; 213 scoped_ptr<PermissionDispatcher> permission_client_;
212 scoped_ptr<BackgroundSyncProvider> sync_provider_; 214 scoped_ptr<BackgroundSyncProvider> sync_provider_;
213 }; 215 };
214 216
215 } // namespace content 217 } // namespace content
216 218
217 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ 219 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
OLDNEW
« no previous file with comments | « components/scheduler/child/web_task_runner_impl.cc ('k') | content/child/blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698