| Index: sky/engine/bindings-dart/common/ExceptionStatePlaceholder.h
|
| diff --git a/sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h b/sky/engine/bindings-dart/common/ExceptionStatePlaceholder.h
|
| similarity index 64%
|
| copy from sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h
|
| copy to sky/engine/bindings-dart/common/ExceptionStatePlaceholder.h
|
| index 4d8fe54035534983beb86f3883c36a890f62c39b..cc13ccfc849e5030331b89c76a5d40bb67cf5859 100644
|
| --- a/sky/engine/bindings/core/v8/ExceptionStatePlaceholder.h
|
| +++ b/sky/engine/bindings-dart/common/ExceptionStatePlaceholder.h
|
| @@ -28,13 +28,14 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef SKY_ENGINE_BINDINGS_CORE_V8_EXCEPTIONSTATEPLACEHOLDER_H_
|
| -#define SKY_ENGINE_BINDINGS_CORE_V8_EXCEPTIONSTATEPLACEHOLDER_H_
|
| +#ifndef ExceptionStatePlaceholder_h
|
| +#define ExceptionStatePlaceholder_h
|
|
|
| -#include "sky/engine/bindings/core/v8/ExceptionState.h"
|
| -#include "sky/engine/wtf/Assertions.h"
|
| -#include "sky/engine/wtf/text/WTFString.h"
|
| -#include "v8/include/v8.h"
|
| +#include "bindings/common/ExceptionState.h"
|
| +#include <v8.h>
|
| +#include "wtf/Assertions.h"
|
| +#include "wtf/text/WTFString.h"
|
| +#include <v8.h>
|
|
|
| namespace blink {
|
|
|
| @@ -42,26 +43,40 @@ class ExceptionState;
|
|
|
| typedef int ExceptionCode;
|
|
|
| -class IgnorableExceptionState final : public ExceptionState {
|
| +class IgnorableExceptionState FINAL : public ExceptionState {
|
| public:
|
| - IgnorableExceptionState(): ExceptionState(ExceptionState::UnknownContext, 0, 0, v8::Handle<v8::Object>(), 0) { }
|
| + IgnorableExceptionState(): ExceptionState() { }
|
| ExceptionState& returnThis() { return *this; }
|
| - virtual void throwDOMException(const ExceptionCode&, const String& message = String()) override { }
|
| - virtual void throwTypeError(const String& message = String()) override { }
|
| - virtual void throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage = String()) override { }
|
| + virtual void throwDOMException(const ExceptionCode&, const String& message = String()) OVERRIDE { }
|
| + virtual void throwTypeError(const String& message = String()) OVERRIDE { }
|
| + virtual void throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage = String()) OVERRIDE { }
|
| + virtual void throwRangeError(const String& message = String()) OVERRIDE { }
|
| + virtual void rethrowV8Exception(v8::Handle<v8::Value> value) OVERRIDE { }
|
| + virtual void clearException() OVERRIDE FINAL { }
|
| + virtual void throwException() OVERRIDE FINAL { }
|
| + virtual ScriptPromise reject(ScriptState* state) OVERRIDE FINAL { return ScriptPromise::empty(state); }
|
| };
|
|
|
| #define IGNORE_EXCEPTION (::blink::IgnorableExceptionState().returnThis())
|
|
|
| #if ENABLE(ASSERT)
|
|
|
| -class NoExceptionStateAssertionChecker final : public ExceptionState {
|
| +class NoExceptionStateAssertionChecker FINAL : public ExceptionState {
|
| public:
|
| NoExceptionStateAssertionChecker(const char* file, int line);
|
| ExceptionState& returnThis() { return *this; }
|
| - virtual void throwDOMException(const ExceptionCode&, const String& message = String()) override;
|
| - virtual void throwTypeError(const String& message = String()) override;
|
| - virtual void throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage = String()) override;
|
| + virtual void throwDOMException(const ExceptionCode&, const String& message = String()) OVERRIDE;
|
| + virtual void throwTypeError(const String& message = String()) OVERRIDE;
|
| + virtual void throwSecurityError(const String& sanitizedMessage, const String& unsanitizedMessage = String()) OVERRIDE;
|
| + virtual void throwRangeError(const String& message = String()) OVERRIDE;
|
| + virtual void rethrowV8Exception(v8::Handle<v8::Value> value) OVERRIDE;
|
| + virtual void clearException() OVERRIDE FINAL { }
|
| + virtual void throwException() OVERRIDE FINAL { ASSERT_NOT_REACHED(); }
|
| + virtual ScriptPromise reject(ScriptState*) OVERRIDE FINAL
|
| + {
|
| + ASSERT_NOT_REACHED();
|
| + return ScriptPromise(nullptr);
|
| + }
|
|
|
| private:
|
| const char* m_file;
|
| @@ -78,4 +93,4 @@ private:
|
|
|
| } // namespace blink
|
|
|
| -#endif // SKY_ENGINE_BINDINGS_CORE_V8_EXCEPTIONSTATEPLACEHOLDER_H_
|
| +#endif // ExceptionStatePlaceholder_h
|
|
|