| Index: Source/core/page/DOMWindowProperty.cpp
|
| diff --git a/Source/core/page/DOMWindowProperty.cpp b/Source/core/page/DOMWindowProperty.cpp
|
| deleted file mode 100644
|
| index 32428daf3b1c98dcc3f7b3d83905658d48eadf68..0000000000000000000000000000000000000000
|
| --- a/Source/core/page/DOMWindowProperty.cpp
|
| +++ /dev/null
|
| @@ -1,79 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2011 Google, Inc. All Rights Reserved.
|
| - * Copyright (C) 2012 Apple Inc. All Rights Reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
|
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "config.h"
|
| -#include "core/page/DOMWindowProperty.h"
|
| -
|
| -#include "core/dom/Document.h"
|
| -#include "core/page/DOMWindow.h"
|
| -#include "core/frame/Frame.h"
|
| -
|
| -namespace WebCore {
|
| -
|
| -DOMWindowProperty::DOMWindowProperty(Frame* frame)
|
| - : m_frame(frame)
|
| - , m_associatedDOMWindow(0)
|
| -{
|
| - // FIXME: For now it *is* acceptable for a DOMWindowProperty to be created with a null frame.
|
| - // See fast/dom/navigator-detached-no-crash.html for the recipe.
|
| - // We should fix that. <rdar://problem/11567132>
|
| - if (m_frame) {
|
| - m_associatedDOMWindow = m_frame->domWindow();
|
| - m_associatedDOMWindow->registerProperty(this);
|
| - }
|
| -}
|
| -
|
| -DOMWindowProperty::~DOMWindowProperty()
|
| -{
|
| - if (m_associatedDOMWindow)
|
| - m_associatedDOMWindow->unregisterProperty(this);
|
| -
|
| - m_associatedDOMWindow = 0;
|
| - m_frame = 0;
|
| -}
|
| -
|
| -void DOMWindowProperty::willDestroyGlobalObjectInFrame()
|
| -{
|
| - // If the property is getting this callback it must have been created with a Frame/DOMWindow 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.
|
| - if (m_associatedDOMWindow)
|
| - m_associatedDOMWindow->unregisterProperty(this);
|
| - m_associatedDOMWindow = 0;
|
| - m_frame = 0;
|
| -}
|
| -
|
| -void DOMWindowProperty::willDetachGlobalObjectFromFrame()
|
| -{
|
| - // If the property is getting this callback it must have been created with a Frame/DOMWindow and it should still have them.
|
| - ASSERT(m_frame);
|
| - ASSERT(m_associatedDOMWindow);
|
| -}
|
| -
|
| -}
|
|
|