| Index: Source/core/dom/ScriptExecutionContext.h
|
| diff --git a/Source/core/dom/ScriptExecutionContext.h b/Source/core/dom/ScriptExecutionContext.h
|
| index fcbd20848683f9cfa48aa6837ee68ccfe90f2bc7..280f98431a6ad73eef37747fd754b5f3c46c1f73 100644
|
| --- a/Source/core/dom/ScriptExecutionContext.h
|
| +++ b/Source/core/dom/ScriptExecutionContext.h
|
| @@ -28,6 +28,7 @@
|
| #ifndef ScriptExecutionContext_h
|
| #define ScriptExecutionContext_h
|
|
|
| +#include "bindings/v8/ScriptValue.h"
|
| #include "core/dom/ActiveDOMObject.h"
|
| #include "core/dom/SecurityContext.h"
|
| #include "core/page/ConsoleTypes.h"
|
| @@ -68,8 +69,8 @@ public:
|
|
|
| virtual void disableEval(const String& errorMessage) = 0;
|
|
|
| - bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL);
|
| - void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>);
|
| + bool sanitizeScriptError(String& errorMessage, int& lineNumber, int& columnNumber, String& sourceURL, ScriptValue&);
|
| + void reportException(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, PassRefPtr<ScriptCallStack>, const ScriptValue& = ScriptValue());
|
|
|
| void addConsoleMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, ScriptState* = 0, unsigned long requestIdentifier = 0);
|
| virtual void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) = 0;
|
| @@ -156,7 +157,7 @@ private:
|
| virtual void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack>, ScriptState* = 0, unsigned long requestIdentifier = 0) = 0;
|
| virtual EventTarget* errorEventTarget() = 0;
|
| virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) = 0;
|
| - bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL);
|
| + bool dispatchErrorEvent(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL, const ScriptValue&);
|
|
|
| void closeMessagePorts();
|
|
|
|
|