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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "bindings/core/v8/ScriptSourceCode.h" 29 #include "bindings/core/v8/ScriptSourceCode.h"
30 #include "bindings/core/v8/V8Binding.h" 30 #include "bindings/core/v8/V8Binding.h"
31 #include "bindings/core/v8/V8HiddenValue.h" 31 #include "bindings/core/v8/V8HiddenValue.h"
32 #include "bindings/core/v8/V8ObjectConstructor.h" 32 #include "bindings/core/v8/V8ObjectConstructor.h"
33 #include "bindings/core/v8/V8ScriptRunner.h" 33 #include "bindings/core/v8/V8ScriptRunner.h"
34 #include "core/frame/Deprecation.h" 34 #include "core/frame/Deprecation.h"
35 #include "core/inspector/MainThreadDebugger.h" 35 #include "core/inspector/MainThreadDebugger.h"
36 #include "platform/ScriptForbiddenScope.h" 36 #include "platform/ScriptForbiddenScope.h"
37 #include "public/platform/Platform.h" 37 #include "public/platform/Platform.h"
38 #include "wtf/LeakAnnotations.h" 38 #include "wtf/LeakAnnotations.h"
39 #include "wtf/MainThread.h"
40 39
41 namespace blink { 40 namespace blink {
42 41
43 static V8PerIsolateData* mainThreadPerIsolateData = 0; 42 static V8PerIsolateData* mainThreadPerIsolateData = 0;
44 43
45 static void beforeCallEnteredCallback(v8::Isolate* isolate) 44 static void beforeCallEnteredCallback(v8::Isolate* isolate)
46 { 45 {
47 RELEASE_ASSERT(!ScriptForbiddenScope::isScriptForbidden()); 46 RELEASE_ASSERT(!ScriptForbiddenScope::isScriptForbidden());
48 } 47 }
49 48
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 ASSERT(!m_threadDebugger); 321 ASSERT(!m_threadDebugger);
323 m_threadDebugger = std::move(threadDebugger); 322 m_threadDebugger = std::move(threadDebugger);
324 } 323 }
325 324
326 ThreadDebugger* V8PerIsolateData::threadDebugger() 325 ThreadDebugger* V8PerIsolateData::threadDebugger()
327 { 326 {
328 return m_threadDebugger.get(); 327 return m_threadDebugger.get();
329 } 328 }
330 329
331 } // namespace blink 330 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698