diff options
Diffstat (limited to 'WebCore/page')
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 12 | ||||
| -rw-r--r-- | WebCore/page/DOMWindow.h | 2 | ||||
| -rw-r--r-- | WebCore/page/DOMWindow.idl | 2 | ||||
| -rw-r--r-- | WebCore/page/History.cpp | 33 | ||||
| -rw-r--r-- | WebCore/page/History.h | 5 | ||||
| -rw-r--r-- | WebCore/page/History.idl | 6 | ||||
| -rw-r--r-- | WebCore/page/animation/AnimationController.cpp | 8 |
7 files changed, 53 insertions, 15 deletions
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 22e1355..17b4c3d 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -867,7 +867,7 @@ void DOMWindow::blur() page->chrome()->unfocus(); } -void DOMWindow::close() +void DOMWindow::close(ScriptExecutionContext* context) { if (!m_frame) return; @@ -879,6 +879,16 @@ void DOMWindow::close() if (m_frame != page->mainFrame()) return; + if (context) { + ASSERT(WTF::isMainThread()); + Frame* activeFrame = static_cast<Document*>(context)->frame(); + if (!activeFrame) + return; + + if (!activeFrame->loader()->shouldAllowNavigation(m_frame)) + return; + } + Settings* settings = m_frame->settings(); bool allowScriptsToCloseWindows = settings && settings->allowScriptsToCloseWindows(); diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index 68b21ff..d0a6cce 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -147,7 +147,7 @@ namespace WebCore { void focus(); void blur(); - void close(); + void close(ScriptExecutionContext* = 0); void print(); void stop(); diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index 602289b..fe12287 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -65,7 +65,7 @@ module window { [DoNotCheckDomainSecurity] void focus(); [DoNotCheckDomainSecurity] void blur(); - [DoNotCheckDomainSecurity] void close(); + [DoNotCheckDomainSecurity, CallWith=ScriptExecutionContext] void close(); void print(); void stop(); diff --git a/WebCore/page/History.cpp b/WebCore/page/History.cpp index 95b1350..f0a75fe 100644 --- a/WebCore/page/History.cpp +++ b/WebCore/page/History.cpp @@ -27,6 +27,7 @@ #include "History.h" #include "BackForwardController.h" +#include "Document.h" #include "ExceptionCode.h" #include "Frame.h" #include "FrameLoader.h" @@ -62,22 +63,44 @@ unsigned History::length() const void History::back() { - if (!m_frame) - return; - m_frame->navigationScheduler()->scheduleHistoryNavigation(-1); + go(-1); +} + +void History::back(ScriptExecutionContext* context) +{ + go(context, -1); } void History::forward() { + go(1); +} + +void History::forward(ScriptExecutionContext* context) +{ + go(context, 1); +} + +void History::go(int distance) +{ if (!m_frame) return; - m_frame->navigationScheduler()->scheduleHistoryNavigation(1); + m_frame->navigationScheduler()->scheduleHistoryNavigation(distance); } -void History::go(int distance) +void History::go(ScriptExecutionContext* context, int distance) { if (!m_frame) return; + + ASSERT(WTF::isMainThread()); + Frame* activeFrame = static_cast<Document*>(context)->frame(); + if (!activeFrame) + return; + + if (!activeFrame->loader()->shouldAllowNavigation(m_frame)) + return; + m_frame->navigationScheduler()->scheduleHistoryNavigation(distance); } diff --git a/WebCore/page/History.h b/WebCore/page/History.h index e885847..9ec1914 100644 --- a/WebCore/page/History.h +++ b/WebCore/page/History.h @@ -34,6 +34,7 @@ namespace WebCore { class Frame; +class ScriptExecutionContext; class SerializedScriptValue; typedef int ExceptionCode; @@ -49,6 +50,10 @@ public: void forward(); void go(int distance); + void back(ScriptExecutionContext*); + void forward(ScriptExecutionContext*); + void go(ScriptExecutionContext*, int distance); + enum StateObjectType { StateObjectPush, StateObjectReplace diff --git a/WebCore/page/History.idl b/WebCore/page/History.idl index d1be5ae..d8eac60 100644 --- a/WebCore/page/History.idl +++ b/WebCore/page/History.idl @@ -37,9 +37,9 @@ module window { ] History { readonly attribute unsigned long length; - [DoNotCheckDomainSecurity] void back(); - [DoNotCheckDomainSecurity] void forward(); - [DoNotCheckDomainSecurity] void go(in long distance); + [DoNotCheckDomainSecurity, CallWith=ScriptExecutionContext] void back(); + [DoNotCheckDomainSecurity, CallWith=ScriptExecutionContext] void forward(); + [DoNotCheckDomainSecurity, CallWith=ScriptExecutionContext] void go(in long distance); [Custom, EnabledAtRuntime] void pushState(in any data, in DOMString title, in optional DOMString url) raises(DOMException); diff --git a/WebCore/page/animation/AnimationController.cpp b/WebCore/page/animation/AnimationController.cpp index e8e990c..613aee6 100644 --- a/WebCore/page/animation/AnimationController.cpp +++ b/WebCore/page/animation/AnimationController.cpp @@ -145,16 +145,16 @@ void AnimationControllerPrivate::fireEventsAndUpdateStyle() bool updateStyle = !m_eventsToDispatch.isEmpty() || !m_nodeChangesToDispatch.isEmpty(); // fire all the events - Vector<EventToDispatch>::const_iterator eventsToDispatchEnd = m_eventsToDispatch.end(); - for (Vector<EventToDispatch>::const_iterator it = m_eventsToDispatch.begin(); it != eventsToDispatchEnd; ++it) { + Vector<EventToDispatch> eventsToDispatch = m_eventsToDispatch; + m_eventsToDispatch.clear(); + Vector<EventToDispatch>::const_iterator eventsToDispatchEnd = eventsToDispatch.end(); + for (Vector<EventToDispatch>::const_iterator it = eventsToDispatch.begin(); it != eventsToDispatchEnd; ++it) { if (it->eventType == eventNames().webkitTransitionEndEvent) it->element->dispatchEvent(WebKitTransitionEvent::create(it->eventType, it->name, it->elapsedTime)); else it->element->dispatchEvent(WebKitAnimationEvent::create(it->eventType, it->name, it->elapsedTime)); } - m_eventsToDispatch.clear(); - // call setChanged on all the elements Vector<RefPtr<Node> >::const_iterator nodeChangesToDispatchEnd = m_nodeChangesToDispatch.end(); for (Vector<RefPtr<Node> >::const_iterator it = m_nodeChangesToDispatch.begin(); it != nodeChangesToDispatchEnd; ++it) |