diff options
Diffstat (limited to 'WebCore/bindings/generic')
| -rw-r--r-- | WebCore/bindings/generic/ActiveDOMCallback.cpp | 1 | ||||
| -rw-r--r-- | WebCore/bindings/generic/BindingDOMWindow.h | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/WebCore/bindings/generic/ActiveDOMCallback.cpp b/WebCore/bindings/generic/ActiveDOMCallback.cpp index 2e69d10..c42c93a 100644 --- a/WebCore/bindings/generic/ActiveDOMCallback.cpp +++ b/WebCore/bindings/generic/ActiveDOMCallback.cpp @@ -123,7 +123,6 @@ static void destroyOnContextThread(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl) ActiveDOMCallback::ActiveDOMCallback(ScriptExecutionContext* context) : m_impl(new ActiveDOMObjectCallbackImpl(context)) { - ASSERT(context->isContextThread()); } ActiveDOMCallback::~ActiveDOMCallback() diff --git a/WebCore/bindings/generic/BindingDOMWindow.h b/WebCore/bindings/generic/BindingDOMWindow.h index dda5644..0c450a5 100644 --- a/WebCore/bindings/generic/BindingDOMWindow.h +++ b/WebCore/bindings/generic/BindingDOMWindow.h @@ -108,11 +108,9 @@ Frame* BindingDOMWindow<Binding>::createWindow(State<Binding>* state, // issues to pass the URL instead of "". bool created; - // We pass in the opener frame here so it can be used for looking up the - // frame name, in case the active frame is different from the opener frame, - // and the name references a frame relative to the opener frame, for example - // "_self" or "_parent". - Frame* newFrame = callingFrame->loader()->createWindow(openerFrame->loader(), frameRequest, windowFeatures, created); + // We pass the opener frame for the lookupFrame in case the active frame is different from + // the opener frame, and the name references a frame relative to the opener frame. + Frame* newFrame = WebCore::createWindow(callingFrame, openerFrame, frameRequest, windowFeatures, created); if (!newFrame) return 0; |