| Index: Source/core/frame/DOMWindowProperty.cpp
|
| diff --git a/Source/core/frame/DOMWindowProperty.cpp b/Source/core/frame/DOMWindowProperty.cpp
|
| index 5f925fb4bff7e7add134f25c911ea8e82c360c24..785b61519eb4172ad8e0d2c1b7cb2fa0a445d98b 100644
|
| --- a/Source/core/frame/DOMWindowProperty.cpp
|
| +++ b/Source/core/frame/DOMWindowProperty.cpp
|
| @@ -28,7 +28,7 @@
|
| #include "core/frame/DOMWindowProperty.h"
|
|
|
| #include "core/dom/Document.h"
|
| -#include "core/frame/DOMWindow.h"
|
| +#include "core/frame/LocalDOMWindow.h"
|
| #include "core/frame/LocalFrame.h"
|
|
|
| namespace WebCore {
|
| @@ -57,12 +57,12 @@ DOMWindowProperty::~DOMWindowProperty()
|
|
|
| void DOMWindowProperty::willDestroyGlobalObjectInFrame()
|
| {
|
| - // If the property is getting this callback it must have been created with a LocalFrame/DOMWindow and it should still have them.
|
| + // If the property is getting this callback it must have been created with a LocalFrame/LocalDOMWindow and it should still have them.
|
| ASSERT(m_frame);
|
| ASSERT(m_associatedDOMWindow);
|
|
|
| - // DOMWindowProperty lifetime isn't tied directly to the DOMWindow itself so it is important that it unregister
|
| - // itself from any DOMWindow it is associated with if that DOMWindow is going away.
|
| + // DOMWindowProperty lifetime isn't tied directly to the LocalDOMWindow itself so it is important that it unregister
|
| + // itself from any LocalDOMWindow it is associated with if that LocalDOMWindow is going away.
|
| if (m_associatedDOMWindow)
|
| m_associatedDOMWindow->unregisterProperty(this);
|
| m_associatedDOMWindow = 0;
|
| @@ -71,7 +71,7 @@ void DOMWindowProperty::willDestroyGlobalObjectInFrame()
|
|
|
| void DOMWindowProperty::willDetachGlobalObjectFromFrame()
|
| {
|
| - // If the property is getting this callback it must have been created with a LocalFrame/DOMWindow and it should still have them.
|
| + // If the property is getting this callback it must have been created with a LocalFrame/LocalDOMWindow and it should still have them.
|
| ASSERT(m_frame);
|
| ASSERT(m_associatedDOMWindow);
|
| }
|
|
|