| 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 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 26 matching lines...) Expand all Loading... |
| 37 #include "sky/engine/bindings/core/v8/V8Binding.h" | 37 #include "sky/engine/bindings/core/v8/V8Binding.h" |
| 38 #include "sky/engine/bindings/core/v8/V8DOMWrapper.h" | 38 #include "sky/engine/bindings/core/v8/V8DOMWrapper.h" |
| 39 #include "sky/engine/bindings/core/v8/WindowProxy.h" | 39 #include "sky/engine/bindings/core/v8/WindowProxy.h" |
| 40 #include "sky/engine/bindings/core/v8/WrapperTypeInfo.h" | 40 #include "sky/engine/bindings/core/v8/WrapperTypeInfo.h" |
| 41 #include "sky/engine/core/dom/ExecutionContext.h" | 41 #include "sky/engine/core/dom/ExecutionContext.h" |
| 42 #include "sky/engine/wtf/HashTraits.h" | 42 #include "sky/engine/wtf/HashTraits.h" |
| 43 #include "sky/engine/wtf/StdLibExtras.h" | 43 #include "sky/engine/wtf/StdLibExtras.h" |
| 44 | 44 |
| 45 namespace blink { | 45 namespace blink { |
| 46 | 46 |
| 47 unsigned DOMWrapperWorld::isolatedWorldCount = 0; | |
| 48 DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0; | 47 DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0; |
| 49 | 48 |
| 50 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(FakeWorldMarker marker) | 49 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(FakeWorldMarker marker) |
| 51 { | 50 { |
| 52 return adoptRef(new DOMWrapperWorld(marker)); | 51 return adoptRef(new DOMWrapperWorld(marker)); |
| 53 } | 52 } |
| 54 | 53 |
| 55 DOMWrapperWorld::DOMWrapperWorld(FakeWorldMarker marker) | 54 DOMWrapperWorld::DOMWrapperWorld(FakeWorldMarker marker) |
| 56 : m_isFakeWorld(marker == FakeWorld) | 55 : m_isFakeWorld(marker == FakeWorld) |
| 57 , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld()))) | 56 , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld()))) |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 m_domObjectHolders.remove(holderBase); | 91 m_domObjectHolders.remove(holderBase); |
| 93 } | 92 } |
| 94 | 93 |
| 95 void DOMWrapperWorld::weakCallbackForDOMObjectHolder(const v8::WeakCallbackData<
v8::Value, DOMObjectHolderBase>& data) | 94 void DOMWrapperWorld::weakCallbackForDOMObjectHolder(const v8::WeakCallbackData<
v8::Value, DOMObjectHolderBase>& data) |
| 96 { | 95 { |
| 97 DOMObjectHolderBase* holderBase = data.GetParameter(); | 96 DOMObjectHolderBase* holderBase = data.GetParameter(); |
| 98 holderBase->world()->unregisterDOMObjectHolder(holderBase); | 97 holderBase->world()->unregisterDOMObjectHolder(holderBase); |
| 99 } | 98 } |
| 100 | 99 |
| 101 } // namespace blink | 100 } // namespace blink |
| OLD | NEW |