Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Unified Diff: sky/engine/core/events/ErrorEvent.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/events/CustomEvent.idl ('k') | sky/engine/core/events/ErrorEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/events/ErrorEvent.h
diff --git a/sky/engine/core/events/ErrorEvent.h b/sky/engine/core/events/ErrorEvent.h
index 510518bb4c8150d769cdf14aed30c140cb10bf91..fc9d4364d72c206a905432177801369e2656701d 100644
--- a/sky/engine/core/events/ErrorEvent.h
+++ b/sky/engine/core/events/ErrorEvent.h
@@ -31,7 +31,6 @@
#ifndef SKY_ENGINE_CORE_EVENTS_ERROREVENT_H_
#define SKY_ENGINE_CORE_EVENTS_ERROREVENT_H_
-#include "sky/engine/bindings/core/v8/DOMWrapperWorld.h"
#include "sky/engine/core/events/Event.h"
#include "sky/engine/wtf/RefPtr.h"
#include "sky/engine/wtf/text/WTFString.h"
@@ -54,18 +53,14 @@ public:
{
return adoptRef(new ErrorEvent);
}
- static PassRefPtr<ErrorEvent> create(const String& message, const String& fileName, unsigned lineNumber, unsigned columnNumber, DOMWrapperWorld* world)
+ static PassRefPtr<ErrorEvent> create(const String& message, const String& fileName, unsigned lineNumber, unsigned columnNumber)
{
- return adoptRef(new ErrorEvent(message, fileName, lineNumber, columnNumber, world));
+ return adoptRef(new ErrorEvent(message, fileName, lineNumber, columnNumber));
}
static PassRefPtr<ErrorEvent> create(const AtomicString& type, const ErrorEventInit& initializer)
{
return adoptRef(new ErrorEvent(type, initializer));
}
- static PassRefPtr<ErrorEvent> createSanitizedError(DOMWrapperWorld* world)
- {
- return adoptRef(new ErrorEvent("Script error.", String(), 0, 0, world));
- }
virtual ~ErrorEvent();
// As 'message' is exposed to JavaScript, never return unsanitizedMessage.
@@ -79,13 +74,11 @@ public:
virtual const AtomicString& interfaceName() const override;
- DOMWrapperWorld* world() const { return m_world.get(); }
-
void setUnsanitizedMessage(const String&);
private:
ErrorEvent();
- ErrorEvent(const String& message, const String& fileName, unsigned lineNumber, unsigned columnNumber, DOMWrapperWorld*);
+ ErrorEvent(const String& message, const String& fileName, unsigned lineNumber, unsigned columnNumber);
ErrorEvent(const AtomicString&, const ErrorEventInit&);
String m_unsanitizedMessage;
@@ -93,8 +86,6 @@ private:
String m_fileName;
unsigned m_lineNumber;
unsigned m_columnNumber;
-
- RefPtr<DOMWrapperWorld> m_world;
};
} // namespace blink
« no previous file with comments | « sky/engine/core/events/CustomEvent.idl ('k') | sky/engine/core/events/ErrorEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698