| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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)) {} |
| 51 | 51 |
| 52 void RemoteWindowProxy::DisposeContext(Lifecycle next_status) { | 52 void RemoteWindowProxy::DisposeContext(Lifecycle next_status, |
| 53 FrameReuseStatus) { |
| 53 DCHECK(next_status == Lifecycle::kGlobalObjectIsDetached || | 54 DCHECK(next_status == Lifecycle::kGlobalObjectIsDetached || |
| 54 next_status == Lifecycle::kFrameIsDetached); | 55 next_status == Lifecycle::kFrameIsDetached); |
| 55 | 56 |
| 56 if (lifecycle_ != Lifecycle::kContextIsInitialized) | 57 if (lifecycle_ != Lifecycle::kContextIsInitialized) |
| 57 return; | 58 return; |
| 58 | 59 |
| 59 if (next_status == Lifecycle::kGlobalObjectIsDetached && | 60 if (next_status == Lifecycle::kGlobalObjectIsDetached && |
| 60 !global_proxy_.IsEmpty()) { | 61 !global_proxy_.IsEmpty()) { |
| 61 global_proxy_.Get().SetWrapperClassId(0); | 62 global_proxy_.Get().SetWrapperClassId(0); |
| 62 V8DOMWrapper::ClearNativeInfo(GetIsolate(), | 63 V8DOMWrapper::ClearNativeInfo(GetIsolate(), |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 | 134 |
| 134 // The global object, aka window wrapper object. | 135 // The global object, aka window wrapper object. |
| 135 v8::Local<v8::Object> window_wrapper = | 136 v8::Local<v8::Object> window_wrapper = |
| 136 global_proxy->GetPrototype().As<v8::Object>(); | 137 global_proxy->GetPrototype().As<v8::Object>(); |
| 137 v8::Local<v8::Object> associated_wrapper = | 138 v8::Local<v8::Object> associated_wrapper = |
| 138 AssociateWithWrapper(window, wrapper_type_info, window_wrapper); | 139 AssociateWithWrapper(window, wrapper_type_info, window_wrapper); |
| 139 DCHECK(associated_wrapper == window_wrapper); | 140 DCHECK(associated_wrapper == window_wrapper); |
| 140 } | 141 } |
| 141 | 142 |
| 142 } // namespace blink | 143 } // namespace blink |
| OLD | NEW |