OLD | NEW |
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 static V8PerIsolateData* mainThreadPerIsolateData = 0; | 46 static V8PerIsolateData* mainThreadPerIsolateData = 0; |
47 | 47 |
48 static void beforeCallEnteredCallback(v8::Isolate* isolate) { | 48 static void beforeCallEnteredCallback(v8::Isolate* isolate) { |
49 RELEASE_ASSERT(!ScriptForbiddenScope::isScriptForbidden()); | 49 RELEASE_ASSERT(!ScriptForbiddenScope::isScriptForbidden()); |
50 } | 50 } |
51 | 51 |
52 static void microtasksCompletedCallback(v8::Isolate* isolate) { | 52 static void microtasksCompletedCallback(v8::Isolate* isolate) { |
53 V8PerIsolateData::from(isolate)->runEndOfScopeTasks(); | 53 V8PerIsolateData::from(isolate)->runEndOfScopeTasks(); |
54 } | 54 } |
55 | 55 |
56 V8PerIsolateData::V8PerIsolateData() | 56 V8PerIsolateData::V8PerIsolateData(WebTaskRunner* taskRunner) |
57 : m_isolateHolder(WTF::makeUnique<gin::IsolateHolder>()), | 57 : m_isolateHolder(WTF::makeUnique<gin::IsolateHolder>( |
| 58 taskRunner->toSingleThreadTaskRunner())), |
58 m_stringCache(WTF::wrapUnique(new StringCache(isolate()))), | 59 m_stringCache(WTF::wrapUnique(new StringCache(isolate()))), |
59 m_hiddenValue(V8HiddenValue::create()), | 60 m_hiddenValue(V8HiddenValue::create()), |
60 m_privateProperty(V8PrivateProperty::create()), | 61 m_privateProperty(V8PrivateProperty::create()), |
61 m_constructorMode(ConstructorMode::CreateNewObject), | 62 m_constructorMode(ConstructorMode::CreateNewObject), |
62 m_useCounterDisabled(false), | 63 m_useCounterDisabled(false), |
63 m_isHandlingRecursionLevelError(false), | 64 m_isHandlingRecursionLevelError(false), |
64 m_isReportingException(false) { | 65 m_isReportingException(false) { |
65 // FIXME: Remove once all v8::Isolate::GetCurrent() calls are gone. | 66 // FIXME: Remove once all v8::Isolate::GetCurrent() calls are gone. |
66 isolate()->Enter(); | 67 isolate()->Enter(); |
67 isolate()->AddBeforeCallEnteredCallback(&beforeCallEnteredCallback); | 68 isolate()->AddBeforeCallEnteredCallback(&beforeCallEnteredCallback); |
68 isolate()->AddMicrotasksCompletedCallback(µtasksCompletedCallback); | 69 isolate()->AddMicrotasksCompletedCallback(µtasksCompletedCallback); |
69 if (isMainThread()) | 70 if (isMainThread()) |
70 mainThreadPerIsolateData = this; | 71 mainThreadPerIsolateData = this; |
71 isolate()->SetUseCounterCallback(&useCounterCallback); | 72 isolate()->SetUseCounterCallback(&useCounterCallback); |
72 } | 73 } |
73 | 74 |
74 V8PerIsolateData::~V8PerIsolateData() {} | 75 V8PerIsolateData::~V8PerIsolateData() {} |
75 | 76 |
76 v8::Isolate* V8PerIsolateData::mainThreadIsolate() { | 77 v8::Isolate* V8PerIsolateData::mainThreadIsolate() { |
77 ASSERT(mainThreadPerIsolateData); | 78 ASSERT(mainThreadPerIsolateData); |
78 return mainThreadPerIsolateData->isolate(); | 79 return mainThreadPerIsolateData->isolate(); |
79 } | 80 } |
80 | 81 |
81 v8::Isolate* V8PerIsolateData::initialize() { | 82 v8::Isolate* V8PerIsolateData::initialize(WebTaskRunner* taskRunner) { |
82 V8PerIsolateData* data = new V8PerIsolateData(); | 83 V8PerIsolateData* data = new V8PerIsolateData(taskRunner); |
83 v8::Isolate* isolate = data->isolate(); | 84 v8::Isolate* isolate = data->isolate(); |
84 isolate->SetData(gin::kEmbedderBlink, data); | 85 isolate->SetData(gin::kEmbedderBlink, data); |
85 return isolate; | 86 return isolate; |
86 } | 87 } |
87 | 88 |
88 void V8PerIsolateData::enableIdleTasks( | 89 void V8PerIsolateData::enableIdleTasks( |
89 v8::Isolate* isolate, | 90 v8::Isolate* isolate, |
90 std::unique_ptr<gin::V8IdleTaskRunner> taskRunner) { | 91 std::unique_ptr<gin::V8IdleTaskRunner> taskRunner) { |
91 from(isolate)->m_isolateHolder->EnableIdleTasks( | 92 from(isolate)->m_isolateHolder->EnableIdleTasks( |
92 std::unique_ptr<gin::V8IdleTaskRunner>(taskRunner.release())); | 93 std::unique_ptr<gin::V8IdleTaskRunner>(taskRunner.release())); |
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 | 391 |
391 void V8PerIsolateData::addActiveScriptWrappable( | 392 void V8PerIsolateData::addActiveScriptWrappable( |
392 ActiveScriptWrappableBase* wrappable) { | 393 ActiveScriptWrappableBase* wrappable) { |
393 if (!m_activeScriptWrappables) | 394 if (!m_activeScriptWrappables) |
394 m_activeScriptWrappables = new ActiveScriptWrappableSet(); | 395 m_activeScriptWrappables = new ActiveScriptWrappableSet(); |
395 | 396 |
396 m_activeScriptWrappables->add(wrappable); | 397 m_activeScriptWrappables->add(wrappable); |
397 } | 398 } |
398 | 399 |
399 } // namespace blink | 400 } // namespace blink |
OLD | NEW |