Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/events/ErrorEvent.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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"
 
 namespace blink {
 
 struct ErrorEventInit : public EventInit {
     ErrorEventInit();
 
     String message;
     String filename;
     unsigned lineno;
     unsigned colno;
 };
 
 class ErrorEvent final : public Event {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtr<ErrorEvent> create()
     {
         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.
     const String& message() const { return m_sanitizedMessage; }
     const String& filename() const { return m_fileName; }
     unsigned lineno() const { return m_lineNumber; }
     unsigned colno() const { return m_columnNumber; }
 
     // 'messageForConsole' is not exposed to JavaScript, and prefers 'm_unsanitizedMessage'.
     const String& messageForConsole() const { return !m_unsanitizedMessage.isEmpty() ? m_unsanitizedMessage : m_sanitizedMessage; }
 
     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;
     String m_sanitizedMessage;
     String m_fileName;
     unsigned m_lineNumber;
     unsigned m_columnNumber;
-
-    RefPtr<DOMWrapperWorld> m_world;
 };
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_EVENTS_ERROREVENT_H_