| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2017 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' |
| 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
| 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS |
| 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "bindings/core/v8/V8PerIsolateData.h" | 26 #include "platform/bindings/V8PerIsolateData.h" |
| 27 | 27 |
| 28 #include <memory> | 28 #include <memory> |
| 29 | 29 |
| 30 #include "bindings/core/v8/DOMDataStore.h" | |
| 31 #include "bindings/core/v8/ScriptSourceCode.h" | |
| 32 #include "bindings/core/v8/V8Binding.h" | |
| 33 #include "bindings/core/v8/V8ObjectConstructor.h" | |
| 34 #include "bindings/core/v8/V8PrivateProperty.h" | |
| 35 #include "bindings/core/v8/V8ScriptRunner.h" | |
| 36 #include "bindings/core/v8/V8ValueCache.h" | |
| 37 #include "platform/ScriptForbiddenScope.h" | 30 #include "platform/ScriptForbiddenScope.h" |
| 31 #include "platform/WebTaskRunner.h" |
| 32 #include "platform/bindings/DOMDataStore.h" |
| 33 #include "platform/bindings/V8Binding.h" |
| 34 #include "platform/bindings/V8ObjectConstructor.h" |
| 35 #include "platform/bindings/V8PrivateProperty.h" |
| 36 #include "platform/bindings/V8ValueCache.h" |
| 38 #include "platform/wtf/LeakAnnotations.h" | 37 #include "platform/wtf/LeakAnnotations.h" |
| 39 #include "platform/wtf/PtrUtil.h" | 38 #include "platform/wtf/PtrUtil.h" |
| 40 #include "public/platform/Platform.h" | 39 #include "public/platform/Platform.h" |
| 41 #include "v8/include/v8-debug.h" | 40 #include "v8/include/v8-debug.h" |
| 42 | 41 |
| 43 namespace blink { | 42 namespace blink { |
| 44 | 43 |
| 45 static V8PerIsolateData* g_main_thread_per_isolate_data = 0; | 44 static V8PerIsolateData* g_main_thread_per_isolate_data = 0; |
| 46 | 45 |
| 47 static void BeforeCallEnteredCallback(v8::Isolate* isolate) { | 46 static void BeforeCallEnteredCallback(v8::Isolate* isolate) { |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 ScriptWrappableVisitor* current = CurrentVisitor(); | 309 ScriptWrappableVisitor* current = CurrentVisitor(); |
| 311 if (current) | 310 if (current) |
| 312 current->PerformCleanup(); | 311 current->PerformCleanup(); |
| 313 | 312 |
| 314 V8PerIsolateData::From(isolate_)->script_wrappable_visitor_.swap( | 313 V8PerIsolateData::From(isolate_)->script_wrappable_visitor_.swap( |
| 315 saved_visitor_); | 314 saved_visitor_); |
| 316 isolate_->SetEmbedderHeapTracer(CurrentVisitor()); | 315 isolate_->SetEmbedderHeapTracer(CurrentVisitor()); |
| 317 } | 316 } |
| 318 | 317 |
| 319 } // namespace blink | 318 } // namespace blink |
| OLD | NEW |