OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 15 matching lines...) Expand all Loading... |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "bindings/core/v8/RemoteWindowProxy.h" | 31 #include "bindings/core/v8/RemoteWindowProxy.h" |
32 | 32 |
33 #include <algorithm> | 33 #include <algorithm> |
34 #include <utility> | 34 #include <utility> |
35 | 35 |
36 #include "bindings/core/v8/DOMWrapperWorld.h" | |
37 #include "bindings/core/v8/V8DOMWrapper.h" | 36 #include "bindings/core/v8/V8DOMWrapper.h" |
38 #include "bindings/core/v8/V8Window.h" | 37 #include "bindings/core/v8/V8Window.h" |
39 #include "platform/Histogram.h" | 38 #include "platform/Histogram.h" |
40 #include "platform/ScriptForbiddenScope.h" | 39 #include "platform/ScriptForbiddenScope.h" |
| 40 #include "platform/bindings/DOMWrapperWorld.h" |
41 #include "platform/instrumentation/tracing/TraceEvent.h" | 41 #include "platform/instrumentation/tracing/TraceEvent.h" |
42 #include "platform/wtf/Assertions.h" | 42 #include "platform/wtf/Assertions.h" |
43 #include "v8/include/v8.h" | 43 #include "v8/include/v8.h" |
44 | 44 |
45 namespace blink { | 45 namespace blink { |
46 | 46 |
47 RemoteWindowProxy::RemoteWindowProxy(v8::Isolate* isolate, | 47 RemoteWindowProxy::RemoteWindowProxy(v8::Isolate* isolate, |
48 RemoteFrame& frame, | 48 RemoteFrame& frame, |
49 RefPtr<DOMWrapperWorld> world) | 49 RefPtr<DOMWrapperWorld> world) |
50 : WindowProxy(isolate, frame, std::move(world)) {} | 50 : WindowProxy(isolate, frame, std::move(world)) {} |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 | 133 |
134 // The global object, aka window wrapper object. | 134 // The global object, aka window wrapper object. |
135 v8::Local<v8::Object> window_wrapper = | 135 v8::Local<v8::Object> window_wrapper = |
136 global_proxy->GetPrototype().As<v8::Object>(); | 136 global_proxy->GetPrototype().As<v8::Object>(); |
137 v8::Local<v8::Object> associated_wrapper = | 137 v8::Local<v8::Object> associated_wrapper = |
138 AssociateWithWrapper(window, wrapper_type_info, window_wrapper); | 138 AssociateWithWrapper(window, wrapper_type_info, window_wrapper); |
139 DCHECK(associated_wrapper == window_wrapper); | 139 DCHECK(associated_wrapper == window_wrapper); |
140 } | 140 } |
141 | 141 |
142 } // namespace blink | 142 } // namespace blink |
OLD | NEW |