#include "core/dom/AddConsoleMessageTask.h"
#include "core/dom/ContextLifecycleNotifier.h"
#include "core/dom/ExecutionContextTask.h"
+#include "core/events/ErrorEvent.h"
#include "core/events/EventTarget.h"
#include "core/html/PublicURLManager.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/workers/WorkerThread.h"
#include "wtf/MainThread.h"
-namespace WebCore {
+namespace blink {
-class ExecutionContext::PendingException {
+class ExecutionContext::PendingException : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContext::PendingException> {
WTF_MAKE_NONCOPYABLE(PendingException);
public:
- PendingException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack> callStack)
+ PendingException(const String& errorMessage, int lineNumber, int columnNumber, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack)
: m_errorMessage(errorMessage)
, m_lineNumber(lineNumber)
, m_columnNumber(columnNumber)
+ , m_scriptId(scriptId)
, m_sourceURL(sourceURL)
, m_callStack(callStack)
{
}
+ void trace(Visitor* visitor)
+ {
+ visitor->trace(m_callStack);
+ }
String m_errorMessage;
int m_lineNumber;
int m_columnNumber;
+ int m_scriptId;
String m_sourceURL;
- RefPtr<ScriptCallStack> m_callStack;
+ RefPtrWillBeMember<ScriptCallStack> m_callStack;
};
ExecutionContext::ExecutionContext()
- : m_client(0)
- , m_sandboxFlags(SandboxNone)
+ : m_sandboxFlags(SandboxNone)
, m_circularSequentialID(0)
, m_inDispatchErrorEvent(false)
, m_activeDOMObjectsAreSuspended(false)
void ExecutionContext::suspendScheduledTasks()
{
suspendActiveDOMObjects();
- if (m_client)
- m_client->tasksWereSuspended();
+ tasksWereSuspended();
}
void ExecutionContext::resumeScheduledTasks()
{
resumeActiveDOMObjects();
- if (m_client)
- m_client->tasksWereResumed();
+ tasksWereResumed();
}
void ExecutionContext::suspendActiveDOMObjectIfNeeded(ActiveDOMObject* object)
return !(securityOrigin()->canRequest(completeURL(sourceURL)) || corsStatus == SharableCrossOrigin);
}
-void ExecutionContext::reportException(PassRefPtr<ErrorEvent> event, PassRefPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
+void ExecutionContext::reportException(PassRefPtrWillBeRawPtr<ErrorEvent> event, int scriptId, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, AccessControlStatus corsStatus)
{
- RefPtr<ErrorEvent> errorEvent = event;
+ RefPtrWillBeRawPtr<ErrorEvent> errorEvent = event;
if (m_inDispatchErrorEvent) {
if (!m_pendingExceptions)
- m_pendingExceptions = adoptPtr
(new Vector<OwnPtr<PendingException> >());
- m_pendingExceptions->append(adoptPtr(new PendingException(errorEvent->messageForConsole(), errorEvent->lineno(), errorEvent->colno(), errorEvent->filename(), callStack)));
+ m_pendingExceptions = adoptPtr
WillBeNoop(new WillBeHeapVector<OwnPtrWillBeMember<PendingException> >());
+ m_pendingExceptions->append(adoptPtrWillBeNoop(new PendingException(errorEvent->messageForConsole(), errorEvent->lineno(), errorEvent->colno(), scriptId, errorEvent->filename(), callStack)));
return;
}
// First report the original exception and only then all the nested ones.
- if (!dispatchErrorEvent(errorEvent, corsStatus) && m_client)
- m_client->logExceptionToConsole(errorEvent->messageForConsole(), errorEvent->filename(), errorEvent->lineno(), errorEvent->colno(), callStack);
+ if (!dispatchErrorEvent(errorEvent, corsStatus))
+ logExceptionToConsole(errorEvent->messageForConsole(), scriptId, errorEvent->filename(), errorEvent->lineno(), errorEvent->colno(), callStack);
if (!m_pendingExceptions)
return;
for (size_t i = 0; i < m_pendingExceptions->size(); i++) {
PendingException* e = m_pendingExceptions->at(i).get();
- if (m_client)
- m_client->logExceptionToConsole(e->m_errorMessage, e->m_sourceURL, e->m_lineNumber, e->m_columnNumber, e->m_callStack);
+ logExceptionToConsole(e->m_errorMessage, e->m_scriptId, e->m_sourceURL, e->m_lineNumber, e->m_columnNumber, e->m_callStack);
}
m_pendingExceptions.clear();
}
-void ExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, const String& sourceURL, unsigned lineNumber)
-{
- if (!m_client)
- return;
- m_client->addMessage(source, level, message, sourceURL, lineNumber, 0);
-}
-
-void ExecutionContext::addConsoleMessage(MessageSource source, MessageLevel level, const String& message, ScriptState* state)
+bool ExecutionContext::dispatchErrorEvent(PassRefPtrWillBeRawPtr<ErrorEvent> event, AccessControlStatus corsStatus)
{
- if (!m_client)
- return;
- m_client->addMessage(source, level, message, String(), 0, state);
-}
-
-bool ExecutionContext::dispatchErrorEvent(PassRefPtr<ErrorEvent> event, AccessControlStatus corsStatus)
-{
- if (!m_client)
- return false;
- EventTarget* target = m_client->errorEventTarget();
+ EventTarget* target = errorEventTarget();
if (!target)
return false;
- RefPtr<ErrorEvent> errorEvent = event;
+ RefPtrWillBeRawPtr<ErrorEvent> errorEvent = event;
if (shouldSanitizeScriptError(errorEvent->filename(), corsStatus))
errorEvent = ErrorEvent::createSanitizedError(errorEvent->world());
iter->value->didChangeAlignmentInterval();
}
-SecurityOrigin* ExecutionContext::securityOrigin() const
+SecurityOrigin* ExecutionContext::securityOrigin()
{
- RELEASE_ASSERT(m_client);
- return m_client->securityContext().securityOrigin();
+ return securityContext().securityOrigin();
}
-ContentSecurityPolicy* ExecutionContext::contentSecurityPolicy() const
+ContentSecurityPolicy* ExecutionContext::contentSecurityPolicy()
{
- RELEASE_ASSERT(m_client);
- return m_client->securityContext().contentSecurityPolicy();
+ return securityContext().contentSecurityPolicy();
}
const KURL& ExecutionContext::url() const
{
- if (!m_client) {
- DEFINE_STATIC_LOCAL(KURL, emptyURL, ());
- return emptyURL;
- }
-
- return m_client->virtualURL();
+ return virtualURL();
}
KURL ExecutionContext::completeURL(const String& url) const
{
-
- if (!m_client) {
- DEFINE_STATIC_LOCAL(KURL, emptyURL, ());
- return emptyURL;
- }
-
- return m_client->virtualCompleteURL(url);
-}
-
-void ExecutionContext::userEventWasHandled()
-{
- if (!m_client)
- return;
- m_client->userEventWasHandled();
-}
-
-void ExecutionContext::disableEval(const String& errorMessage)
-{
- if (!m_client)
- return;
- return m_client->disableEval(errorMessage);
-}
-
-DOMWindow* ExecutionContext::executingWindow() const
-{
- RELEASE_ASSERT(m_client);
- return m_client->executingWindow();
-}
-
-String ExecutionContext::userAgent(const KURL& url) const
-{
- if (!m_client)
- return String();
- return m_client->userAgent(url);
-}
-
-double ExecutionContext::timerAlignmentInterval() const
-{
- if (!m_client)
- return DOMTimer::visiblePageAlignmentInterval();
- return m_client->timerAlignmentInterval();
-}
-
-void ExecutionContext::postTask(PassOwnPtr<ExecutionContextTask> task)
-{
- if (!m_client)
- return;
- m_client->postTask(task);
-}
-
-void ExecutionContext::postTask(const Closure& closure)
-{
- if (!m_client)
- return;
- m_client->postTask(CallClosureTask::create(closure));
+ return virtualCompleteURL(url);
}
PassOwnPtr<LifecycleNotifier<ExecutionContext> > ExecutionContext::createLifecycleNotifier()
{
m_sandboxFlags |= mask;
- RELEASE_ASSERT(m_client);
// The SandboxOrigin is stored redundantly in the security origin.
- if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin() && !m_client->securityContext().securityOrigin()->isUnique()) {
- m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUnique());
- m_client->didUpdateSecurityOrigin();
+ if (isSandboxed(SandboxOrigin) && securityContext().securityOrigin() && !securityContext().securityOrigin()->isUnique()) {
+ securityContext().setSecurityOrigin(SecurityOrigin::createUnique());
+ didUpdateSecurityOrigin();
}
}
-} // namespace WebCore
+void ExecutionContext::trace(Visitor* visitor)
+{
+#if ENABLE(OILPAN)
+ visitor->trace(m_pendingExceptions);
+ HeapSupplementable<ExecutionContext>::trace(visitor);
+#endif
+ LifecycleContext<ExecutionContext>::trace(visitor);
+}
+
+} // namespace blink
projects / platform / framework / web / crosswalk.git / blobdiff