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

Side by Side Diff: content/child/blink_platform_impl.h

Issue 278513004: [webcrypto] Fix a race in BlinkPlatformImpl::crypto(), by using eager initilization of WebCryptoImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address sleevi comments Created 6 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/child/blink_platform_impl.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 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/platform_file.h" 10 #include "base/platform_file.h"
11 #include "base/threading/thread_local_storage.h" 11 #include "base/threading/thread_local_storage.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "content/child/webcrypto/webcrypto_impl.h"
13 #include "content/child/webfallbackthemeengine_impl.h" 14 #include "content/child/webfallbackthemeengine_impl.h"
14 #include "content/common/content_export.h" 15 #include "content/common/content_export.h"
15 #include "third_party/WebKit/public/platform/Platform.h" 16 #include "third_party/WebKit/public/platform/Platform.h"
16 #include "third_party/WebKit/public/platform/WebURLError.h" 17 #include "third_party/WebKit/public/platform/WebURLError.h"
17 #include "ui/base/layout.h" 18 #include "ui/base/layout.h"
18 19
19 #if defined(USE_DEFAULT_RENDER_THEME) 20 #if defined(USE_DEFAULT_RENDER_THEME)
20 #include "content/child/webthemeengine_impl_default.h" 21 #include "content/child/webthemeengine_impl_default.h"
21 #elif defined(OS_WIN) 22 #elif defined(OS_WIN)
22 #include "content/child/webthemeengine_impl_win.h" 23 #include "content/child/webthemeengine_impl_win.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 WebThemeEngineImpl native_theme_engine_; 168 WebThemeEngineImpl native_theme_engine_;
168 WebFallbackThemeEngineImpl fallback_theme_engine_; 169 WebFallbackThemeEngineImpl fallback_theme_engine_;
169 base::MessageLoop* main_loop_; 170 base::MessageLoop* main_loop_;
170 base::OneShotTimer<BlinkPlatformImpl> shared_timer_; 171 base::OneShotTimer<BlinkPlatformImpl> shared_timer_;
171 void (*shared_timer_func_)(); 172 void (*shared_timer_func_)();
172 double shared_timer_fire_time_; 173 double shared_timer_fire_time_;
173 bool shared_timer_fire_time_was_set_while_suspended_; 174 bool shared_timer_fire_time_was_set_while_suspended_;
174 int shared_timer_suspended_; // counter 175 int shared_timer_suspended_; // counter
175 scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_; 176 scoped_ptr<FlingCurveConfiguration> fling_curve_configuration_;
176 base::ThreadLocalStorage::Slot current_thread_slot_; 177 base::ThreadLocalStorage::Slot current_thread_slot_;
177 scoped_ptr<WebCryptoImpl> web_crypto_; 178 WebCryptoImpl web_crypto_;
178 }; 179 };
179 180
180 } // namespace content 181 } // namespace content
181 182
182 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_ 183 #endif // CONTENT_CHILD_BLINK_PLATFORM_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/child/blink_platform_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698